fix: explicitly pass token (#1649)

* fix: explicitly pass token * fix: replace temp error messaging
CityOfDetroit · Dec 22, 2023 · bad8bae · bad8bae
1 parent f7ca60f
commit bad8bae
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/shared-helpers/src/AuthContext.ts b/shared-helpers/src/AuthContext.ts
@@ -296,7 +296,9 @@ export const AuthProvider: FunctionComponent<React.PropsWithChildren> = ({ child
     },
     loginWithToken: async (token: string) => {
       dispatch(saveToken({ accessToken: token, apiUrl, dispatch }))
-      const profile = await userService?.userControllerProfile()
+      const profile = await userService?.userControllerProfile({
+        headers: { Authorization: `Bearer ${token}` },
+      })
       if (profile) {
         dispatch(saveProfile(profile))
         return profile
@@ -317,12 +319,13 @@ export const AuthProvider: FunctionComponent<React.PropsWithChildren> = ({ child
         })
         if (response) {
           dispatch(saveToken({ accessToken: response.accessToken, apiUrl, dispatch }))
-          // 12/18 - Short-term error fix to allow user accesss
-          // const profile = await userService?.userControllerProfile()
-          // if (profile) {
-          //   dispatch(saveProfile(profile))
-          //   return profile
-          // }
+          const profile = await userService?.userControllerProfile({
+            headers: { Authorization: `Bearer ${response.accessToken}` },
+          })
+          if (profile) {
+            dispatch(saveProfile(profile))
+            return profile
+          }
         }
         return undefined
       } finally {
@@ -335,7 +338,9 @@ export const AuthProvider: FunctionComponent<React.PropsWithChildren> = ({ child
         const response = await userService?.confirm({ body: { token } })
         if (response) {
           dispatch(saveToken({ accessToken: response.accessToken, apiUrl, dispatch }))
-          const profile = await userService?.userControllerProfile()
+          const profile = await userService?.userControllerProfile({
+            headers: { Authorization: `Bearer ${response.accessToken}` },
+          })
           if (profile) {
             dispatch(saveProfile(profile))
             return profile

diff --git a/sites/partners/src/components/users/FormUserConfirm.tsx b/sites/partners/src/components/users/FormUserConfirm.tsx
@@ -45,7 +45,7 @@ const FormUserConfirm = () => {
   password.current = watch("password", "")
 
   const [isLoginLoading, setLoginLoading] = useState(false)
-  const [isSubmitting, setSubmitting] = useState(false)
+  const [isTokenChecked, setIsTokenChecked] = useState(false)
   const [termsModal, setTermsModal] = useState(null)
   const [rerequestModalOpen, setRerequestModalOpen] = useState(false)
   const [newConfirmationRequested, setNewConfirmationRequested] = useState(false)
@@ -58,10 +58,11 @@ const FormUserConfirm = () => {
   ]
 
   useEffect(() => {
-    if (!isSubmitting && token) {
+    if (!isTokenChecked && token) {
       userService
         .isUserConfirmationTokenValid({ body: { token } })
         .then((res) => {
+          setIsTokenChecked(true)
           if (!res) {
             setRerequestModalOpen(true)
           }
@@ -70,10 +71,9 @@ const FormUserConfirm = () => {
           setRerequestModalOpen(true)
         })
     }
-  }, [isSubmitting, token, userService])
+  }, [isTokenChecked, token, userService])
 
   const onSubmit = async (data: FormUserConfirmFields) => {
-    setSubmitting(true)
     resetMutation()
 
     const body = {
@@ -98,11 +98,9 @@ const FormUserConfirm = () => {
         setSiteAlertMessage(t(`users.accountConfirmed`), "success")
         void router.push("/")
       } else {
-        setSubmitting(false)
         setRerequestModalOpen(true)
       }
     } catch (err) {
-      setSubmitting(false)
       console.error(err)
     }
   }

diff --git a/sites/partners/src/pages/reset-password.tsx b/sites/partners/src/pages/reset-password.tsx
@@ -31,9 +31,9 @@ const ResetPassword = () => {
     const { password, passwordConfirmation } = data
 
     try {
-      await resetPassword(token.toString(), password, passwordConfirmation)
-      setSiteAlertMessage(t(`account.settings.passwordSuccess`), "notice")
-      await router.push("/sign-in")
+      const user = await resetPassword(token.toString(), password, passwordConfirmation)
+      setSiteAlertMessage(t(`authentication.signIn.success`, { name: user.firstName }), "success")
+      await router.push("/")
       window.scrollTo(0, 0)
     } catch (err) {
       const { status, data } = err.response || {}

diff --git a/sites/public/src/pages/reset-password.tsx b/sites/public/src/pages/reset-password.tsx
@@ -40,9 +40,9 @@ const ResetPassword = () => {
     const { password, passwordConfirmation } = data
 
     try {
-      await resetPassword(token.toString(), password, passwordConfirmation)
-      setSiteAlertMessage(t(`account.settings.passwordSuccess`), "notice")
-      await router.push("/sign-in")
+      const user = await resetPassword(token.toString(), password, passwordConfirmation)
+      setSiteAlertMessage(t(`authentication.signIn.success`, { name: user.firstName }), "success")
+      await router.push("/account/dashboard")
     } catch (err) {
       const { status, data } = err.response || {}
       if (status === 400) {