feat(RL-78): login syncs with bookmarks;

NoodleOfDeath · Nov 10, 2023 · abf6a63 · abf6a63
1 parent c6c02f2
commit abf6a63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/server/src/api/v1/schema/user/User.model.ts b/src/server/src/api/v1/schema/user/User.model.ts
@@ -218,10 +218,13 @@ export class User<A extends UserAttributes = UserAttributes, B extends UserCreat
     if (aliases.length === 0) {
       throw new AuthError('UNKNOWN_ALIAS');
     }
+    const metadata = await UserMetadata.findAll({ where: { userId: this.id } });
+    const updatedAt = new Date(Math.max(...[...aliases, ...metadata].map((m) => m.updatedAt.valueOf())));
     const profile: Profile = {
       email: aliases.sort((a, b) => a.priority - b.priority)[0].value,
       emails: aliases.map((a) => a.value),
-      preferences: Object.fromEntries((await UserMetadata.findAll({ where: { userId: this.id } })).map((meta) => [meta.key, typeof meta.value === 'string' ? JSON.parse(meta.value) : meta.value])),
+      preferences: Object.fromEntries(metadata.map((meta) => [meta.key, typeof meta.value === 'string' ? JSON.parse(meta.value) : meta.value])),
+      updatedAt,
       username: (await this.findAlias('username'))?.value,
     };
     this.set('profile', profile, { raw: true });

diff --git a/src/server/src/api/v1/schema/user/User.types.ts b/src/server/src/api/v1/schema/user/User.types.ts
@@ -7,6 +7,7 @@ export type Profile = {
   firstName?: string;
   lastName?: string;
   preferences?: { [key: string]: unknown };
+  updatedAt?: Date;
 };
 
 export type UserAttributes = DatedAttributes & {