@adminforth/open-signup 1.0.3 → 1.0.4

package/custom/SignupPage.vue

@@ -37,26 +37,28 @@
                 <!-- Modal body -->
                 <div class="p-4 md:p-5">
                   <form v-if="!requestSent" class="space-y-4" role="alert" @submit.prevent>
-                    <div class="relative">
+                    <div v-if="!verifyToken" class="relative">
                       <label for="email" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your email</label>
                       <input type="email" name="email" id="email" 
                         tabindex="1"
-                        @keydown.enter="passwordInput.focus()"
+                        autocomplete="username"  
+                        @keydown.enter="passwordInput?.focus()"
                         ref="emailInput"
                         class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" 
                         placeholder="name@company.com" 
                         required
                       />
                     </div>
-                    <div class="relative">
+                    <div v-if="isPasswordNeeded" class="relative">
                       <label for="password" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">New password</label>
                       <input 
                         tabindex="2"
+                        autocomplete="new-password"
                         ref="passwordInput"
                         :type="unmasked ? 'text' : 'password'"
                         name="password" id="password" 
                         v-model="password"
-                        @keydown.enter="passwordConfirmationInput.focus()"
+                        @keydown.enter="passwordConfirmationInput?.focus()"
                         class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" 
                         placeholder="New password" required 
                       />
@@ -71,10 +73,11 @@
                       </button>
                     </div>
 
-                    <div class="relative">
+                    <div v-if="isPasswordNeeded" class="relative">
                       <label for="password_confirmation" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Confirm new password</label>
                       <input 
                         ref="passwordConfirmationInput"
+                        autocomplete="new-password"
                         :type="unmasked ? 'text' : 'password'"
                         name="password_confirmation" id="password_confirmation" 
                         tabindex="3"
@@ -105,7 +108,7 @@
 
                     <Button
                       :disabled="inProgress || (validationRunning && validationError)"
-                      @click="doSignup"
+                      @click="() => verifyToken ? signupAfterEmailConfirmation() : doSignup()"
                       type="submit"
                       class="w-full"
                       :loader="inProgress"
@@ -115,9 +118,11 @@
                   </form>
 <!-- END of set new paasord -->
                   <div v-else class="flex items center justify-center p-4 mb-4 text-sm text-green-800 rounded-lg bg-green-50 dark:bg-green-800 dark:text-green-400" role="alert">
-                    If user with specified email exists in our db, then request was sent. Please check your email at {{ sentToEmail }} to reset your password.
-                  </div>
-
+                    Please check your email at {{ sentToEmail }} to confirm your email address.
+                  </div> 
+                  <p class="text-gray-500 dark:text-gray-400 font-sm text-right mt-3">
+                      or <Link to="/login">{{ toLoginText }}</Link>
+                  </p>
                 </div>
             </div>
         </div>
@@ -128,7 +133,6 @@
 
 
 <script setup lang="ts">
-
 import { onMounted, ref, computed, Ref } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
@@ -136,27 +140,33 @@ import { callAdminForthApi, loadFile, applyRegexValidation } from '@/utils';
 import { useRoute, useRouter } from 'vue-router';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import Button from '@/afcl/Button.vue';
+import Link from '@/afcl/Link.vue';
 
 const inProgress = ref(false);
 
 const coreStore = useCoreStore();
 const requestSent = ref(false);
 
-const emailInput = ref(null);
-const passwordInput = ref(null);
-const passwordConfirmationInput = ref(null);
+const emailInput: Ref<HTMLInputElement | null> = ref(null);
+const passwordInput: Ref<HTMLInputElement | null> = ref(null);
+const passwordConfirmationInput: Ref<HTMLInputElement | null> = ref(null);
 
 const password = ref("");
 const passwordConfirmation = ref("");
 const unmasked = ref(false);
 const sentToEmail: Ref<string> = ref('');
 
+const requestEmailConfirmation = computed(() => route.meta.requestEmailConfirmation);
+const verifyToken = computed(() => route.query.token);
+const toLoginText = computed(() => `${verifyToken.value ? 'Go' : 'Back'} to login`);
+const isPasswordNeeded = computed(() => !requestEmailConfirmation.value || (requestEmailConfirmation.value && verifyToken.value));
+
 const user = useUserStore();
 
 const route = useRoute();
 const router = useRouter();
 
-function checkPassowrd() {
+function checkPassword() {
 
   if (!password.value || !passwordConfirmation.value) {
     return 'Please enter both password and password confirmation';
@@ -187,39 +197,15 @@ const validationRunning = ref(false);
 
 const validationError = computed(() => {
   if (validationRunning.value) {
-    return checkPassowrd();
+    return checkPassword();
   }
   return null;
 });
 
-const error: Ref<str | null> = ref(null);
+const error: Ref<string | null> = ref(null);
 
 onMounted(async () => {
-  if (route.query.token) {
-    // call method completeVerifiedSignup to confirm { token }
-    // if success, then redirect to login page
-
-    const resp = await callAdminForthApi({
-      path: `/plugin/${route.meta.pluginInstanceId}/complete-verified-signup`,
-      method: 'POST',
-      body: {
-        token: route.query.token,
-      }
-    });
-    if (resp.error) {
-      window.adminforth.alert({
-        message: `Error fetching data: ${error.message}`,
-        variant: 'danger',
-      });
-    } else if (resp.redirectTo) {
-      router.push(resp.redirectTo);
-    } else {
-      await user.finishLogin();
-    }
-    return;
-
-  }
-  emailInput.value.focus();
+  emailInput.value?.focus();
 });
 
 
@@ -242,7 +228,7 @@ async function doSignup() {
     error.value = 'Please enter your email';
     return;
   }
-  if (checkPassowrd()) {
+  if (!requestEmailConfirmation.value && checkPassword()) {
     validationRunning.value = true;
     return;
   }
@@ -254,7 +240,7 @@ async function doSignup() {
     body: {
       email,
       url: window.location.origin + window.location.pathname,
-      password: password.value,
+      ...(!requestEmailConfirmation.value ? {password: password.value} : {}),
     }
   });
   inProgress.value = false;
@@ -264,15 +250,37 @@ async function doSignup() {
     error.value = null;
     requestSent.value = true;
     sentToEmail.value = email;
-    if (resp.redirectTo) {
+    if (resp.redirectTo && !requestEmailConfirmation.value) {
       router.push(resp.redirectTo);
-    } else {
+    } else if (!requestEmailConfirmation.value) {
       error.value = null;
       await user.finishLogin();
     }
   }
 }
 
-
-
+const signupAfterEmailConfirmation = async () => {
+  if (checkPassword()) {
+    validationRunning.value = true;
+    return;
+  }
+  const resp = await callAdminForthApi({
+      path: `/plugin/${route.meta.pluginInstanceId}/complete-verified-signup`,
+      method: 'POST',
+      body: {
+        token: verifyToken.value,
+        password: password.value,
+      }
+    });
+    if (resp.error) {
+      window.adminforth.alert({
+        message: `Error fetching data: ${resp.error}`,
+        variant: 'danger',
+      });
+    } else if (resp.redirectTo) {
+      router.push(resp.redirectTo);
+    } else {
+      await user.finishLogin();
+    }
+}
 </script>

package/dist/custom/SignupPage.vue

@@ -37,26 +37,28 @@
                 <!-- Modal body -->
                 <div class="p-4 md:p-5">
                   <form v-if="!requestSent" class="space-y-4" role="alert" @submit.prevent>
-                    <div class="relative">
+                    <div v-if="!verifyToken" class="relative">
                       <label for="email" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your email</label>
                       <input type="email" name="email" id="email" 
                         tabindex="1"
-                        @keydown.enter="passwordInput.focus()"
+                        autocomplete="username"  
+                        @keydown.enter="passwordInput?.focus()"
                         ref="emailInput"
                         class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" 
                         placeholder="name@company.com" 
                         required
                       />
                     </div>
-                    <div class="relative">
+                    <div v-if="isPasswordNeeded" class="relative">
                       <label for="password" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">New password</label>
                       <input 
                         tabindex="2"
+                        autocomplete="new-password"
                         ref="passwordInput"
                         :type="unmasked ? 'text' : 'password'"
                         name="password" id="password" 
                         v-model="password"
-                        @keydown.enter="passwordConfirmationInput.focus()"
+                        @keydown.enter="passwordConfirmationInput?.focus()"
                         class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" 
                         placeholder="New password" required 
                       />
@@ -71,10 +73,11 @@
                       </button>
                     </div>
 
-                    <div class="relative">
+                    <div v-if="isPasswordNeeded" class="relative">
                       <label for="password_confirmation" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Confirm new password</label>
                       <input 
                         ref="passwordConfirmationInput"
+                        autocomplete="new-password"
                         :type="unmasked ? 'text' : 'password'"
                         name="password_confirmation" id="password_confirmation" 
                         tabindex="3"
@@ -105,7 +108,7 @@
 
                     <Button
                       :disabled="inProgress || (validationRunning && validationError)"
-                      @click="doSignup"
+                      @click="() => verifyToken ? signupAfterEmailConfirmation() : doSignup()"
                       type="submit"
                       class="w-full"
                       :loader="inProgress"
@@ -115,9 +118,11 @@
                   </form>
 <!-- END of set new paasord -->
                   <div v-else class="flex items center justify-center p-4 mb-4 text-sm text-green-800 rounded-lg bg-green-50 dark:bg-green-800 dark:text-green-400" role="alert">
-                    If user with specified email exists in our db, then request was sent. Please check your email at {{ sentToEmail }} to reset your password.
-                  </div>
-
+                    Please check your email at {{ sentToEmail }} to confirm your email address.
+                  </div> 
+                  <p class="text-gray-500 dark:text-gray-400 font-sm text-right mt-3">
+                      or <Link to="/login">{{ toLoginText }}</Link>
+                  </p>
                 </div>
             </div>
         </div>
@@ -128,7 +133,6 @@
 
 
 <script setup lang="ts">
-
 import { onMounted, ref, computed, Ref } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
@@ -136,27 +140,33 @@ import { callAdminForthApi, loadFile, applyRegexValidation } from '@/utils';
 import { useRoute, useRouter } from 'vue-router';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import Button from '@/afcl/Button.vue';
+import Link from '@/afcl/Link.vue';
 
 const inProgress = ref(false);
 
 const coreStore = useCoreStore();
 const requestSent = ref(false);
 
-const emailInput = ref(null);
-const passwordInput = ref(null);
-const passwordConfirmationInput = ref(null);
+const emailInput: Ref<HTMLInputElement | null> = ref(null);
+const passwordInput: Ref<HTMLInputElement | null> = ref(null);
+const passwordConfirmationInput: Ref<HTMLInputElement | null> = ref(null);
 
 const password = ref("");
 const passwordConfirmation = ref("");
 const unmasked = ref(false);
 const sentToEmail: Ref<string> = ref('');
 
+const requestEmailConfirmation = computed(() => route.meta.requestEmailConfirmation);
+const verifyToken = computed(() => route.query.token);
+const toLoginText = computed(() => `${verifyToken.value ? 'Go' : 'Back'} to login`);
+const isPasswordNeeded = computed(() => !requestEmailConfirmation.value || (requestEmailConfirmation.value && verifyToken.value));
+
 const user = useUserStore();
 
 const route = useRoute();
 const router = useRouter();
 
-function checkPassowrd() {
+function checkPassword() {
 
   if (!password.value || !passwordConfirmation.value) {
     return 'Please enter both password and password confirmation';
@@ -187,39 +197,15 @@ const validationRunning = ref(false);
 
 const validationError = computed(() => {
   if (validationRunning.value) {
-    return checkPassowrd();
+    return checkPassword();
   }
   return null;
 });
 
-const error: Ref<str | null> = ref(null);
+const error: Ref<string | null> = ref(null);
 
 onMounted(async () => {
-  if (route.query.token) {
-    // call method completeVerifiedSignup to confirm { token }
-    // if success, then redirect to login page
-
-    const resp = await callAdminForthApi({
-      path: `/plugin/${route.meta.pluginInstanceId}/complete-verified-signup`,
-      method: 'POST',
-      body: {
-        token: route.query.token,
-      }
-    });
-    if (resp.error) {
-      window.adminforth.alert({
-        message: `Error fetching data: ${error.message}`,
-        variant: 'danger',
-      });
-    } else if (resp.redirectTo) {
-      router.push(resp.redirectTo);
-    } else {
-      await user.finishLogin();
-    }
-    return;
-
-  }
-  emailInput.value.focus();
+  emailInput.value?.focus();
 });
 
 
@@ -242,7 +228,7 @@ async function doSignup() {
     error.value = 'Please enter your email';
     return;
   }
-  if (checkPassowrd()) {
+  if (!requestEmailConfirmation.value && checkPassword()) {
     validationRunning.value = true;
     return;
   }
@@ -254,7 +240,7 @@ async function doSignup() {
     body: {
       email,
       url: window.location.origin + window.location.pathname,
-      password: password.value,
+      ...(!requestEmailConfirmation.value ? {password: password.value} : {}),
     }
   });
   inProgress.value = false;
@@ -264,15 +250,37 @@ async function doSignup() {
     error.value = null;
     requestSent.value = true;
     sentToEmail.value = email;
-    if (resp.redirectTo) {
+    if (resp.redirectTo && !requestEmailConfirmation.value) {
       router.push(resp.redirectTo);
-    } else {
+    } else if (!requestEmailConfirmation.value) {
       error.value = null;
       await user.finishLogin();
     }
   }
 }
 
-
-
+const signupAfterEmailConfirmation = async () => {
+  if (checkPassword()) {
+    validationRunning.value = true;
+    return;
+  }
+  const resp = await callAdminForthApi({
+      path: `/plugin/${route.meta.pluginInstanceId}/complete-verified-signup`,
+      method: 'POST',
+      body: {
+        token: verifyToken.value,
+        password: password.value,
+      }
+    });
+    if (resp.error) {
+      window.adminforth.alert({
+        message: `Error fetching data: ${resp.error}`,
+        variant: 'danger',
+      });
+    } else if (resp.redirectTo) {
+      router.push(resp.redirectTo);
+    } else {
+      await user.finishLogin();
+    }
+}
 </script>

package/dist/index.js

@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import AdminForth, { AdminForthPlugin, Filters, suggestIfTypo, AdminForthDataTypes } from "adminforth";
-import { SendEmailCommand, SESClient } from '@aws-sdk/client-ses';
 export default class OpenSignupPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
@@ -23,9 +22,15 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
             if (!this.options.emailField) {
                 throw new Error(`emailField is required and should be a name of field in auth resource`);
             }
+            // find field with name resourceConfig.emailField in adminforth.auth.usersResourceId and show error if it doesn't exist
+            const authResource = adminforth.config.resources.find(r => r.resourceId === adminforth.config.auth.usersResourceId);
+            if (!authResource) {
+                throw new Error(`Resource with id config.auth.usersResourceId=${adminforth.config.auth.usersResourceId} not found`);
+            }
+            this.authResource = authResource;
             if (this.options.confirmEmails) {
-                if (!this.options.confirmEmails.emailProvider) {
-                    throw new Error(`confirmEmails.emailProvider is required and should be a name of field in auth resource`);
+                if (!this.options.confirmEmails.adapter) {
+                    throw new Error(`confirmEmails.adapter is required and should be a name of field in auth resource`);
                 }
                 if (!this.options.confirmEmails.emailConfirmedField) {
                     throw new Error(`confirmEmails.emailConfirmedField is required and should be a name of field in auth resource`);
@@ -38,16 +43,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         `);
                 }
                 this.emailConfirmedField = emailConfirmedField;
-                if (this.emailConfirmedField.type !== AdminForthDataTypes.BOOLEAN) {
-                    throw new Error(`Field ${this.emailConfirmedField.name} must be of type boolean`);
-                }
             }
-            // find field with name resourceConfig.emailField in adminforth.auth.usersResourceId and show error if it doesn't exist
-            const authResource = adminforth.config.resources.find(r => r.resourceId === adminforth.config.auth.usersResourceId);
-            if (!authResource) {
-                throw new Error(`Resource with id config.auth.usersResourceId=${adminforth.config.auth.usersResourceId} not found`);
-            }
-            this.authResource = authResource;
             const emailField = authResource.columns.find(f => f.name === this.options.emailField);
             if (!emailField) {
                 const similar = suggestIfTypo(authResource.columns.map(f => f.name), this.options.emailField);
@@ -81,7 +77,8 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                             minLength: passwordField.minLength,
                             maxLength: passwordField.maxLength,
                             validation: passwordField.validation
-                        }
+                        },
+                        requestEmailConfirmation: !!this.options.confirmEmails
                     }
                 }
             });
@@ -90,24 +87,23 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 if (!adminforth.config.auth.beforeLoginConfirmation) {
                     adminforth.config.auth.beforeLoginConfirmation = [];
                 }
-                // unshift because if e.g. 2fa set it's hook, this one should be first
-                adminforth.config.auth.beforeLoginConfirmation.unshift((_a) => __awaiter(this, [_a], void 0, function* ({ adminUser }) {
-                    if (!adminUser.dbUser[this.emailConfirmedField.name]) {
-                        return { body: { allowedLogin: false }, error: 'You need to confirm your email to be able to login' };
-                    }
-                }));
             }
         });
     }
     validateConfigAfterDiscover(adminforth, resourceConfig) {
-        // optional method where you can safely check field types after database discovery was performed
+        if (this.options.confirmEmails) {
+            const emailConfirmedColumn = this.resourceConfig.columns.find(f => f.name === this.options.confirmEmails.emailConfirmedField);
+            if (emailConfirmedColumn.type !== AdminForthDataTypes.BOOLEAN) {
+                throw new Error(`Field ${this.emailConfirmedField.name} must be of type boolean`);
+            }
+        }
     }
     instanceUniqueRepresentation(pluginOptions) {
         // optional method to return unique string representation of plugin instance. 
         // Needed if plugin can have multiple instances on one resource 
         return `single`;
     }
-    doLogin(email, response) {
+    doLogin(email, response, extra) {
         return __awaiter(this, void 0, void 0, function* () {
             const username = email;
             const userRecord = yield this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, email));
@@ -117,7 +113,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 username,
             };
             const toReturn = { allowedLogin: true, error: '' };
-            yield this.adminforth.restApi.processLoginCallbacks(adminUser, toReturn, response);
+            yield this.adminforth.restApi.processLoginCallbacks(adminUser, toReturn, response, extra);
             if (toReturn.allowedLogin) {
                 this.adminforth.auth.setAuthCookie({
                     response,
@@ -131,29 +127,36 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
     setupEndpoints(server) {
         server.endpoint({
             method: 'POST',
-            path: `/plugin/${this.pluginInstanceId}/completeVerifiedSignup`,
+            path: `/plugin/${this.pluginInstanceId}/complete-verified-signup`,
             noAuth: true,
-            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response }) {
-                const { token } = body;
-                const { email } = yield this.adminforth.auth.verify(token, 'tempVerifyEmailToken');
+            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response, headers, query, cookies }) {
+                const { token, password } = body;
+                const { email } = yield this.adminforth.auth.verify(token, 'tempVerifyEmailToken', false);
                 if (!email) {
                     return { error: 'Invalid token', ok: false };
                 }
+                if (!password) {
+                    return { error: 'Password is required', ok: false };
+                }
                 const userRecord = yield this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, email));
                 if (!userRecord) {
                     return { error: 'User not found', ok: false };
                 }
+                if (userRecord[this.options.confirmEmails.emailConfirmedField]) {
+                    return { error: 'Email already confirmed', ok: false };
+                }
                 yield this.adminforth.resource(this.authResource.resourceId).update(userRecord[this.authResource.columns.find((col) => col.primaryKey).name], {
-                    [this.options.confirmEmails.emailConfirmedField]: true
+                    [this.options.confirmEmails.emailConfirmedField]: true,
+                    [this.options.passwordHashField]: yield AdminForth.Utils.generatePasswordHash(password),
                 });
-                return yield this.doLogin(email, response);
+                return yield this.doLogin(email, response, { body, headers, query, cookies });
             })
         });
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/signup`,
             noAuth: true,
-            handler: (_b) => __awaiter(this, [_b], void 0, function* ({ body, response }) {
+            handler: (_b) => __awaiter(this, [_b], void 0, function* ({ body, response, headers, query, cookies }) {
                 const { email, url, password } = body;
                 // validate email
                 if (this.emailField.validation) {
@@ -164,51 +167,39 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                     }
                 }
                 // validate password
-                if (password.length < this.passwordField.minLength) {
-                    return { error: `Password must be at least ${this.passwordField.minLength} characters long`, ok: false };
-                }
-                if (password.length > this.passwordField.maxLength) {
-                    return { error: `Password must be at most ${this.passwordField.maxLength} characters long`, ok: false };
-                }
-                if (this.passwordField.validation) {
-                    for (const { regExp, message } of this.passwordField.validation) {
-                        if (!new RegExp(regExp).test(password)) {
-                            return { error: message, ok: false };
+                if (!this.options.confirmEmails) {
+                    if (password.length < this.passwordField.minLength) {
+                        return { error: `Password must be at least ${this.passwordField.minLength} characters long`, ok: false };
+                    }
+                    if (password.length > this.passwordField.maxLength) {
+                        return { error: `Password must be at most ${this.passwordField.maxLength} characters long`, ok: false };
+                    }
+                    if (this.passwordField.validation) {
+                        for (const { regExp, message } of this.passwordField.validation) {
+                            if (!new RegExp(regExp).test(password)) {
+                                return { error: message, ok: false };
+                            }
                         }
                     }
                 }
                 // first check again if email already exists
-                const existing = yield this.adminforth.resource(this.authResource.resourceId).count(Filters.EQ(this.emailField.name, email));
-                if (existing > 0) {
+                const existingUser = yield this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, email));
+                if ((!this.options.confirmEmails && existingUser) || (this.options.confirmEmails && (existingUser === null || existingUser === void 0 ? void 0 : existingUser[this.emailConfirmedField.name]))) {
                     return { error: 'Email already exists', ok: false };
                 }
                 // create user
-                const created = yield this.adminforth.resource(this.authResource.resourceId).create(Object.assign(Object.assign(Object.assign({}, (this.options.defaultFieldValues || {})), (this.options.confirmEmails ? { [this.options.confirmEmails.emailConfirmedField]: false } : {})), { [this.emailField.name]: email, [this.options.passwordHashField]: yield AdminForth.Utils.generatePasswordHash(password) }));
+                if (!existingUser) {
+                    const created = yield this.adminforth.resource(this.authResource.resourceId).create(Object.assign(Object.assign(Object.assign({}, (this.options.defaultFieldValues || {})), (this.options.confirmEmails ? { [this.options.confirmEmails.emailConfirmedField]: false } : {})), { [this.emailField.name]: email, [this.options.passwordHashField]: password ? yield AdminForth.Utils.generatePasswordHash(password) : '' }));
+                }
                 if (!this.options.confirmEmails) {
-                    const resp = yield this.doLogin(email, response);
+                    const resp = yield this.doLogin(email, response, { body, headers, query, cookies });
                     return resp;
                 }
                 // send confirmation email
                 const brandName = this.adminforth.config.customization.brandName;
                 const verifyToken = this.adminforth.auth.issueJWT({ email, issuer: brandName }, 'tempVerifyEmailToken', '2h');
-                // send email with AWS SES this.options.providerOptions.AWS_SES
-                const ses = new SESClient({
-                    region: this.options.confirmEmails.providerOptions.AWS_SES.region,
-                    credentials: {
-                        accessKeyId: this.options.confirmEmails.providerOptions.AWS_SES.accessKeyId,
-                        secretAccessKey: this.options.confirmEmails.providerOptions.AWS_SES.secretAccessKey
-                    }
-                });
                 process.env.HEAVY_DEBUG && console.log('🐛Sending reset tok to', verifyToken);
-                const emailCommand = new SendEmailCommand({
-                    Destination: {
-                        ToAddresses: [email]
-                    },
-                    Message: {
-                        Body: {
-                            Text: {
-                                Charset: "UTF-8",
-                                Data: `
+                const emailText = `
                   Dear user,
                   Welcome to ${brandName}! 
                   
@@ -222,11 +213,8 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                   Thanks,
                   The ${brandName} Team
                                     
-                `
-                            },
-                            Html: {
-                                Charset: "UTF-8",
-                                Data: `
+                `;
+                const emailHtml = `
                 <html>
                   <head></head>
                   <body>
@@ -242,26 +230,10 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 </html>
 
 
-                `
-                            }
-                        },
-                        Subject: {
-                            Charset: "UTF-8",
-                            Data: `Signup request at ${brandName}`
-                        }
-                    },
-                    Source: `${this.options.confirmEmails.sendFrom}`
-                });
-                try {
-                    const sRes = yield ses.send(emailCommand);
-                }
-                catch (e) {
-                    console.error('Error sending email', e);
-                    if (process.env.NODE_ENV === 'development') {
-                        return { error: 'Some thing went wrong, please check the console', ok: false };
-                    }
-                    return { error: 'Something went wrong, please contact support', ok: false };
-                }
+                `;
+                const emailSubject = `Signup request at ${brandName}`;
+                // send email with AWS SES this.options.providerOptions.AWS_SES
+                this.options.confirmEmails.adapter.sendEmail(this.options.confirmEmails.sendFrom, email, emailText, emailHtml, emailSubject);
                 return { ok: true };
             })
         });

package/index.ts

@@ -1,7 +1,6 @@
 import AdminForth, { AdminForthPlugin, Filters, suggestIfTypo, AdminForthDataTypes } from "adminforth";
-import type { IAdminForth, IHttpServer, AdminForthComponentDeclaration, AdminForthResourceColumn, AdminForthResource, BeforeLoginConfirmationFunction } from "adminforth";
+import type { IAdminForth, IHttpServer, AdminForthComponentDeclaration, AdminForthResourceColumn, AdminForthResource, BeforeLoginConfirmationFunction, HttpExtra } from "adminforth";
 import type { PluginOptions } from './types.js';
-import { SendEmailCommand, SESClient } from '@aws-sdk/client-ses';
 
 
 export default class OpenSignupPlugin extends AdminForthPlugin {
@@ -25,9 +24,16 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
       throw new Error(`emailField is required and should be a name of field in auth resource`);
     }
 
+    // find field with name resourceConfig.emailField in adminforth.auth.usersResourceId and show error if it doesn't exist
+    const authResource = adminforth.config.resources.find(r => r.resourceId === adminforth.config.auth.usersResourceId);
+    if (!authResource) {
+      throw new Error(`Resource with id config.auth.usersResourceId=${adminforth.config.auth.usersResourceId} not found`);
+    }
+    this.authResource = authResource;
+
     if (this.options.confirmEmails) {
-      if (!this.options.confirmEmails.emailProvider) {
-        throw new Error(`confirmEmails.emailProvider is required and should be a name of field in auth resource`);
+      if (!this.options.confirmEmails.adapter) {
+        throw new Error(`confirmEmails.adapter is required and should be a name of field in auth resource`);
       }
       if (!this.options.confirmEmails.emailConfirmedField) {
         throw new Error(`confirmEmails.emailConfirmedField is required and should be a name of field in auth resource`);
@@ -40,18 +46,8 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         `);
       }
       this.emailConfirmedField = emailConfirmedField;
-      if (this.emailConfirmedField.type !== AdminForthDataTypes.BOOLEAN) {
-        throw new Error(`Field ${this.emailConfirmedField.name} must be of type boolean`);
-      }
     }
 
-    // find field with name resourceConfig.emailField in adminforth.auth.usersResourceId and show error if it doesn't exist
-    const authResource = adminforth.config.resources.find(r => r.resourceId === adminforth.config.auth.usersResourceId);
-    if (!authResource) {
-      throw new Error(`Resource with id config.auth.usersResourceId=${adminforth.config.auth.usersResourceId} not found`);
-    }
-    this.authResource = authResource;
-
     const emailField = authResource.columns.find(f => f.name === this.options.emailField);
     if (!emailField) {
       const similar = suggestIfTypo(authResource.columns.map(f => f.name), this.options.emailField);
@@ -89,7 +85,8 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
             minLength: passwordField.minLength,
             maxLength: passwordField.maxLength,
             validation: passwordField.validation
-          }
+          },
+          requestEmailConfirmation: !!this.options.confirmEmails
         }
       }
     });
@@ -99,19 +96,16 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
       if (!adminforth.config.auth.beforeLoginConfirmation) {
         adminforth.config.auth.beforeLoginConfirmation = [];
       }
-      // unshift because if e.g. 2fa set it's hook, this one should be first
-      (adminforth.config.auth.beforeLoginConfirmation as BeforeLoginConfirmationFunction[]).unshift(
-        async ({ adminUser }) => {
-          if (!adminUser.dbUser[this.emailConfirmedField.name]) {
-            return { body: { allowedLogin: false }, error: 'You need to confirm your email to be able to login' };
-          }
-        }
-      );
     }
   }
   
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
-    // optional method where you can safely check field types after database discovery was performed
+    if(this.options.confirmEmails){
+      const emailConfirmedColumn = this.resourceConfig.columns.find(f => f.name === this.options.confirmEmails.emailConfirmedField);
+      if (emailConfirmedColumn.type !== AdminForthDataTypes.BOOLEAN) {
+        throw new Error(`Field ${this.emailConfirmedField.name} must be of type boolean`);
+      }
+    }
   }
 
   instanceUniqueRepresentation(pluginOptions: any) : string {
@@ -120,7 +114,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
     return `single`;
   }
 
-  async doLogin(email: string, response: any): Promise<{ error?: string; allowedLogin: boolean; redirectTo?: string; }> {
+  async doLogin(email: string, response: any, extra: HttpExtra): Promise<{ error?: string; allowedLogin: boolean; redirectTo?: string; }> {
 
     const username = email;
     const userRecord = await this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, email));
@@ -131,7 +125,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
     };
     const toReturn = { allowedLogin: true, error: '' };
 
-    await this.adminforth.restApi.processLoginCallbacks(adminUser, toReturn, response);
+    await this.adminforth.restApi.processLoginCallbacks(adminUser, toReturn, response, extra);
     if (toReturn.allowedLogin) {
       this.adminforth.auth.setAuthCookie({ 
         response, 
@@ -149,22 +143,32 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
   setupEndpoints(server: IHttpServer) {
     server.endpoint({
       method: 'POST',
-      path: `/plugin/${this.pluginInstanceId}/completeVerifiedSignup`,
+      path: `/plugin/${this.pluginInstanceId}/complete-verified-signup`,
       noAuth: true,
-      handler: async ({ body, response }) => {
-        const { token } = body;
-        const { email } = await this.adminforth.auth.verify(token, 'tempVerifyEmailToken');
+      handler: async ({ body, response, headers, query, cookies }) => {
+        const { token, password } = body;
+        const { email } = await this.adminforth.auth.verify(token, 'tempVerifyEmailToken', false);
         if (!email) {
           return { error: 'Invalid token', ok: false };
         }
+
+        if(!password) {
+          return { error: 'Password is required', ok: false };
+        }
         const userRecord = await this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, email));
         if (!userRecord) {
           return { error: 'User not found', ok: false };
         }
+
+        if (userRecord[this.options.confirmEmails.emailConfirmedField]) {
+          return { error: 'Email already confirmed', ok: false };
+        }
+
         await this.adminforth.resource(this.authResource.resourceId).update(userRecord[this.authResource.columns.find((col) => col.primaryKey).name], {
-          [this.options.confirmEmails.emailConfirmedField]: true
+          [this.options.confirmEmails.emailConfirmedField]: true,
+          [this.options.passwordHashField]: await AdminForth.Utils.generatePasswordHash(password),
         });
-        return await this.doLogin(email, response);
+        return await this.doLogin(email, response, { body, headers, query, cookies });
       }
     });
 
@@ -172,7 +176,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/signup`,
       noAuth: true,
-      handler: async ({ body, response }) => {
+      handler: async ({ body, response, headers, query, cookies }) => {
         const { email, url, password } = body;
 
         // validate email
@@ -185,36 +189,40 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         }
 
         // validate password
-        if (password.length < this.passwordField.minLength) {
-          return { error: `Password must be at least ${this.passwordField.minLength} characters long`, ok: false };
-        }
-        if (password.length > this.passwordField.maxLength) {
-          return { error: `Password must be at most ${this.passwordField.maxLength} characters long`, ok: false };
-        }
-        if (this.passwordField.validation) {
-          for (const { regExp, message } of this.passwordField.validation) {
-            if (!new RegExp(regExp).test(password)) {
-              return { error: message, ok: false };
+        if (!this.options.confirmEmails) {
+          if (password.length < this.passwordField.minLength) {
+            return { error: `Password must be at least ${this.passwordField.minLength} characters long`, ok: false };
+          }
+          if (password.length > this.passwordField.maxLength) {
+            return { error: `Password must be at most ${this.passwordField.maxLength} characters long`, ok: false };
+          }
+          if (this.passwordField.validation) {
+            for (const { regExp, message } of this.passwordField.validation) {
+              if (!new RegExp(regExp).test(password)) {
+                return { error: message, ok: false };
+              }
             }
           }
         }
 
         // first check again if email already exists
-        const existing = await this.adminforth.resource(this.authResource.resourceId).count(Filters.EQ(this.emailField.name, email));
-        if (existing > 0) {
+        const existingUser = await this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, email));
+        if ((!this.options.confirmEmails && existingUser) || (this.options.confirmEmails && existingUser?.[this.emailConfirmedField.name])) {
           return { error: 'Email already exists', ok: false };
         }
 
         // create user
-        const created = await this.adminforth.resource(this.authResource.resourceId).create({
-          ...(this.options.defaultFieldValues || {}),
-          ...(this.options.confirmEmails ? { [this.options.confirmEmails.emailConfirmedField]: false } : {}),  
-          [this.emailField.name]: email,
-          [this.options.passwordHashField]: await AdminForth.Utils.generatePasswordHash(password),
-        });
+        if (!existingUser) {
+          const created = await this.adminforth.resource(this.authResource.resourceId).create({
+            ...(this.options.defaultFieldValues || {}),
+            ...(this.options.confirmEmails ? { [this.options.confirmEmails.emailConfirmedField]: false } : {}),  
+            [this.emailField.name]: email,
+            [this.options.passwordHashField]: password ? await AdminForth.Utils.generatePasswordHash(password) : '',
+          });
+        }
         
         if (!this.options.confirmEmails) {
-          const resp = await this.doLogin(email, response);
+          const resp = await this.doLogin(email, response, { body, headers, query, cookies });
           return resp;
         }
 
@@ -223,27 +231,8 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         const brandName = this.adminforth.config.customization.brandName;
 
         const verifyToken = this.adminforth.auth.issueJWT({email, issuer: brandName }, 'tempVerifyEmailToken', '2h');
-
-        // send email with AWS SES this.options.providerOptions.AWS_SES
-        const ses = new SESClient({
-          region: this.options.confirmEmails.providerOptions.AWS_SES.region,
-          credentials: {
-            accessKeyId: this.options.confirmEmails.providerOptions.AWS_SES.accessKeyId,
-            secretAccessKey: this.options.confirmEmails.providerOptions.AWS_SES.secretAccessKey
-          }
-        });
-
         process.env.HEAVY_DEBUG && console.log('🐛Sending reset tok to', verifyToken);
-
-        const emailCommand = new SendEmailCommand({
-          Destination: {
-            ToAddresses: [email]
-          },
-          Message: {
-            Body: {
-              Text: {
-                Charset: "UTF-8",
-                Data: `
+        const emailText = `
                   Dear user,
                   Welcome to ${brandName}! 
                   
@@ -257,11 +246,9 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                   Thanks,
                   The ${brandName} Team
                                     
-                `
-              },
-              Html: {
-                Charset: "UTF-8",
-                Data: `
+                `;
+          
+          const emailHtml = `
                 <html>
                   <head></head>
                   <body>
@@ -277,26 +264,11 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 </html>
 
 
-                `
-              }
-            },
-            Subject: {
-              Charset: "UTF-8",
-              Data: `Signup request at ${brandName}`
-            }
-          },
-          Source: `${this.options.confirmEmails.sendFrom}`
-        });
+                `;
+          const emailSubject = `Signup request at ${brandName}`;
 
-        try {
-          const sRes = await ses.send(emailCommand);
-        } catch (e) {
-          console.error('Error sending email', e);
-          if (process.env.NODE_ENV === 'development') {
-            return { error: 'Some thing went wrong, please check the console', ok: false };
-          }
-          return { error: 'Something went wrong, please contact support', ok: false };
-        }
+        // send email with AWS SES this.options.providerOptions.AWS_SES
+        this.options.confirmEmails.adapter.sendEmail(this.options.confirmEmails.sendFrom, email, emailText, emailHtml, emailSubject);
 
         return { ok: true };
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/open-signup",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/types.ts

@@ -1,3 +1,5 @@
+import { EmailAdapter } from 'adminforth';
+
 export interface PluginOptions {
 
   /**
@@ -40,11 +42,6 @@ export interface PluginOptions {
      */
     emailConfirmedField: string;
 
-    /**
-     * Required to confirm email
-     */
-    emailProvider: 'AWS_SES' ;
-
     /**
      * From which email to send password reset emails
      * e.g. no-reply@example.com
@@ -53,15 +50,9 @@ export interface PluginOptions {
     sendFrom: string;
 
     /**
-     * Options for email provider
+     * Adapter to send emails
      */
-    providerOptions: {
-      AWS_SES: {
-        region: string;
-        accessKeyId: string;
-        secretAccessKey: string;
-      }
-    }
+    adapter: EmailAdapter;
   }
   
 

package/dist/custom/ResetPassword.vue

@@ -1,295 +0,0 @@
-<template>
-  <div class="relative flex items-center justify-center min-h-screen bg-gray-100 dark:bg-gray-800 relative w-screen h-screen"
-    :style="coreStore.config?.loginBackgroundImage && backgroundPosition === 'over' ? {
-      'background-image': 'url(' + loadFile(coreStore.config?.loginBackgroundImage) + ')',
-      'background-size': 'cover',
-      'background-position': 'center',
-      'background-blend-mode': 'darken'
-    }: {}"
-  >
-    
-    <img v-if="coreStore.config?.loginBackgroundImage && backgroundPosition !== 'over'"
-      :src="loadFile(coreStore.config?.loginBackgroundImage)"
-      class="position-absolute top-0 left-0 h-screen object-cover w-0"
-      :class="{
-        '1/2': 'md:w-1/2',
-        '1/3': 'md:w-1/3',
-        '2/3': 'md:w-2/3',
-        '3/4': 'md:w-3/4',
-        '2/5': 'md:w-2/5',
-        '3/5': 'md:w-3/5',
-      }[backgroundPosition]"
-    />
-
-    <!-- Main modal -->
-    <div id="authentication-modal" tabindex="-1" 
-      class="overflow-y-auto flex flex-grow
-      overflow-x-hidden z-50 min-w-[350px]  justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
-        <div class="relative p-4 w-full max-h-full max-w-[400px]">
-            <!-- Modal content -->
-            <div class="relative bg-white rounded-lg shadow dark:bg-gray-700 dark:shadow-black" >
-                <!-- Modal header -->
-                <div class="flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600">
-                    <h3 class="text-xl font-semibold text-gray-900 dark:text-white">
-                      Reset your password on {{ coreStore.config?.brandName }}
-                    </h3>
-                </div>
-                <!-- Modal body -->
-                <div class="p-4 md:p-5">
-                  <form v-if="enteringNew" class="space-y-4" role="alert" @submit.prevent>
-                    <div class="relative">
-                      <label for="password" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">New password</label>
-                      <input 
-                        :type="unmasked ? 'text' : 'password'"
-                        name="password" id="password" 
-                        v-model="password"
-                        @keydown.enter="passwordConfirmationInput.focus()"
-                        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" 
-                        placeholder="New password" required 
-                      />
-                      
-                      <button
-                        type="button"
-                        @click="unmasked = !unmasked"
-                        class="h-6 absolute inset-y-2 top-9 right-1 flex items-center pr-2 z-index-100 focus:outline-none"
-                      >
-                        <IconEyeSolid class="w-6 h-6 text-gray-400"  v-if="!unmasked" />
-                        <IconEyeSlashSolid class="w-6 h-6 text-gray-400" v-else />
-                      </button>
-                    </div>
-
-                    <div class="relative">
-                      <label for="password_confirmation" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Confirm new password</label>
-                      <input 
-                        :type="unmasked ? 'text' : 'password'"
-                        name="password_confirmation" id="password_confirmation" 
-                        v-model="passwordConfirmation"
-                        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" 
-                        placeholder="Confirm new password" required 
-                      />
-
-                      <button
-                        type="button"
-                        @click="unmasked = !unmasked"
-                        class="h-6 absolute inset-y-2 top-9 right-1 flex items-center pr-2 z-index-100 focus:outline-none"
-                      >
-                        <IconEyeSolid class="w-6 h-6 text-gray-400"  v-if="!unmasked" />
-                        <IconEyeSlashSolid class="w-6 h-6 text-gray-400" v-else />
-                      </button>
-                    </div>
-
-                    <div v-if="validationError || error" class="flex items-center p-4 mb-4 text-sm text-red-800 rounded-lg bg-red-50 dark:bg-gray-800 dark:text-red-400" role="alert">
-                      <svg class="flex-shrink-0 inline w-4 h-4 me-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
-                        <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/>
-                      </svg>
-                      <span class="sr-only">Info</span>
-                      <div>
-                        {{ validationError || error }}
-                      </div>
-                    </div>
-
-                    <button
-                      :disabled="inProgress || (validationRunning && validationError)"
-                      @click="setNewPassword"
-                      type="submit" class="flex items-center justify-center gap-1 w-full text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 disabled:opacity-50">
-                      <svg v-if="inProgress"
-                        aria-hidden="true" class="w-4 h-4 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/><path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874
-// 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/></svg>
-                        Set new password
-                    </button>
-                  </form>
-<!-- END of set new paasord -->
-                  <div v-if="!enteringNew && requestSent" class="flex items center justify-center p-4 mb-4 text-sm text-green-800 rounded-lg bg-green-50 dark:bg-green-800 dark:text-green-400" role="alert">
-                    If user with specified email exists in our db, then request was sent. Please check your email at {{ sentToEmail }} to reset your password.
-                  </div>
-
-                  <form v-if="!enteringNew && !requestSent" class="space-y-4" @submit.prevent>
-                    <div>
-                      <label for="email" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your email</label>
-                      <input type="email" name="email" id="email" 
-                        @keydown.enter="reset()"
-                        ref="emailInput"
-                        class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" 
-                        placeholder="name@company.com" 
-                        required
-                      />
-                    </div>
-                  
-                    <div v-if="error" class="flex items-center p-4 mb-4 text-sm text-red-800 rounded-lg bg-red-50 dark:bg-gray-800 dark:text-red-400" role="alert">
-                      <svg class="flex-shrink-0 inline w-4 h-4 me-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
-                        <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/>
-                      </svg>
-                      <span class="sr-only">Info</span>
-                      <div>
-                        {{ error }}
-                      </div>
-                    </div>
-
-                    
-                    <button 
-                      @click="reset"
-                      type="submit" class="flex items-center justify-center gap-1 w-full text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">
-                      <svg v-if="inProgress"
-                        aria-hidden="true" class="w-4 h-4 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/><path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/></svg>
-    
-                      Reset Password
-                    
-                    </button>
-
-                    <p class="text-gray-500 dark:text-gray-400 font-sm text-right mt-3">
-                      or <router-link class=" text-blue-600 underline dark:text-blue-500 hover:no-underline 
-                        cursor-pointer" to="/login">
-                        Back to login
-                      </router-link>
-                    </p>
-
-                  </form>
-
-                </div>
-            </div>
-        </div>
-    </div> 
-
-  </div>
-</template>
-
-
-<script setup lang="ts">
-
-import { onMounted, ref, computed, Ref } from 'vue';
-import { useCoreStore } from '@/stores/core';
-import { callAdminForthApi, loadFile, applyRegexValidation } from '@/utils';
-import { useRoute, useRouter } from 'vue-router';
-import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
-
-
-const inProgress = ref(false);
-
-const coreStore = useCoreStore();
-const requestSent = ref(false);
-
-const emailInput = ref(null);
-const password = ref("");
-const passwordConfirmation = ref("");
-const unmasked = ref(false);
-const sentToEmail: Ref<string> = ref('');
-
-
-const route = useRoute();
-const router = useRouter();
-
-function checkPassowrd() {
-
-  if (!password.value || !passwordConfirmation.value) {
-    return 'Please enter both password and password confirmation';
-  }
-  if (password.value !== passwordConfirmation.value) {
-    return 'Passwords do not match';
-  }
-
-  if (password.value.length < passwordField.value.minLength) {
-    return `Password must be at least ${passwordField.value.minLength} characters long`;
-  }
-
-  if (password.value.length > passwordField.value.maxLength) {
-    return `Password must be at most ${passwordField.value.maxLength} characters long`;
-  }
-
-  if (passwordField.value.validation) {
-    const valError = applyRegexValidation(password.value, passwordField.value.validation);
-    if (valError) {
-      return valError;
-    }
-  }
-
-  return null;
-}
-
-const validationRunning = ref(false);
-
-const validationError = computed(() => {
-  console.log('validationRunning.value', validationRunning.value, 'aa', checkPassowrd());
-  if (validationRunning.value) {
-    return checkPassowrd();
-  }
-  return null;
-});
-
-const error = ref(null);
-
-// if token query param is present, we are entering new password
-const enteringNew = computed(() => route.query.token);
-
-const backgroundPosition = computed(() => {
-  return coreStore.config?.loginBackgroundPosition || '1/2';
-});
-
-const passwordField = computed(
-  () => route.meta.passwordField
-)
-
-onMounted(async () => {
-  await coreStore.getPublicConfig();
-});
-
-async function reset() {
-  error.value = null;
-  const email = emailInput.value.value;
-  if (!email) {
-    error.value = 'Please enter your email';
-    return;
-  }
-
-  inProgress.value = true;
-  const resp = await callAdminForthApi({
-    path: `/plugin/${route.meta.pluginInstanceId}/reset-password`,
-    method: 'POST',
-    body: {
-      email,
-      url: window.location.origin + window.location.pathname,
-    }
-  });
-  inProgress.value = false;
-  if (resp.error) {
-    error.value = resp.error;
-  } else {
-    error.value = null;
-    requestSent.value = true;
-    sentToEmail.value = email;
-  }
-}
-
-async function setNewPassword() {
-  error.value = null;
-  
-  if (checkPassowrd()) {
-    validationRunning.value = true;
-    return;
-  }
-
-  inProgress.value = true;
-  const resp = await callAdminForthApi({
-    path: `/plugin/${route.meta.pluginInstanceId}/reset-password-confirm`,
-    method: 'POST',
-    body: {
-      token: route.query.token,
-      password: password.value,
-    }
-  });
-  inProgress.value = false;
-  if (resp.error) {
-    error.value = resp.error;
-  } else {
-    error.value = null;
-    router.push('/login');
-    window.adminforth.alert({
-      message: 'Password reset successfully. Please login with your new password',
-      variant: 'success',
-      timeout: 15,
-    });
-
-  }
-}
-
-
-</script>

package/dist/custom/ResetPasswordUnderLogin.vue

@@ -1,13 +0,0 @@
-<template>
-  <p class="text-gray-500 dark:text-gray-400 font-sm text-left mt-3">
-    Forgot password? <router-link class=" text-blue-600 underline dark:text-blue-500 hover:no-underline 
-      cursor-pointer" to="/reset-password">
-      reset it
-    </router-link>
-  </p>
-</template>
-
-<script setup>
-
-
-</script>