@adminforth/open-signup 2.0.1 → 2.0.2

package/build.log

@@ -8,5 +8,5 @@ custom/SignupPage.vue
 custom/SignupUnderLogin.vue
 custom/tsconfig.json
 
-sent 14,167 bytes  received 77 bytes  28,488.00 bytes/sec
+sent 14,163 bytes  received 77 bytes  28,480.00 bytes/sec
 total size is 13,884  speedup is 0.97

package/dist/index.d.ts

@@ -11,6 +11,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
     constructor(options: PluginOptions);
     modifyResourceConfig(adminforth: IAdminForth, resourceConfig: AdminForthResource): Promise<void>;
     getAllowedOrigins(): string[];
+    normalizeUsername(email: string): string;
     validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: AdminForthResource): void;
     instanceUniqueRepresentation(pluginOptions: any): string;
     doLogin(email: string, response: any, extra: HttpExtra): Promise<{

package/dist/index.js

@@ -115,6 +115,13 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         const originList = Array.isArray(rawOrigins) ? rawOrigins : [rawOrigins];
         return originList.map(o => new URL(o).origin);
     }
+    normalizeUsername(email) {
+        if (this.adminforth.config.auth.usernameField !== this.emailField.name) {
+            return email;
+        }
+        const normalize = this.emailField.normalize;
+        return normalize ? normalize(email) : email;
+    }
     validateConfigAfterDiscover(adminforth, resourceConfig) {
         if (this.options.confirmEmails) {
             this.options.confirmEmails.adapter.validate();
@@ -133,8 +140,8 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
     }
     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));
+            const username = this.normalizeUsername(email);
+            const userRecord = yield this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, username));
             const adminUser = {
                 dbUser: userRecord,
                 pk: userRecord[this.authResource.columns.find((col) => col.primaryKey).name],
@@ -189,7 +196,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 if (!decoded || !decoded.email) {
                     return { error: yield tr('Invalid token', 'opensignup'), ok: false };
                 }
-                const { email } = decoded;
+                const email = this.normalizeUsername(decoded.email);
                 if (!password) {
                     return { error: yield tr('Password is required', 'opensignup'), ok: false };
                 }
@@ -219,6 +226,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 if (!email || typeof email !== 'string') {
                     return { error: yield tr('Email is required', 'opensignup'), ok: false };
                 }
+                const normalizedEmail = this.normalizeUsername(email);
                 if (!this.options.confirmEmails && !password) {
                     return { error: yield tr('Password is required', 'opensignup'), ok: false };
                 }
@@ -238,7 +246,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 // validate email
                 if (this.emailField.validation) {
                     for (const { regExp, message } of this.emailField.validation) {
-                        if (!new RegExp(regExp).test(email)) {
+                        if (!new RegExp(regExp).test(normalizedEmail)) {
                             return { error: yield tr(message, 'opensignup'), ok: false };
                         }
                     }
@@ -265,9 +273,6 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                         }
                     }
                 }
-                // 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 
-                const normalizedEmail = email.toLowerCase(); // normalize email
                 // 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]))) {
@@ -315,7 +320,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 }
                 // send confirmation email
                 const brandName = this.adminforth.config.customization.brandName;
-                const verifyToken = this.adminforth.auth.issueJWT({ email, issuer: brandName }, 'tempVerifyEmailToken', '2h');
+                const verifyToken = this.adminforth.auth.issueJWT({ email: normalizedEmail, issuer: brandName }, 'tempVerifyEmailToken', '2h');
                 process.env.HEAVY_DEBUG && console.log('🐛Sending reset tok to', verifyToken);
                 const emailText = yield tr(`
                   Dear user,
@@ -359,7 +364,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         `;
                 const emailSubject = yield tr(`Signup request at {brandName}`, 'opensignup', { brandName });
                 // send email with AWS SES this.options.providerOptions.AWS_SES
-                this.options.confirmEmails.adapter.sendEmail(this.options.confirmEmails.sendFrom, email, emailText, emailHtml, emailSubject);
+                this.options.confirmEmails.adapter.sendEmail(this.options.confirmEmails.sendFrom, normalizedEmail, emailText, emailHtml, emailSubject);
                 return { ok: true };
             })
         });

package/index.ts

@@ -129,6 +129,15 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
     const originList = Array.isArray(rawOrigins) ? rawOrigins : [rawOrigins];
     return originList.map(o => new URL(o).origin);
   }
+
+  normalizeUsername(email: string): string {
+    if (this.adminforth.config.auth.usernameField !== this.emailField.name) {
+      return email;
+    }
+
+    const normalize = (this.emailField as AdminForthResourceColumn & { normalize?: (value: any) => any }).normalize;
+    return normalize ? normalize(email) : email;
+  }
   
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
     if (this.options.confirmEmails) {
@@ -151,9 +160,8 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
   }
 
   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));
+    const username = this.normalizeUsername(email);
+    const userRecord = await this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, username));
     const adminUser = { 
       dbUser: userRecord,
       pk: userRecord[this.authResource.columns.find((col) => col.primaryKey).name], 
@@ -218,7 +226,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         if (!decoded || !decoded.email) {
           return { error: await tr('Invalid token', 'opensignup'), ok: false };
         }
-        const { email } = decoded;
+        const email = this.normalizeUsername(decoded.email);
 
         if(!password) {
           return { error: await tr('Password is required', 'opensignup'), ok: false };
@@ -251,6 +259,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         if (!email || typeof email !== 'string') {
           return { error: await tr('Email is required', 'opensignup'), ok: false };
         }
+        const normalizedEmail = this.normalizeUsername(email);
         if (!this.options.confirmEmails && !password) {
           return { error: await tr('Password is required', 'opensignup'), ok: false };
         }
@@ -271,7 +280,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         // validate email
         if (this.emailField.validation) {
           for (const { regExp, message } of this.emailField.validation) {
-            if (!new RegExp(regExp).test(email)) {
+            if (!new RegExp(regExp).test(normalizedEmail)) {
               return { error: await tr(message, 'opensignup'), ok: false };
             }
           }
@@ -299,10 +308,6 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
           }
         }
         
-        // 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 
-        const normalizedEmail = email.toLowerCase();  // normalize email
-
         // 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])) {
@@ -365,7 +370,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
 
         const brandName = this.adminforth.config.customization.brandName;
 
-        const verifyToken = this.adminforth.auth.issueJWT({email, issuer: brandName }, 'tempVerifyEmailToken', '2h');
+        const verifyToken = this.adminforth.auth.issueJWT({ email: normalizedEmail, issuer: brandName }, 'tempVerifyEmailToken', '2h');
         process.env.HEAVY_DEBUG && console.log('🐛Sending reset tok to', verifyToken);
         const emailText = await tr(`
                   Dear user,
@@ -413,7 +418,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         const emailSubject = await tr(`Signup request at {brandName}`, 'opensignup', { brandName });
 
         // send email with AWS SES this.options.providerOptions.AWS_SES
-        this.options.confirmEmails.adapter.sendEmail(this.options.confirmEmails.sendFrom, email, emailText, emailHtml, emailSubject);
+        this.options.confirmEmails.adapter.sendEmail(this.options.confirmEmails.sendFrom, normalizedEmail, emailText, emailHtml, emailSubject);
 
         return { ok: true };
       }
@@ -423,4 +428,4 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
 
   }
 
-}
+}

package/package.json

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