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

Introduce Service Id Types

Browse source 
Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
Fedor Indutny 2023-08-10 18:43:33 +02:00 • committed by Jamie Kyle
parent 414c0a58d3
commit 366b875fd2
269 changed files with 5832 additions and 5550 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ts/test-electron/models/conversations_test.ts
View file

@ -2,9 +2,11 @@
// SPDX-License-Identifier: AGPL-3.0-only
import { assert } from 'chai';
import { v4 as generateUuid } from 'uuid';
import { SendStatus } from '../../messages/MessageSendState';
import { IMAGE_PNG } from '../../types/MIME';
import { UUID } from '../../types/UUID';
import { generateAci, generatePni } from '../../types/ServiceId';
describe('Conversations', () => {
async function resetConversationController(): Promise<void> {
@ -18,15 +20,15 @@ describe('Conversations', () => {
it('updates lastMessage even in race conditions with db', async () => {
const ourNumber = '+15550000000';
const ourUuid = UUID.generate().toString();
const ourPni = UUID.generate().toString();
const ourAci = generateAci();
const ourPni = generatePni();
// Creating a fake conversation
const conversation = new window.Whisper.Conversation({
avatars: [],
id: UUID.generate().toString(),
id: generateUuid(),
e164: '+15551234567',
uuid: UUID.generate().toString(),
uuid: generateAci(),
type: 'private',
inbox_position: 0,
isPinned: false,
@ -40,7 +42,7 @@ describe('Conversations', () => {
await window.textsecure.storage.user.setCredentials({
number: ourNumber,
uuid: ourUuid,
aci: ourAci,
pni: ourPni,
deviceId: 2,
deviceName: 'my device',
@ -63,7 +65,7 @@ describe('Conversations', () => {
hasAttachments: false,
hasFileAttachments: false,
hasVisualMediaAttachments: false,
id: UUID.generate().toString(),
id: generateUuid(),
received_at: now,
sent_at: now,
timestamp: now,
@ -79,7 +81,7 @@ describe('Conversations', () => {
// Saving to db and updating the convo's last message
await window.Signal.Data.saveMessage(message.attributes, {
forceSave: true,
ourUuid,
ourAci,
});
message = window.MessageController.register(message.id, message);
await window.Signal.Data.updateConversation(conversation.attributes);
@ -113,9 +115,9 @@ describe('Conversations', () => {
// Creating a fake conversation
const conversation = new window.Whisper.Conversation({
avatars: [],
id: UUID.generate().toString(),
id: generateUuid(),
e164: '+15551234567',
uuid: UUID.generate().toString(),
uuid: generateAci(),
type: 'private',
inbox_position: 0,
isPinned: false,

24
ts/test-electron/models/messages_test.ts
View file

@ -3,6 +3,8 @@
import { assert } from 'chai';
import * as sinon from 'sinon';
import { v4 as generateUuid } from 'uuid';
import { setupI18n } from '../../util/setupI18n';
import enMessages from '../../../_locales/en/messages.json';
import { SendStatus } from '../../messages/MessageSendState';
@ -10,7 +12,7 @@ import MessageSender from '../../textsecure/SendMessage';
import type { WebAPIType } from '../../textsecure/WebAPI';
import type { CallbackResultType } from '../../textsecure/Types.d';
import type { StorageAccessType } from '../../types/Storage.d';
import { UUID } from '../../types/UUID';
import { generateAci } from '../../types/ServiceId';
import { SignalService as Proto } from '../../protobuf';
import { getContact } from '../../messages/helpers';
import type { ConversationModel } from '../../models/conversations';
@ -35,7 +37,7 @@ describe('Message', () => {
const source = '+1 415-555-5555';
const me = '+14155555556';
const ourUuid = UUID.generate().toString();
const ourUuid = generateAci();
function createMessage(attrs: { [key: string]: unknown }) {
const messages = new window.Whisper.MessageCollection();
@ -151,17 +153,17 @@ describe('Message', () => {
const fakeDataMessage = new Uint8Array(0);
const conversation1Uuid = conversation1.get('uuid');
const ignoredUuid = UUID.generate().toString();
const ignoredUuid = generateAci();
if (!conversation1Uuid) {
throw new Error('Test setup failed: conversation1 should have a UUID');
}
const promise = Promise.resolve<CallbackResultType>({
successfulIdentifiers: [conversation1Uuid, ignoredUuid],
successfulServiceIds: [conversation1Uuid, ignoredUuid],
errors: [
Object.assign(new Error('failed'), {
identifier: conversation2.get('uuid'),
serviceId: conversation2.get('uuid'),
}),
],
dataMessage: fakeDataMessage,
@ -240,19 +242,19 @@ describe('Message', () => {
let eve: ConversationModel | undefined;
before(() => {
alice = window.ConversationController.getOrCreate(
UUID.generate().toString(),
generateUuid(),
'private'
);
alice.set({ systemGivenName: 'Alice' });
bob = window.ConversationController.getOrCreate(
UUID.generate().toString(),
generateUuid(),
'private'
);
bob.set({ systemGivenName: 'Bob' });
eve = window.ConversationController.getOrCreate(
UUID.generate().toString(),
generateUuid(),
'private'
);
eve.set({ systemGivenName: 'Eve' });
@ -633,7 +635,7 @@ describe('Message', () => {
createMessage({
conversationId: (
await window.ConversationController.getOrCreateAndWait(
UUID.generate().toString(),
generateUuid(),
'private'
)
).id,
@ -657,7 +659,7 @@ describe('Message', () => {
createMessage({
conversationId: (
await window.ConversationController.getOrCreateAndWait(
UUID.generate().toString(),
generateUuid(),
'private'
)
).id,
@ -685,7 +687,7 @@ describe('Message', () => {
createMessage({
conversationId: (
await window.ConversationController.getOrCreateAndWait(
UUID.generate().toString(),
generateUuid(),
'private'
)
).id,