Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-28 12:23:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use libsignal-net typed Chat API for lookup by username

Browse Source 
Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
Alex Bakon
2025-12-17 12:25:37 -05:00
committed by GitHub
parent ec9a31007b
commit d28e3a783a
4 changed files with 107 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ts/util/lookupConversationWithoutServiceId.preload.ts
View File

@@ -1,21 +1,20 @@
// Copyright 2022 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import { usernames, LibSignalErrorBase } from '@signalapp/libsignal-client';
import { usernames } from '@signalapp/libsignal-client';
import type { UserNotFoundModalStateType } from '../state/ducks/globalModals.preload.js';
import { createLogger } from '../logging/log.std.js';
import type { AciString } from '../types/ServiceId.std.js';
import * as Errors from '../types/errors.std.js';
import { ToastType } from '../types/Toast.dom.js';
import { strictAssert } from './assert.std.js';
import type { UUIDFetchStateKeyType } from './uuidFetchState.std.js';
import { getServiceIdsForE164s } from './getServiceIdsForE164s.dom.js';
import {
getAccountForUsername,
cdsLookup,
} from '../textsecure/WebAPI.preload.js';
import * as Errors from '../types/errors.std.js';
import { ToastType } from '../types/Toast.dom.js';
import { HTTPError } from '../types/HTTPError.std.js';
import { strictAssert } from './assert.std.js';
import type { UUIDFetchStateKeyType } from './uuidFetchState.std.js';
import { getServiceIdsForE164s } from './getServiceIdsForE164s.dom.js';
const log = createLogger('lookupConversationWithoutServiceId');
@@ -155,33 +154,17 @@ export async function checkForUsername(
return undefined;
}
try {
const account = await getAccountForUsername({
hash,
});
const accountAci = await getAccountForUsername({
hash,
});
if (!account.uuid) {
log.error("checkForUsername: Returned account didn't include a uuid");
return;
}
return {
aci: account.uuid,
username: fixedUsername,
};
} catch (error) {
if (error instanceof HTTPError) {
if (error.code === 404) {
return undefined;
}
}
// Invalid username
if (error instanceof LibSignalErrorBase) {
log.error('checkForUsername: invalid username');
return undefined;
}
throw error;
if (!accountAci) {
log.error("checkForUsername: Returned account didn't include a uuid");
return;
}
return {
aci: accountAci,
username: fixedUsername,
};
}