mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Use checkAccountExistence

Browse source
This commit is contained in:
Fedor Indutny 2022-02-25 15:20:48 -08:00 • committed by GitHub
parent 5c9718f268
commit 033b4830d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 81 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ts/test-electron/updateConversationsWithUuidLookup_test.ts
View file

@ -98,7 +98,11 @@ describe('updateConversationsWithUuidLookup', () => {
let sinonSandbox: sinon.SinonSandbox;
let fakeGetUuidsForE164s: sinon.SinonStub;
let fakeMessaging: Pick<SendMessage, 'getUuidsForE164s'>;
let fakeCheckAccountExistence: sinon.SinonStub;
let fakeMessaging: Pick<
SendMessage,
'getUuidsForE164s' | 'checkAccountExistence'
>;
beforeEach(() => {
sinonSandbox = sinon.createSandbox();
@ -106,7 +110,11 @@ describe('updateConversationsWithUuidLookup', () => {
sinonSandbox.stub(window.Signal.Data, 'updateConversation');
fakeGetUuidsForE164s = sinonSandbox.stub().resolves({});
fakeMessaging = { getUuidsForE164s: fakeGetUuidsForE164s };
fakeCheckAccountExistence = sinonSandbox.stub().resolves(false);
fakeMessaging = {
getUuidsForE164s: fakeGetUuidsForE164s,
checkAccountExistence: fakeCheckAccountExistence,
};
});
afterEach(() => {
@ -186,7 +194,7 @@ describe('updateConversationsWithUuidLookup', () => {
);
});
it("doesn't mark conversations unregistered if we already had a UUID for them, even if the server doesn't return one", async () => {
it("doesn't mark conversations unregistered if we already had a UUID for them, even if the account exists on server", async () => {
const existingUuid = UUID.generate().toString();
const conversation = createConversation({
e164: '+13215559876',
@ -198,6 +206,7 @@ describe('updateConversationsWithUuidLookup', () => {
);
fakeGetUuidsForE164s.resolves({ '+13215559876': null });
fakeCheckAccountExistence.resolves(true);
await updateConversationsWithUuidLookup({
conversationController: new FakeConversationController([conversation]),
@ -208,4 +217,28 @@ describe('updateConversationsWithUuidLookup', () => {
assert.strictEqual(conversation.get('uuid'), existingUuid);
assert.isUndefined(conversation.get('discoveredUnregisteredAt'));
});
it('marks conversations unregistered if we already had a UUID for them, even if the account does not exist on server', async () => {
const existingUuid = UUID.generate().toString();
const conversation = createConversation({
e164: '+13215559876',
uuid: existingUuid,
});
assert.isUndefined(
conversation.get('discoveredUnregisteredAt'),
'Test was not set up correctly'
);
fakeGetUuidsForE164s.resolves({ '+13215559876': null });
fakeCheckAccountExistence.resolves(false);
await updateConversationsWithUuidLookup({
conversationController: new FakeConversationController([conversation]),
conversations: [conversation],
messaging: fakeMessaging,
});
assert.strictEqual(conversation.get('uuid'), existingUuid);
assert.isNumber(conversation.get('discoveredUnregisteredAt'));
});
});