Paths

Table of Contentst

-
services/identity/src/
-
identity/
-
src/
-
database.rs

[identity] Add devices to the new list after login and register
ClosedPublic
Actions

Authored by bartek on Dec 7 2023, 12:38 AM.

Details

Reviewers

varun
michal

Commits

rCOMMb87de1144e69: [identity] Add devices to the new list after login and register

Summary

Updated LoginUser and RegisterUser DDB calls to double-write new device info to both "legacy" and new device list.

Depends on D10220

Test Plan

Used keyserver to first register, then login (after restart). Used awslocal dynamodb scan to inspect both tables - both were updated successfully.

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bartek created this revision.Dec 7 2023, 12:38 AM

bartek held this revision as a draft.

Herald added subscribers: tomek, ashoat. · View Herald TranscriptDec 7 2023, 12:38 AM

I know the code is nearly duplicated: both password- and wallet- functions are nearly identical.
This is going to be refactored anyway when fully migrated to the new device list.
Now this is the least intrusive way to plug the new device list into existing codebase without introducing too much mess.

Harbormaster completed remote builds in B24849: Diff 34371.Dec 7 2023, 2:02 AM

bartek added a child revision: D10246: [identity] Add function to delete all user devices data.Dec 8 2023, 4:40 AM

varun accepted this revision.Dec 8 2023, 12:22 PM

This revision is now accepted and ready to land.Dec 8 2023, 12:22 PM

Rebase

Harbormaster completed remote builds in B24968: Diff 34506.Dec 12 2023, 1:12 AM

bartek removed a child revision: D10246: [identity] Add function to delete all user devices data.Jan 5 2024, 12:54 AM

bartek edited parent revisions, added: D10301: [identity] Add GetDeviceListForUser RPC; removed: D10220: [identity] Add function to add new device to the list.

bartek added a child revision: D10303: [identity] Augment get_keys_for_user to use devices table.

bartek edited child revisions, added: D10302: [identity] Make set_prekey() update devices table too; removed: D10303: [identity] Augment get_keys_for_user to use devices table.

Closed by commit rCOMMb87de1144e69: [identity] Add devices to the new list after login and register (authored by bartek). · Explain WhyJan 15 2024, 6:53 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMMb87de1144e69: [identity] Add devices to the new list after login and register.

Revision Contents
Changeset List

Path

Size

services/

identity/

src/

database.rs

73 lines

Diff 35621

View Options

services/identity/src/database.rs

Show All 20 Lines
import { useNewThread } from 'lib/actions/thread-actions.js';		import { useNewThread } from 'lib/actions/thread-actions.js';
import {		import {
uploadMultimedia,		uploadMultimedia,
updateMultimediaMessageMediaActionType,		updateMultimediaMessageMediaActionType,
useBlobServiceUpload,		useBlobServiceUpload,
type MultimediaUploadCallbacks,		type MultimediaUploadCallbacks,
type MultimediaUploadExtras,		type MultimediaUploadExtras,
type BlobServiceUploadAction,		type BlobServiceUploadAction,
		type BlobServiceUploadResult,
} from 'lib/actions/upload-actions.js';		} from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';		import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js';		import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js';
import {		import {
isLocalUploadID,		isLocalUploadID,
getNextLocalUploadID,		getNextLocalUploadID,
} from 'lib/media/media-utils.js';		} from 'lib/media/media-utils.js';
import { videoDurationLimit } from 'lib/media/video-utils.js';		import { videoDurationLimit } from 'lib/media/video-utils.js';
▲ Show 20 Lines • Show All 797 Lines • ▼ Show 20 Lines	): Promise<?string> {
const { hasWiFi } = this.props;		const { hasWiFi } = this.props;

const uploadStart = Date.now();		const uploadStart = Date.now();
let uploadExceptionMessage,		let uploadExceptionMessage,
uploadResult,		uploadResult,
uploadThumbnailResult,		uploadThumbnailResult,
mediaMissionResult;		mediaMissionResult;
try {		try {
const uploadPromises = [];
if (		if (
this.useBlobServiceUploads &&		this.useBlobServiceUploads &&
(processedMedia.mediaType === 'encrypted_photo' \|\|		(processedMedia.mediaType === 'encrypted_photo' \|\|
processedMedia.mediaType === 'encrypted_video')		processedMedia.mediaType === 'encrypted_video')
) {		) {
uploadPromises.push(		const uploadPromise = this.props.blobServiceUpload({
this.props.blobServiceUpload({
uploadInput: {		uploadInput: {
blobInput: {		blobInput: {
type: 'uri',		type: 'uri',
uri: uploadURI,		uri: uploadURI,
filename: filename,		filename: filename,
mimeType: mime,		mimeType: mime,
},		},
blobHash: processedMedia.blobHash,		blobHash: processedMedia.blobHash,
encryptionKey: processedMedia.encryptionKey,		encryptionKey: processedMedia.encryptionKey,
dimensions: processedMedia.dimensions,		dimensions: processedMedia.dimensions,
thumbHash:		thumbHash:
processedMedia.mediaType === 'encrypted_photo'		processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash		? processedMedia.thumbHash
: null,		: null,
},		},
keyserverOrThreadID: threadInfo.id,		keyserverOrThreadID: threadInfo.id,
callbacks: {		callbacks: {
blobServiceUploadHandler,		blobServiceUploadHandler,
onProgress: (percent: number) => {		onProgress: (percent: number) => {
this.setProgress(		this.setProgress(
localMessageID,		localMessageID,
localMediaID,		localMediaID,
'uploading',		'uploading',
percent,		percent,
);		);
},		},
},		},
}),		});
);

if (processedMedia.mediaType === 'encrypted_video') {		const uploadThumbnailPromise: Promise<?BlobServiceUploadResult> =
uploadPromises.push(		(async () => {
this.props.blobServiceUpload({		if (processedMedia.mediaType !== 'encrypted_video') {
		return undefined;
		}
		return await this.props.blobServiceUpload({
uploadInput: {		uploadInput: {
blobInput: {		blobInput: {
type: 'uri',		type: 'uri',
uri: processedMedia.uploadThumbnailURI,		uri: processedMedia.uploadThumbnailURI,
filename: replaceExtension(`thumb${filename}`, 'jpg'),		filename: replaceExtension(`thumb${filename}`, 'jpg'),
mimeType: 'image/jpeg',		mimeType: 'image/jpeg',
},		},
blobHash: processedMedia.thumbnailBlobHash,		blobHash: processedMedia.thumbnailBlobHash,
encryptionKey: processedMedia.thumbnailEncryptionKey,		encryptionKey: processedMedia.thumbnailEncryptionKey,
loop: false,		loop: false,
dimensions: processedMedia.dimensions,		dimensions: processedMedia.dimensions,
thumbHash: processedMedia.thumbHash,		thumbHash: processedMedia.thumbHash,
},		},
keyserverOrThreadID: threadInfo.id,		keyserverOrThreadID: threadInfo.id,
callbacks: {		callbacks: {
blobServiceUploadHandler,		blobServiceUploadHandler,
},		},
}),		});
);		})();
}
[uploadResult, uploadThumbnailResult] = await Promise.all(		[uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromises,		uploadPromise,
);		uploadThumbnailPromise,
		]);
} else {		} else {
uploadPromises.push(		const uploadPromise = this.props.uploadMultimedia(
this.props.uploadMultimedia(
{ uri: uploadURI, name: filename, type: mime },		{ uri: uploadURI, name: filename, type: mime },
{		{
...processedMedia.dimensions,		...processedMedia.dimensions,
loop:		loop:
processedMedia.mediaType === 'video' \|\|		processedMedia.mediaType === 'video' \|\|
processedMedia.mediaType === 'encrypted_video'		processedMedia.mediaType === 'encrypted_video'
? processedMedia.loop		? processedMedia.loop
: undefined,		: undefined,
encryptionKey: processedMedia.encryptionKey,		encryptionKey: processedMedia.encryptionKey,
thumbHash:		thumbHash:
processedMedia.mediaType === 'photo' \|\|		processedMedia.mediaType === 'photo' \|\|
processedMedia.mediaType === 'encrypted_photo'		processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash		? processedMedia.thumbHash
: null,		: null,
},		},
{		{
onProgress: (percent: number) =>		onProgress: (percent: number) =>
this.setProgress(		this.setProgress(
localMessageID,		localMessageID,
localMediaID,		localMediaID,
'uploading',		'uploading',
percent,		percent,
),		),
uploadBlob: this.uploadBlob,		uploadBlob: this.uploadBlob,
},		},
),
);		);

		const uploadThumbnailPromise: Promise<?UploadMultimediaResult> =
		(async () => {
if (		if (
processedMedia.mediaType === 'video' \|\|		processedMedia.mediaType !== 'video' &&
processedMedia.mediaType === 'encrypted_video'		processedMedia.mediaType !== 'encrypted_video'
) {		) {
uploadPromises.push(		return undefined;
this.props.uploadMultimedia(		}
		return await this.props.uploadMultimedia(
{		{
uri: processedMedia.uploadThumbnailURI,		uri: processedMedia.uploadThumbnailURI,
name: replaceExtension(`thumb${filename}`, 'jpg'),		name: replaceExtension(`thumb${filename}`, 'jpg'),
type: 'image/jpeg',		type: 'image/jpeg',
},		},
{		{
...processedMedia.dimensions,		...processedMedia.dimensions,
loop: false,		loop: false,
encryptionKey: processedMedia.thumbnailEncryptionKey,		encryptionKey: processedMedia.thumbnailEncryptionKey,
thumbHash: processedMedia.thumbHash,		thumbHash: processedMedia.thumbHash,
},		},
{		{
uploadBlob: this.uploadBlob,		uploadBlob: this.uploadBlob,
},		},
),
);
}
[uploadResult, uploadThumbnailResult] = await Promise.all(
uploadPromises,
);		);
		})();

		[uploadResult, uploadThumbnailResult] = await Promise.all([
		uploadPromise,
		uploadThumbnailPromise,
		]);
}		}
mediaMissionResult = { success: true };		mediaMissionResult = { success: true };
} catch (e) {		} catch (e) {
uploadExceptionMessage = getMessageForException(e);		uploadExceptionMessage = getMessageForException(e);
onUploadFailed(localMediaID, 'upload failed');		onUploadFailed(localMediaID, 'upload failed');
mediaMissionResult = {		mediaMissionResult = {
success: false,		success: false,
reason: 'http_upload_failed',		reason: 'http_upload_failed',
▲ Show 20 Lines • Show All 787 Lines • Show Last 20 Lines

[identity] Add devices to the new list after login and registerClosedPublicActions