From 1755c19d6b9f554660226357f3877b42da4819bf Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Tue, 14 May 2024 21:30:24 +0800
Subject: [PATCH] preparing for next release

---
 console/app/controllers/auth/login.js          | 16 +++++-----------
 console/app/controllers/auth/verification.js   | 15 +++++++++++++++
 console/app/routes/auth/verification.js        |  6 ++++++
 console/app/routes/onboard/verify-email.js     | 11 ++++++++++-
 console/app/templates/auth/verification.hbs    |  2 +-
 console/app/templates/onboard/verify-email.hbs |  2 +-
 6 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/console/app/controllers/auth/login.js b/console/app/controllers/auth/login.js
index c20ead22..258179cc 100644
--- a/console/app/controllers/auth/login.js
+++ b/console/app/controllers/auth/login.js
@@ -199,19 +199,13 @@ export default class AuthLoginController extends Controller {
      * @return {Promise<Transition>}
      * @memberof AuthLoginController
      */
-    sendUserForEmailVerification(email) {
-        return this.fetch.post('auth/create-verification-session', { email, send: true }).then(({ token }) => {
+    @action sendUserForEmailVerification(email) {
+        return this.fetch.post('auth/create-verification-session', { email, send: true }).then(({ token, session }) => {
             return this.session.store.persist({ email }).then(() => {
                 this.notifications.warning(this.intl.t('auth.login.unverified-notification'));
-                return this.router
-                    .transitionTo('auth.verification', {
-                        queryParams: {
-                            token,
-                        },
-                    })
-                    .then(() => {
-                        this.reset('error');
-                    });
+                return this.router.transitionTo('auth.verification', { queryParams: { token, hello: session } }).then(() => {
+                    this.reset('error');
+                });
             });
         });
     }
diff --git a/console/app/controllers/auth/verification.js b/console/app/controllers/auth/verification.js
index c9998236..19047d42 100644
--- a/console/app/controllers/auth/verification.js
+++ b/console/app/controllers/auth/verification.js
@@ -150,6 +150,21 @@ export default class AuthVerificationController extends Controller {
         }
     }
 
+    /**
+     * Validates input on the first render
+     *
+     * @param {HTMLElement} el
+     * @memberof AuthVerificationController
+     */
+    @action validateInitInput(el) {
+        const value = el.value;
+        if (value.length > 5) {
+            this.isReadyToSubmit = true;
+        } else {
+            this.isReadyToSubmit = false;
+        }
+    }
+
     /**
      * Submits to verify code.
      *
diff --git a/console/app/routes/auth/verification.js b/console/app/routes/auth/verification.js
index 99570cea..49d1c01d 100644
--- a/console/app/routes/auth/verification.js
+++ b/console/app/routes/auth/verification.js
@@ -11,6 +11,12 @@ export default class AuthVerificationRoute extends Route {
             refreshModel: false,
             replace: true,
         },
+        code: {
+            refreshModel: false,
+        },
+        hello: {
+            refreshModel: false,
+        },
     };
 
     beforeModel(transition) {
diff --git a/console/app/routes/onboard/verify-email.js b/console/app/routes/onboard/verify-email.js
index 66ea6b7d..bc5fca1f 100644
--- a/console/app/routes/onboard/verify-email.js
+++ b/console/app/routes/onboard/verify-email.js
@@ -1,3 +1,12 @@
 import Route from '@ember/routing/route';
 
-export default class OnboardVerifyEmailRoute extends Route {}
+export default class OnboardVerifyEmailRoute extends Route {
+    queryParams = {
+        code: {
+            refreshModel: false,
+        },
+        hello: {
+            refreshModel: false,
+        },
+    };
+}
diff --git a/console/app/templates/auth/verification.hbs b/console/app/templates/auth/verification.hbs
index b87c0c70..766b7bcb 100644
--- a/console/app/templates/auth/verification.hbs
+++ b/console/app/templates/auth/verification.hbs
@@ -18,7 +18,7 @@
     </div>
 
     <form class="mt-8 space-y-6" {{on "submit" this.verifyCode}}>
-        <InputGroup @type="tel" @name={{t "auth.verification.verification-input-label"}} @value={{this.code}} @helpText={{t "auth.verification.verification-code-text"}} @inputClass="input-lg" {{on "input" this.validateInput}} />
+        <InputGroup @type="tel" @name={{t "auth.verification.verification-input-label"}} @value={{this.code}} @helpText={{t "auth.verification.verification-code-text"}} @inputClass="input-lg" {{on "input" this.validateInput}} {{did-insert this.validateInitInput}} />
 
         <div class="flex flex-row items-center space-x-4">
             <Button @icon="check" @iconPrefix="fas" @buttonType="submit" @type="primary" @size="lg" @text="Verify & Continue" @isLoading={{this.isLoading}} @disabled={{this.isNotReadyToSubmit}} @onClick={{this.verifyCode}} />
diff --git a/console/app/templates/onboard/verify-email.hbs b/console/app/templates/onboard/verify-email.hbs
index f2a4c937..361a1bbf 100644
--- a/console/app/templates/onboard/verify-email.hbs
+++ b/console/app/templates/onboard/verify-email.hbs
@@ -18,7 +18,7 @@
     </div>
 
     <form class="mt-8 space-y-6" {{on "submit" this.verifyCode}}>
-        <InputGroup @type="tel" @name={{t "onboard.verify-email.verification-input-label"}} @value={{this.code}} @helpText={{t "onboard.verify-email.verification-code-text"}} @inputClass="input-lg" {{on "input" this.validateInput}} />
+        <InputGroup @type="tel" @name={{t "onboard.verify-email.verification-input-label"}} @value={{this.code}} @helpText={{t "onboard.verify-email.verification-code-text"}} @inputClass="input-lg" {{on "input" this.validateInput}} {{did-insert this.validateInitInput}} />
 
         <div class="flex flex-row items-center space-x-4">
             <Button @icon="check" @iconPrefix="fas" @buttonType="submit" @type="primary" @size="lg" @text="Verify & Continue" @isLoading={{this.isLoading}} @disabled={{this.isNotReadyToSubmit}} @onClick={{this.verifyCode}} />