Skip to content

Commit 5713fa2

Browse files
chore: use AuthInfo.update
1 parent 5338db2 commit 5713fa2

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/commands/force/user/password/generate.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import * as os from 'os';
88
import { flags, FlagsConfig, SfdxCommand } from '@salesforce/command';
99
import { Aliases, AuthInfo, Connection, Messages, Org, SfdxError, User, UserFields } from '@salesforce/core';
10-
import { Crypto } from '@salesforce/core/lib/crypto';
1110

1211
Messages.importMessagesDirectory(__dirname);
1312
const messages = Messages.loadMessages('@salesforce/plugin-user', 'password.generate');
@@ -56,10 +55,9 @@ export class UserPasswordGenerateCommand extends SfdxCommand {
5655
// userId is used by `assignPassword` so we need to set it here
5756
authInfo.getFields().userId = fields.id;
5857
await user.assignPassword(authInfo, password);
59-
const crypto = await Crypto.create();
6058
password.value((pass) => {
6159
this.passwordData.push({ username: aliasOrUsername, password: pass.toString('utf-8') });
62-
authInfo.getFields().password = crypto.encrypt(pass.toString('utf-8'));
60+
authInfo.update({ password: pass.toString('utf-8') });
6361
});
6462
await authInfo.save();
6563
} catch (e) {

test/commands/user/password/generate.test.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77

88
import { $$, expect, test } from '@salesforce/command/lib/test';
99
import { Aliases, AuthInfo, Connection, Org, User, AuthInfoConfig, Messages } from '@salesforce/core';
10-
import { spyMethod, StubbedType, stubInterface, stubMethod } from '@salesforce/ts-sinon';
10+
import { StubbedType, stubInterface, stubMethod } from '@salesforce/ts-sinon';
1111
import { MockTestOrgData } from '@salesforce/core/lib/testSetup';
1212
import { SecureBuffer } from '@salesforce/core/lib/secureBuffer';
13-
import { Crypto } from '@salesforce/core/lib/crypto';
1413

1514
Messages.importMessagesDirectory(__dirname);
1615
const messages = Messages.loadMessages('@salesforce/plugin-user', 'password.generate');
@@ -19,7 +18,6 @@ describe('force:user:password:generate', () => {
1918
let authInfoStub: StubbedType<AuthInfo>;
2019
let authInfoConfigStub: StubbedType<AuthInfoConfig>;
2120
const testData = new MockTestOrgData();
22-
let cryptoSpy;
2321

2422
async function prepareStubs(throws = false) {
2523
const authFields = await testData.getConfig();
@@ -37,8 +35,6 @@ describe('force:user:password:generate', () => {
3735
id: '0052D0000043PawWWR',
3836
});
3937

40-
cryptoSpy = spyMethod($$.SANDBOX, Crypto.prototype, 'encrypt');
41-
4238
const secureBuffer: SecureBuffer<void> = new SecureBuffer<void>();
4339
secureBuffer.consume(Buffer.from('abc', 'utf8'));
4440
stubMethod($$.SANDBOX, User, 'generatePasswordUtf8').returns(secureBuffer);
@@ -71,7 +67,7 @@ describe('force:user:password:generate', () => {
7167
];
7268
const result = JSON.parse(ctx.stdout).result;
7369
expect(result).to.deep.equal(expected);
74-
expect(cryptoSpy.calledTwice).to.be.true;
70+
expect(authInfoStub.update.callCount).to.equal(2);
7571
});
7672

7773
test
@@ -82,7 +78,7 @@ describe('force:user:password:generate', () => {
8278
const expected = [{ username: 'defaultusername@test.com', password: 'abc' }];
8379
const result = JSON.parse(ctx.stdout).result;
8480
expect(result).to.deep.equal(expected);
85-
expect(cryptoSpy.calledOnce).to.be.true;
81+
expect(authInfoStub.update.callCount).to.equal(1);
8682
});
8783

8884
test
@@ -95,6 +91,6 @@ describe('force:user:password:generate', () => {
9591
expect(result.message).to.equal(messages.getMessage('noSelfSetError'));
9692
expect(result.status).to.equal(1);
9793
expect(result.name).to.equal('noSelfSetError');
98-
expect(cryptoSpy.callCount).to.equal(0);
94+
expect(authInfoStub.update.callCount).to.equal(0);
9995
});
10096
});

0 commit comments

Comments
 (0)