Unify user data API between server and frontend (#3432)

* Unify position of the "email" key/property between backend and various frontend definitions * Add missing "theme" key to the ApiUserData type
mozilla · Nov 6, 2024 · da516ae · da516ae
1 parent 4b23a5d
commit da516ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/translate/src/api/user.ts b/translate/src/api/user.ts
@@ -27,9 +27,9 @@ export type ApiUserData = {
   is_admin?: boolean;
   is_pm?: boolean;
   id?: string;
+  email?: string;
   display_name?: string;
   name_or_email?: string;
-  email?: string;
   username?: string;
   date_joined?: string;
   can_manage_locales?: string[];
@@ -51,6 +51,7 @@ export type ApiUserData = {
     notifications: Notification[];
     unread_count: string;
   };
+  theme?: string;
 };
 
 /** All users for use in mentions suggestions within comments */

diff --git a/translate/src/modules/user/reducer.ts b/translate/src/modules/user/reducer.ts
@@ -69,9 +69,9 @@ export type UserState = {
   readonly isAdmin: boolean;
   readonly isPM: boolean;
   readonly id: string;
+  readonly email: string;
   readonly displayName: string;
   readonly nameOrEmail: string;
-  readonly email: string;
   readonly username: string;
   readonly dateJoined: string;
   readonly canManageLocales: Array<string>;
@@ -97,9 +97,9 @@ const initial: UserState = {
   isAdmin: false,
   isPM: false,
   id: '',
+  email: '',
   displayName: '',
   nameOrEmail: '',
-  email: '',
   username: '',
   dateJoined: '',
   canManageLocales: [],