Page MenuHomePhabricator
Files F3527380

D10749.diff
No OneTemporary
Actions

D10749.diff
View Options

diff --git a/lib/types/identity-service-types.js b/lib/types/identity-service-types.js
--- a/lib/types/identity-service-types.js
+++ b/lib/types/identity-service-types.js
@@ -47,6 +47,11 @@
socialProof: t.maybe(t.String),
});
+export type UserDevicesOlmOutboundKeys = {
+ +deviceID: string,
+ +keys: ?DeviceOlmOutboundKeys,
+};
+
export interface IdentityServiceClient {
+deleteUser: () => Promise<void>;
+getKeyserverKeys: string => Promise<DeviceOlmOutboundKeys>;
@@ -54,6 +59,9 @@
username: string,
password: string,
) => Promise<IdentityAuthResult>;
+ +getOutboundKeysForUser?: (
+ userID: string,
+ ) => Promise<UserDevicesOlmOutboundKeys[]>;
}
export type IdentityServiceAuthLayer = {
diff --git a/web/grpc/identity-service-client-wrapper.js b/web/grpc/identity-service-client-wrapper.js
--- a/web/grpc/identity-service-client-wrapper.js
+++ b/web/grpc/identity-service-client-wrapper.js
@@ -6,6 +6,7 @@
type IdentityServiceClient,
type DeviceOlmOutboundKeys,
deviceOlmOutboundKeysValidator,
+ type UserDevicesOlmOutboundKeys,
} from 'lib/types/identity-service-types.js';
import { assertWithValidator } from 'lib/utils/validation-utils.js';
@@ -123,6 +124,84 @@
return assertWithValidator(keyserverKeys, deviceOlmOutboundKeysValidator);
};
+
+ getOutboundKeysForUser: (
+ userID: string,
+ ) => Promise<UserDevicesOlmOutboundKeys[]> = async (userID: string) => {
+ const client = this.authClient;
+ if (!client) {
+ throw new Error('Identity service client is not initialized');
+ }
+
+ const request = new IdentityAuthStructs.OutboundKeysForUserRequest();
+ request.setUserId(userID);
+ const response = await client.getOutboundKeysForUser(request);
+ const devicesMap = response.toObject()?.devicesMap;
+
+ if (!devicesMap || !Array.isArray(devicesMap)) {
+ throw new Error('Invalid devicesMap');
+ }
+
+ const devicesKeys: (?UserDevicesOlmOutboundKeys)[] = devicesMap.map(
+ ([deviceID, outboundKeysInfo]) => {
+ const identityInfo = outboundKeysInfo?.identityInfo;
+ const payload = identityInfo?.payload;
+ const contentPreKey = outboundKeysInfo?.contentPrekey;
+ const notifPreKey = outboundKeysInfo?.notifPrekey;
+
+ if (!(typeof deviceID === 'string')) {
+ console.log(`Invalid deviceID in devicesMap: ${deviceID}`);
+ return null;
+ }
+
+ if (
+ !outboundKeysInfo.oneTimeContentPrekey ||
+ !outboundKeysInfo.oneTimeNotifPrekey
+ ) {
+ console.log(`Missing one time key for device ${deviceID}`);
+ return {
+ deviceID,
+ keys: null,
+ };
+ }
+
+ const deviceKeys = {
+ identityKeysBlob: payload ? JSON.parse(payload) : null,
+ contentInitializationInfo: {
+ prekey: contentPreKey?.prekey,
+ prekeySignature: contentPreKey?.prekeySignature,
+ oneTimeKey: outboundKeysInfo.oneTimeContentPrekey,
+ },
+ notifInitializationInfo: {
+ prekey: notifPreKey?.prekey,
+ prekeySignature: notifPreKey?.prekeySignature,
+ oneTimeKey: outboundKeysInfo.oneTimeNotifPrekey,
+ },
+ payloadSignature: identityInfo?.payloadSignature,
+ socialProof: identityInfo?.socialProof,
+ };
+
+ try {
+ const validatedKeys = assertWithValidator(
+ deviceKeys,
+ deviceOlmOutboundKeysValidator,
+ );
+ return {
+ deviceID,
+ keys: validatedKeys,
+ };
+ } catch (e) {
+ console.log(e);
+ return {
+ deviceID,
+ keys: null,
+ };
+ }
+ },
+ );
+
+ return devicesKeys.filter(Boolean);
+ };
}
export { IdentityServiceClientWrapper };

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 4:50 AM (11 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2701608
Default Alt Text
D10749.diff (3 KB)

Event Timeline