From a88e55db1dcbca0bd6307edfe23eb9973dacb0dd Mon Sep 17 00:00:00 2001
From: Mike <mike.tasset@gmail.com>
Date: Fri, 24 Jan 2025 22:11:36 +0100
Subject: [PATCH] Fix: Align forgot password screens (#3895)

---
 .../components/auth/LoginWithEmailBlock.vue   |  4 +--
 .../auth/PasswordResetFinalizationPanel.vue   | 34 +++++++------------
 .../components/auth/PasswordResetPanel.vue    |  9 +++--
 .../components/auth/RegisterPanel.vue         |  2 +-
 .../auth/RegisterWithEmailBlock.vue           |  2 +-
 .../lib/auth/composables/passwordReset.ts     |  4 +--
 .../lib/common/generated/gql/graphql.ts       | 12 +++++++
 7 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/packages/frontend-2/components/auth/LoginWithEmailBlock.vue b/packages/frontend-2/components/auth/LoginWithEmailBlock.vue
index e84ed2218..748743f83 100644
--- a/packages/frontend-2/components/auth/LoginWithEmailBlock.vue
+++ b/packages/frontend-2/components/auth/LoginWithEmailBlock.vue
@@ -35,9 +35,9 @@
       Log in
     </FormButton>
     <div class="mt-1 text-center text-body-xs text-foreground-3 select-none">
-      Forgot password?
+      Forgot your password?
       <NuxtLink :to="forgottenPasswordRoute" class="text-foreground">
-        Recover password
+        Reset password
       </NuxtLink>
     </div>
   </form>
diff --git a/packages/frontend-2/components/auth/PasswordResetFinalizationPanel.vue b/packages/frontend-2/components/auth/PasswordResetFinalizationPanel.vue
index 85c1da964..bf13751d1 100644
--- a/packages/frontend-2/components/auth/PasswordResetFinalizationPanel.vue
+++ b/packages/frontend-2/components/auth/PasswordResetFinalizationPanel.vue
@@ -1,34 +1,28 @@
 <template>
   <form class="mx-auto w-full px-2" @submit="onSubmit">
-    <h1 class="text-heading-xl text-center inline-block mb-4">Reset your password</h1>
+    <h1 class="text-heading-xl text-center w-full inline-block mb-4">
+      Reset your password
+    </h1>
 
-    <div class="flex flex-col space-y-2 text-body-sm">
-      <div class="mb-4">One step closer to resetting your password</div>
+    <div class="flex flex-col space-y-4">
+      <p class="text-center text-body-xs text-foreground mb-2">
+        Choose a new password for your Speckle account
+      </p>
       <FormTextInput
+        v-model="password"
         type="password"
         name="password"
         label="Password"
         placeholder="New password"
         color="foundation"
         size="lg"
-        :rules="passwordRules"
+        :rules="[isRequired]"
         show-label
-        show-required
-      />
-      <FormTextInput
-        type="password"
-        name="password-repeat"
-        label="Password (confirmation)"
-        color="foundation"
-        size="lg"
-        :rules="passwordRepeatRules"
-        placeholder="Confirm new password"
-        show-label
-        show-required
       />
+      <AuthPasswordChecks :password="password" />
     </div>
 
-    <FormButton class="mt-4" submit full-width size="lg" :disabled="loading">
+    <FormButton class="mt-8" submit full-width size="lg" :disabled="loading">
       Reset password
     </FormButton>
   </form>
@@ -36,11 +30,10 @@
 <script setup lang="ts">
 import { useForm } from 'vee-validate'
 import { usePasswordReset } from '~~/lib/auth/composables/passwordReset'
-import { isRequired, isSameAs } from '~~/lib/common/helpers/validation'
+import { isRequired } from '~~/lib/common/helpers/validation'
 
 type FormValues = {
   password: string
-  repeatPassword: string
 }
 
 const props = defineProps<{
@@ -50,9 +43,8 @@ const props = defineProps<{
 const { handleSubmit } = useForm<FormValues>()
 const { finalize } = usePasswordReset()
 
-const passwordRules = [isRequired]
-const passwordRepeatRules = [...passwordRules, isSameAs('password')]
 const loading = ref(false)
+const password = ref('')
 
 const onSubmit = handleSubmit(
   async ({ password }) => await finalize(password, props.token)
diff --git a/packages/frontend-2/components/auth/PasswordResetPanel.vue b/packages/frontend-2/components/auth/PasswordResetPanel.vue
index d72fd678a..d9e3a7fcf 100644
--- a/packages/frontend-2/components/auth/PasswordResetPanel.vue
+++ b/packages/frontend-2/components/auth/PasswordResetPanel.vue
@@ -3,10 +3,9 @@
     <h1 class="text-heading-xl text-center inline-block mb-4 w-full">
       Reset your password
     </h1>
-    <div class="flex flex-col space-y-4 text-body-xs">
-      <div>
-        Type in the email address you used, so we can verify your account. We will send
-        you instructions on how to reset your password.
+    <div class="flex flex-col space-y-4">
+      <div class="text-body-xs text-foreground text-center mb-2">
+        Enter your email address and we'll send you the password reset instructions.
       </div>
       <div>
         <FormTextInput
@@ -20,7 +19,7 @@
       </div>
     </div>
 
-    <div class="flex flex-col gap-y-2 mt-4">
+    <div class="flex flex-col gap-y-2 mt-8">
       <FormButton submit full-width size="lg" :disabled="loading">
         Send reset email
       </FormButton>
diff --git a/packages/frontend-2/components/auth/RegisterPanel.vue b/packages/frontend-2/components/auth/RegisterPanel.vue
index 5f9ade8ec..3edb6e62c 100644
--- a/packages/frontend-2/components/auth/RegisterPanel.vue
+++ b/packages/frontend-2/components/auth/RegisterPanel.vue
@@ -20,7 +20,7 @@
           class="flex gap-1 text-foregound-3 text-body-xs items-center justify-center"
         >
           <span>Already have an account?</span>
-          <CommonTextLink :to="loginRoute">Log in</CommonTextLink>
+          <NuxtLink class="text-foreground" :to="loginRoute">Log in</NuxtLink>
         </div>
       </template>
       <template v-else>
diff --git a/packages/frontend-2/components/auth/RegisterWithEmailBlock.vue b/packages/frontend-2/components/auth/RegisterWithEmailBlock.vue
index 1005b4338..4949acc51 100644
--- a/packages/frontend-2/components/auth/RegisterWithEmailBlock.vue
+++ b/packages/frontend-2/components/auth/RegisterWithEmailBlock.vue
@@ -55,7 +55,7 @@
     <AuthRegisterTerms v-if="serverInfo.termsOfService" :server-info="serverInfo" />
     <div v-if="!inviteEmail" class="mt-2 sm:mt-4 text-center text-body-xs">
       <span class="mr-2 text-foreground-3">Already have an account?</span>
-      <CommonTextLink :to="finalLoginRoute">Log in</CommonTextLink>
+      <NuxtLink class="text-foreground" :to="finalLoginRoute">Log in</NuxtLink>
     </div>
   </form>
 </template>
diff --git a/packages/frontend-2/lib/auth/composables/passwordReset.ts b/packages/frontend-2/lib/auth/composables/passwordReset.ts
index bdcd312ec..33837063e 100644
--- a/packages/frontend-2/lib/auth/composables/passwordReset.ts
+++ b/packages/frontend-2/lib/auth/composables/passwordReset.ts
@@ -19,8 +19,8 @@ export function usePasswordReset() {
       await requestResetEmail({ email, apiOrigin })
       triggerNotification({
         type: ToastNotificationType.Info,
-        title: 'Password reset process initialized',
-        description: `We've sent you instructions on how to reset your password at ${email}`
+        title: 'Password reset email sent',
+        description: `We've sent the password reset instructions to ${email}`
       })
     } catch (e) {
       triggerNotification({
diff --git a/packages/frontend-2/lib/common/generated/gql/graphql.ts b/packages/frontend-2/lib/common/generated/gql/graphql.ts
index 1217df02e..dec188ec9 100644
--- a/packages/frontend-2/lib/common/generated/gql/graphql.ts
+++ b/packages/frontend-2/lib/common/generated/gql/graphql.ts
@@ -3845,6 +3845,7 @@ export type UserEmailMutations = {
   delete: User;
   requestNewEmailVerification?: Maybe<Scalars['Boolean']['output']>;
   setPrimary: User;
+  verify?: Maybe<Scalars['Boolean']['output']>;
 };
 
 
@@ -3867,6 +3868,11 @@ export type UserEmailMutationsSetPrimaryArgs = {
   input: SetPrimaryUserEmailInput;
 };
 
+
+export type UserEmailMutationsVerifyArgs = {
+  input: VerifyUserEmailInput;
+};
+
 export type UserGendoAiCredits = {
   __typename?: 'UserGendoAICredits';
   limit: Scalars['Int']['output'];
@@ -3947,6 +3953,11 @@ export type UsersRetrievalInput = {
   query: Scalars['String']['input'];
 };
 
+export type VerifyUserEmailInput = {
+  code: Scalars['String']['input'];
+  email: Scalars['String']['input'];
+};
+
 export type Version = {
   __typename?: 'Version';
   authorUser?: Maybe<LimitedUser>;
@@ -8068,6 +8079,7 @@ export type UserEmailMutationsFieldArgs = {
   delete: UserEmailMutationsDeleteArgs,
   requestNewEmailVerification: UserEmailMutationsRequestNewEmailVerificationArgs,
   setPrimary: UserEmailMutationsSetPrimaryArgs,
+  verify: UserEmailMutationsVerifyArgs,
 }
 export type UserGendoAiCreditsFieldArgs = {
   limit: {},