Fix allowing user to change email (#959)

* Update signature of getCurrentUser() to return undefined instead of null

* Fix user settings to allow users to change their email address

src/backend/localStorage.tsx

@@ -24,9 +24,9 @@ export function setAvatar(src: string) {
   localStorage.setItem(LocalStorageKey.Avatar, src);
 }
 
-export function getCurrentUser(): User | null {
+export function getCurrentUser(): User | undefined {
   const userString = localStorage.getItem(LocalStorageKey.User);
-  return userString ? JSON.parse(userString) : null;
+  return userString ? JSON.parse(userString) : undefined;
 }
 export function setCurrentUser(user: User) {
   const userString = JSON.stringify(user);

src/backend/tests/localStorage.test.tsx

@@ -38,7 +38,7 @@ afterAll(() => {
 
 function expectAllEmpty() {
   expect(LocalStorage.getAvatar()).toEqual("");
-  expect(LocalStorage.getCurrentUser()).toEqual(null);
+  expect(LocalStorage.getCurrentUser()).toEqual(undefined);
   expect(LocalStorage.getMergeDupsBlacklist()).toEqual({});
   expect(LocalStorage.getProjectId()).toEqual("");
   expect(LocalStorage.getUserId()).toEqual("");

src/components/GoalTimeline/tests/GoalTimelineActions.test.tsx

@@ -60,7 +60,7 @@ let mockGoalData: MergeDupData;
 const createMockStore = configureMockStore([thunk]);
 let mockStore: MockStoreEnhanced<unknown, {}>;
 let oldProjectId: string;
-let oldUser: User | null;
+let oldUser: User | undefined;
 
 const mockProjectId = "123";
 const mockUserEditId = "456";

src/components/Login/AuthHeaders.tsx

@@ -1,5 +1,4 @@
 import { getCurrentUser } from "backend/localStorage";
-import { User } from "types/user";
 
 export interface AuthHeader {
   authorization?: string;
@@ -15,7 +14,7 @@ export interface AuthHeader {
  */
 
 export default function authHeader(): AuthHeader {
-  const user: User | null = getCurrentUser();
+  const user = getCurrentUser();
   if (user && user.token) {
     return { authorization: "Bearer " + user.token };
   } else {

src/components/Login/LoginActions.tsx

@@ -105,7 +105,7 @@ export function loginReset(): UserAction {
 
 export function logoutAndResetStore() {
   return (dispatch: StoreStateDispatch) => {
-    const user: User | null = LocalStorage.getCurrentUser();
+    const user = LocalStorage.getCurrentUser();
     if (user) {
       dispatch(logout(user.username));
     }

src/components/Login/tests/AuthHeaders.test.tsx

@@ -2,7 +2,7 @@ import * as LocalStorage from "backend/localStorage";
 import { User } from "types/user";
 import authHeader from "components/Login/AuthHeaders";
 
-let oldUser: User | null;
+let oldUser: User | undefined;
 
 beforeAll(() => {
   oldUser = LocalStorage.getCurrentUser();

src/components/UserSettings/UserSettings.tsx

@@ -98,8 +98,8 @@ class UserSettings extends React.Component<
 > {
   constructor(props: LocalizeContextProps) {
     super(props);
-    const potentialUser: User | null = getCurrentUser();
-    const user: User = potentialUser ? potentialUser : new User("", "", "");
+    const potentialUser = getCurrentUser();
+    const user = potentialUser ? potentialUser : new User("", "", "");
     this.state = {
       user: user,
       name: user.name,
@@ -123,15 +123,20 @@ class UserSettings extends React.Component<
     this.setState({ [field]: value } as Pick<UserSettingsState, K>);
   }
 
-  isEmailOkay() {
+  async isEmailOkay(): Promise<boolean> {
     const emailUnchanged =
       this.state.email.toLowerCase() === this.state.user.email.toLowerCase();
-    return emailUnchanged || !isEmailTaken(this.state.email);
+
+    if (emailUnchanged) {
+      return true;
+    }
+
+    return !(await isEmailTaken(this.state.email));
   }
 
-  onSubmit(e: React.FormEvent<HTMLFormElement>) {
+  async onSubmit(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault();
-    if (this.isEmailOkay()) {
+    if (await this.isEmailOkay()) {
       const newUser: User = this.state.user;
       newUser.name = this.state.name;
       newUser.phone = this.state.phone;

src/goals/CharInventoryCreation/tests/CharacterInventoryActions.test.tsx

@@ -55,7 +55,7 @@ const MOCK_STATE = {
 };
 
 let oldProjectId: string;
-let oldUser: User | null;
+let oldUser: User | undefined;
 const mockProjectId = "123";
 const mockUserEditId = "456";
 const mockUserId = "789";