@adminforth/open-signup 1.0.9 → 1.1.1

package/.woodpecker/buildRelease.sh

@@ -0,0 +1,13 @@
+
+#!/bin/bash
+
+# write npm run output both to console and to build.log
+npm run build 2>&1 | tee build.log
+build_status=${PIPESTATUS[0]}
+
+# if exist status from the npm run build is not 0
+# then exit with the status code from the npm run build
+if [ $build_status -ne 0 ]; then
+  echo "Build failed. Exiting with status code $build_status"
+  exit $build_status
+fi

package/.woodpecker/buildSlackNotify.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -x
+
+COMMIT_SHORT_SHA=$(echo $CI_COMMIT_SHA | cut -c1-8)
+
+
+if [ "$CI_STEP_STATUS" = "success" ]; then
+  MESSAGE="Did a build without issues on \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\`. Commit: _${CI_COMMIT_MESSAGE}_ (<$CI_COMMIT_URL|$COMMIT_SHORT_SHA>)"
+
+  curl  -s -X POST -H "Content-Type: application/json" -d '{
+    "username": "'"$CI_COMMIT_AUTHOR"'",
+    "icon_url": "'"$CI_COMMIT_AUTHOR_AVATAR"'",
+    "attachments": [
+      {
+          "mrkdwn_in": ["text", "pretext"],
+          "color": "#36a64f",
+          "text": "'"$MESSAGE"'"
+      }
+    ]
+  }' "$DEVELOPERS_SLACK_WEBHOOK"
+  exit 0
+fi
+export BUILD_LOG=$(cat ./build.log)
+
+BUILD_LOG=$(echo $BUILD_LOG | sed 's/"/\\"/g')
+
+MESSAGE="Broke \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\` with commit _${CI_COMMIT_MESSAGE}_ (<$CI_COMMIT_URL|$COMMIT_SHORT_SHA>)"
+CODE_BLOCK="\`\`\`$BUILD_LOG\n\`\`\`"
+
+echo "Sending slack message to developers $MESSAGE"
+# Send the message
+curl -sS -X POST -H "Content-Type: application/json" -d '{
+  "username": "'"$CI_COMMIT_AUTHOR"'",
+  "icon_url": "'"$CI_COMMIT_AUTHOR_AVATAR"'",
+  "attachments": [
+    {
+        "mrkdwn_in": ["text", "pretext"],
+        "color": "#8A1C12",
+        "text": "'"$CODE_BLOCK"'",
+        "pretext": "'"$MESSAGE"'"
+    }
+  ]
+}' "$DEVELOPERS_SLACK_WEBHOOK" 2>&1

package/.woodpecker/release.yml

@@ -0,0 +1,42 @@
+clone:
+  git:
+    image: woodpeckerci/plugin-git
+    settings:
+      partial: false
+      depth: 5
+
+steps:
+  init-secrets:
+    when:
+      - event: push
+    image: infisical/cli
+    environment:
+      INFISICAL_TOKEN:
+        from_secret: VAULT_TOKEN
+    commands:
+      - infisical export --domain https://vault.devforth.io/api --format=dotenv-export --env="prod" > /woodpecker/deploy.vault.env
+    secrets:
+      - VAULT_TOKEN
+
+  release:
+    image: node:20
+    when:
+      - event: push
+    commands:
+      - apt update && apt install -y rsync
+      - export $(cat /woodpecker/deploy.vault.env | xargs)
+      - npm clean-install
+      - /bin/bash ./.woodpecker/buildRelease.sh
+      - npm audit signatures
+      - npx semantic-release
+
+  slack-on-failure:
+    when:
+      - event: push
+        status: [failure, success]
+      - event: push
+    image: curlimages/curl
+    commands:
+      - export $(cat /woodpecker/deploy.vault.env | xargs)
+      - /bin/sh ./.woodpecker/buildSlackNotify.sh
+

package/CHANGELOG.md

@@ -0,0 +1,5 @@
+
+# Changelog
+
+The complete changelog is available on the [GitHub Releases page](https://github.com/devforth/adminforth-open-signup/releases).
+

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Devforth.io
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/build.log

@@ -0,0 +1,12 @@
+
+> @adminforth/open-signup@1.0.9 build
+> tsc && rsync -av --exclude 'node_modules' custom dist/
+
+sending incremental file list
+custom/
+custom/SignupPage.vue
+custom/SignupUnderLogin.vue
+custom/tsconfig.json
+
+sent 14,444 bytes  received 77 bytes  29,042.00 bytes/sec
+total size is 14,155  speedup is 0.97

package/custom/SignupPage.vue

@@ -133,15 +133,16 @@
 
 
 <script setup lang="ts">
-import { onMounted, ref, computed, Ref, onBeforeMount } from 'vue';
+import { onMounted, ref, computed, Ref, onBeforeMount, nextTick } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
 import { callAdminForthApi, loadFile, applyRegexValidation } from '@/utils';
-import { useRoute, useRouter } from 'vue-router';
+import { onBeforeRouteUpdate, 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';
 import { useI18n } from 'vue-i18n';
+import adminforth from '@/adminforth';
 
 const { t } = useI18n();
 
@@ -209,10 +210,6 @@ const validationError = computed(() => {
 
 const error: Ref<string | null> = ref(null);
 
-onMounted(async () => {
-  emailInput.value?.focus();
-});
-
 
 const backgroundPosition = computed(() => {
   return coreStore.config?.loginBackgroundPosition || '1/2';
@@ -245,6 +242,7 @@ const passwordConstraints: Ref<{
 //       } 
 
 onBeforeMount(() => {
+  // console.log('⛔ SignUp Page. Before Mount: ', route)
   if (localStorage.getItem('isAuthorized') === 'true') {
     // if route has next param, redirect
     coreStore.fetchMenuAndResource();
@@ -257,15 +255,22 @@ onBeforeMount(() => {
 })
 
 onMounted(async () => {
+  emailInput.value?.focus();
+  await coreStore.getPublicConfig();
 
+  await nextTick();
+  await router.isReady();
 
-  await coreStore.getPublicConfig();
   // getPasswordConstraints
+  console.log('⛔ SignUp Page. Before Mount: ', route.meta)
   passwordConstraints.value = await callAdminForthApi({
     path: `/plugin/${route.meta.pluginInstanceId}/password-constraints`,
     method: 'GET',
   });
-});
+})
+
+// onMounted(async () => {
+// });
 
 async function doSignup() {
   error.value = null;
@@ -319,7 +324,7 @@ const signupAfterEmailConfirmation = async () => {
       }
     });
     if (resp.error) {
-      window.adminforth.alert({
+      adminforth.alert({
         message: t(`Error fetching data: {error}`, { error: resp.error }),
         variant: 'danger',
       });

package/custom/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".", // This should point to your project root
+    "paths": {
+      "@/*": [
+        // "node_modules/adminforth/dist/spa/src/*"
+        "../../../spa/src/*"
+      ],
+      "*": [
+        // "node_modules/adminforth/dist/spa/node_modules/*"
+        "../../../spa/node_modules/*"
+      ],
+      "@@/*": [
+        // "node_modules/adminforth/dist/spa/src/*"
+        "."
+      ]
+    }
+  }
+}

package/dist/custom/SignupPage.vue

@@ -133,15 +133,16 @@
 
 
 <script setup lang="ts">
-import { onMounted, ref, computed, Ref, onBeforeMount } from 'vue';
+import { onMounted, ref, computed, Ref, onBeforeMount, nextTick } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
 import { callAdminForthApi, loadFile, applyRegexValidation } from '@/utils';
-import { useRoute, useRouter } from 'vue-router';
+import { onBeforeRouteUpdate, 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';
 import { useI18n } from 'vue-i18n';
+import adminforth from '@/adminforth';
 
 const { t } = useI18n();
 
@@ -209,10 +210,6 @@ const validationError = computed(() => {
 
 const error: Ref<string | null> = ref(null);
 
-onMounted(async () => {
-  emailInput.value?.focus();
-});
-
 
 const backgroundPosition = computed(() => {
   return coreStore.config?.loginBackgroundPosition || '1/2';
@@ -245,6 +242,7 @@ const passwordConstraints: Ref<{
 //       } 
 
 onBeforeMount(() => {
+  // console.log('⛔ SignUp Page. Before Mount: ', route)
   if (localStorage.getItem('isAuthorized') === 'true') {
     // if route has next param, redirect
     coreStore.fetchMenuAndResource();
@@ -257,15 +255,22 @@ onBeforeMount(() => {
 })
 
 onMounted(async () => {
+  emailInput.value?.focus();
+  await coreStore.getPublicConfig();
 
+  await nextTick();
+  await router.isReady();
 
-  await coreStore.getPublicConfig();
   // getPasswordConstraints
+  console.log('⛔ SignUp Page. Before Mount: ', route.meta)
   passwordConstraints.value = await callAdminForthApi({
     path: `/plugin/${route.meta.pluginInstanceId}/password-constraints`,
     method: 'GET',
   });
-});
+})
+
+// onMounted(async () => {
+// });
 
 async function doSignup() {
   error.value = null;
@@ -319,7 +324,7 @@ const signupAfterEmailConfirmation = async () => {
       }
     });
     if (resp.error) {
-      window.adminforth.alert({
+      adminforth.alert({
         message: t(`Error fetching data: {error}`, { error: resp.error }),
         variant: 'danger',
       });

package/dist/custom/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".", // This should point to your project root
+    "paths": {
+      "@/*": [
+        // "node_modules/adminforth/dist/spa/src/*"
+        "../../../spa/src/*"
+      ],
+      "*": [
+        // "node_modules/adminforth/dist/spa/node_modules/*"
+        "../../../spa/node_modules/*"
+      ],
+      "@@/*": [
+        // "node_modules/adminforth/dist/spa/src/*"
+        "."
+      ]
+    }
+  }
+}

package/dist/index.js

@@ -131,7 +131,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 return {
                     minLength: this.passwordField.minLength,
                     maxLength: this.passwordField.maxLength,
-                    validation: yield Promise.all(this.passwordField.validation.map((_b) => __awaiter(this, [_b], void 0, function* ({ regExp, message }) { return ({ regExp, message: yield tr(message, 'opensignup') }); }))),
+                    validation: yield Promise.all(this.passwordField.validation.map((_a) => __awaiter(this, [_a], void 0, function* ({ regExp, message }) { return ({ regExp, message: yield tr(message, 'opensignup') }); }))),
                 };
             })
         });
@@ -139,7 +139,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/complete-verified-signup`,
             noAuth: true,
-            handler: (_c) => __awaiter(this, [_c], void 0, function* ({ body, response, headers, query, cookies, tr }) {
+            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response, headers, query, cookies, tr, requestUrl }) {
                 const { token, password } = body;
                 const { email } = yield this.adminforth.auth.verify(token, 'tempVerifyEmailToken', false);
                 if (!email) {
@@ -159,20 +159,22 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                     [this.options.confirmEmails.emailConfirmedField]: true,
                     [this.options.passwordHashField]: yield AdminForth.Utils.generatePasswordHash(password),
                 });
-                return yield this.doLogin(email, response, { body, headers, query, cookies });
+                return yield this.doLogin(email, response, { body, headers, query, cookies, requestUrl });
             })
         });
         server.endpoint({
             method: 'POST',
             path: `/plugin/${this.pluginInstanceId}/signup`,
             noAuth: true,
-            handler: (_d) => __awaiter(this, [_d], void 0, function* ({ body, response, headers, query, cookies, tr }) {
+            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response, headers, query, cookies, tr, requestUrl }) {
+                var _b, _c;
                 const { email, url, password } = body;
+                const extra = { body, headers, query, cookies, requestUrl: url };
                 // validate email
                 if (this.emailField.validation) {
                     for (const { regExp, message } of this.emailField.validation) {
                         if (!new RegExp(regExp).test(email)) {
-                            return { error: message, ok: false };
+                            return { error: yield tr(message, 'opensignup'), ok: false };
                         }
                     }
                 }
@@ -180,20 +182,20 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 if (!this.options.confirmEmails) {
                     if (password.length < this.passwordField.minLength) {
                         return {
-                            error: tr(`Password must be at least ${this.passwordField.minLength} characters long`, 'opensignup'),
+                            error: yield tr(`Password must be at least ${this.passwordField.minLength} characters long`, 'opensignup'),
                             ok: false
                         };
                     }
                     if (password.length > this.passwordField.maxLength) {
                         return {
-                            error: tr(`Password must be at most ${this.passwordField.maxLength} characters long`, 'opensignup'),
+                            error: yield tr(`Password must be at most ${this.passwordField.maxLength} characters long`, 'opensignup'),
                             ok: false
                         };
                     }
                     if (this.passwordField.validation) {
                         for (const { regExp, message } of this.passwordField.validation) {
                             if (!new RegExp(regExp).test(password)) {
-                                return { error: tr(message, 'opensignup'), ok: false };
+                                return { error: yield tr(message, 'opensignup'), ok: false };
                             }
                         }
                     }
@@ -204,14 +206,46 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 // first check again if email already exists
                 const existingUser = yield this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, normalizedEmail));
                 if ((!this.options.confirmEmails && existingUser) || (this.options.confirmEmails && (existingUser === null || existingUser === void 0 ? void 0 : existingUser[this.emailConfirmedField.name]))) {
-                    return { error: tr('Email already exists', 'opensignup'), ok: false };
+                    return { error: yield tr(`Email already exists`, 'opensignup'), ok: false };
                 }
                 // create user
                 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]: normalizedEmail, [this.options.passwordHashField]: password ? yield AdminForth.Utils.generatePasswordHash(password) : '' }));
+                    let recordToCreate = Object.assign(Object.assign(Object.assign({}, (this.options.defaultFieldValues || {})), (this.options.confirmEmails ? { [this.options.confirmEmails.emailConfirmedField]: false } : {})), { [this.emailField.name]: normalizedEmail, [this.options.passwordHashField]: password ? yield AdminForth.Utils.generatePasswordHash(password) : '' });
+                    if ((_b = this.options.hooks) === null || _b === void 0 ? void 0 : _b.beforeUserSave) {
+                        const hook = this.options.hooks.beforeUserSave;
+                        const resp = yield hook({
+                            resource: this.authResource,
+                            record: recordToCreate,
+                            adminforth: this.adminforth,
+                            extra,
+                        });
+                        if (!resp || (!resp.ok && !resp.error)) {
+                            throw new Error(`Hook beforeUserSave must return object with {ok: true} or { error: 'Error' } `);
+                        }
+                        if (resp.error) {
+                            return { error: resp.error };
+                        }
+                        recordToCreate = resp.record || recordToCreate;
+                    }
+                    const created = yield this.adminforth.resource(this.authResource.resourceId).create(recordToCreate);
+                    if ((_c = this.options.hooks) === null || _c === void 0 ? void 0 : _c.afterUserSave) {
+                        const hook = this.options.hooks.afterUserSave;
+                        const resp = yield hook({
+                            resource: this.authResource,
+                            record: created,
+                            adminforth: this.adminforth,
+                            extra,
+                        });
+                        if (!resp || (!resp.ok && !resp.error)) {
+                            throw new Error(`Hook afterUserSave must return object with {ok: true} or { error: 'Error' } `);
+                        }
+                        if (resp.error) {
+                            return { error: resp.error };
+                        }
+                    }
                 }
                 if (!this.options.confirmEmails) {
-                    const resp = yield this.doLogin(email, response, { body, headers, query, cookies });
+                    const resp = yield this.doLogin(email, response, { body, headers, query, cookies, requestUrl });
                     return resp;
                 }
                 // send confirmation email

package/index.ts

@@ -1,7 +1,6 @@
 import AdminForth, { AdminForthPlugin, Filters, suggestIfTypo, AdminForthDataTypes } from "adminforth";
 import type { IAdminForth, IHttpServer, AdminForthComponentDeclaration, AdminForthResourceColumn, AdminForthResource, BeforeLoginConfirmationFunction, HttpExtra } from "adminforth";
 import type { PluginOptions } from './types.js';
-import { error } from "console";
 
 
 export default class OpenSignupPlugin extends AdminForthPlugin {
@@ -162,7 +161,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/complete-verified-signup`,
       noAuth: true,
-      handler: async ({ body, response, headers, query, cookies, tr }) => {
+      handler: async ({ body, response, headers, query, cookies, tr, requestUrl }) => {
         const { token, password } = body;
         const { email } = await this.adminforth.auth.verify(token, 'tempVerifyEmailToken', false);
         if (!email) {
@@ -185,7 +184,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
           [this.options.confirmEmails.emailConfirmedField]: true,
           [this.options.passwordHashField]: await AdminForth.Utils.generatePasswordHash(password),
         });
-        return await this.doLogin(email, response, { body, headers, query, cookies });
+        return await this.doLogin(email, response, { body, headers, query, cookies, requestUrl });
       }
     });
 
@@ -193,36 +192,35 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
       method: 'POST',
       path: `/plugin/${this.pluginInstanceId}/signup`,
       noAuth: true,
-      handler: async ({ body, response, headers, query, cookies, tr }) => {
+      handler: async ({ body, response, headers, query, cookies, tr, requestUrl }) => {
         const { email, url, password } = body;
-
+        const extra = { body, headers, query, cookies, requestUrl: url };
         // validate email
         if (this.emailField.validation) {
           for (const { regExp, message } of this.emailField.validation) {
             if (!new RegExp(regExp).test(email)) {
-              return { error: message, ok: false };
+              return { error: await tr(message, 'opensignup'), ok: false };
             }
           }
         }
-
         // validate password
         if (!this.options.confirmEmails) {
           if (password.length < this.passwordField.minLength) {
             return { 
-              error: tr(`Password must be at least ${this.passwordField.minLength} characters long`, 'opensignup'),
+              error: await tr(`Password must be at least ${this.passwordField.minLength} characters long`, 'opensignup'),
               ok: false 
             };
           }
           if (password.length > this.passwordField.maxLength) {
             return { 
-              error: tr(`Password must be at most ${this.passwordField.maxLength} characters long`, 'opensignup'),
+              error: await tr(`Password must be at most ${this.passwordField.maxLength} characters long`, 'opensignup'),
               ok: false 
             };
           }
           if (this.passwordField.validation) {
             for (const { regExp, message } of this.passwordField.validation) {
               if (!new RegExp(regExp).test(password)) {
-                return { error: tr(message, 'opensignup'), ok: false };
+                return { error: await tr(message, 'opensignup'), ok: false };
               }
             }
           }
@@ -235,21 +233,58 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         // first check again if email already exists
         const existingUser = await this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, normalizedEmail));
         if ((!this.options.confirmEmails && existingUser) || (this.options.confirmEmails && existingUser?.[this.emailConfirmedField.name])) {
-          return { error: tr('Email already exists', 'opensignup'), ok: false };
+          return { error: await tr(`Email already exists`, 'opensignup'), ok: false };
         }
 
         // create user
         if (!existingUser) {
-          const created = await this.adminforth.resource(this.authResource.resourceId).create({
+          let recordToCreate = {
             ...(this.options.defaultFieldValues || {}),
             ...(this.options.confirmEmails ? { [this.options.confirmEmails.emailConfirmedField]: false } : {}),  
             [this.emailField.name]: normalizedEmail,
             [this.options.passwordHashField]: password ? await AdminForth.Utils.generatePasswordHash(password) : '',
-          });
+          };
+
+          if (this.options.hooks?.beforeUserSave) {
+            const hook = this.options.hooks.beforeUserSave;
+            const resp = await hook({ 
+              resource: this.authResource,
+              record: recordToCreate,
+              adminforth: this.adminforth,
+              extra,
+            });
+
+            if (!resp || (!resp.ok && !resp.error)) {
+              throw new Error(`Hook beforeUserSave must return object with {ok: true} or { error: 'Error' } `);
+            }
+            if (resp.error) {
+              return { error: resp.error };
+            }
+            recordToCreate = resp.record || recordToCreate;
+          }
+
+          const created = await this.adminforth.resource(this.authResource.resourceId).create(recordToCreate);
+
+          if (this.options.hooks?.afterUserSave) {
+            const hook = this.options.hooks.afterUserSave;
+            const resp = await hook({ 
+              resource: this.authResource,
+              record: created,
+              adminforth: this.adminforth,
+              extra,
+            });
+
+            if (!resp || (!resp.ok && !resp.error)) {
+              throw new Error(`Hook afterUserSave must return object with {ok: true} or { error: 'Error' } `);
+            }
+            if (resp.error) {
+              return { error: resp.error };
+            }
+          }
         }
         
         if (!this.options.confirmEmails) {
-          const resp = await this.doLogin(email, response, { body, headers, query, cookies });
+          const resp = await this.doLogin(email, response, { body, headers, query, cookies, requestUrl });
           return resp;
         }
 

package/package.json

@@ -1,19 +1,55 @@
 {
   "name": "@adminforth/open-signup",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "scripts": {
-    "build": "tsc && rsync -av --exclude 'node_modules' custom dist/ && npm version patch",
-    "rollout": "npm run build && npm publish --access public",
+    "build": "tsc && rsync -av --exclude 'node_modules' custom dist/",
     "prepare": "npm link adminforth"
   },
-  "keywords": [],
-  "author": "",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/devforth/adminforth-open-signup.git"
+  },
+  "keywords": [
+    "adminforth",
+    "signup"
+  ],
+  "author": "devforth",
   "license": "ISC",
-  "description": "",
+  "description": "Open signup for adminforth",
   "dependencies": {
     "@aws-sdk/client-ses": "^3.654.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.10.7",
+    "semantic-release": "^24.2.1",
+    "semantic-release-slack-bot": "^4.0.2",
+    "typescript": "^5.7.3"
+  },
+  "release": {
+    "plugins": [
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      "@semantic-release/npm",
+      "@semantic-release/github",
+      [
+        "semantic-release-slack-bot",
+        {
+          "notifyOnSuccess": true,
+          "notifyOnFail": true,
+          "slackIcon": ":package:",
+          "markdownReleaseNotes": true
+        }
+      ]
+    ],
+    "branches": [
+      "main",
+      {
+        "name": "next",
+        "prerelease": true
+      }
+    ]
   }
 }

package/types.ts

@@ -54,6 +54,15 @@ export interface PluginOptions {
      */
     adapter: EmailAdapter;
   }
+
+
+  /**
+   * Hooks to be executed before and after user is created
+   */
+  hooks?: {
+    beforeUserSave?: any;
+    afterUserSave?: any;
+  }
   
 
 }

package/Changelog.md

@@ -1,15 +0,0 @@
-## [v1.0.9]
-
-# Fixed
-- when user created normalize email to lowercase. This is not needed when right email validator is set on email field because
-it will not allow to create such email, but if user forgot to set it it might save situation 
-
-## [v1.0.8]
-
-# Fixed
-- ensure next params keeps be encoded as URI between moving to/from login page
-
-## [v1.0.7]
-
-# Added
-- next param support

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>