@adminforth/open-signup 1.1.1 → 1.1.3

package/build.log

@@ -8,5 +8,5 @@ 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
+sent 14,440 bytes  received 77 bytes  29,034.00 bytes/sec
+total size is 14,155  speedup is 0.98

package/dist/index.js

@@ -143,17 +143,17 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                 const { token, password } = body;
                 const { email } = yield this.adminforth.auth.verify(token, 'tempVerifyEmailToken', false);
                 if (!email) {
-                    return { error: 'Invalid token', ok: false };
+                    return { error: yield tr('Invalid token', 'opensignup'), ok: false };
                 }
                 if (!password) {
-                    return { error: tr('Password is required', 'opensignup'), ok: false };
+                    return { error: yield tr('Password is required', 'opensignup'), ok: false };
                 }
                 const userRecord = yield this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, email));
                 if (!userRecord) {
-                    return { error: tr('User not found'), ok: false };
+                    return { error: yield tr('User not found', 'opensignup'), ok: false };
                 }
                 if (userRecord[this.options.confirmEmails.emailConfirmedField]) {
-                    return { error: tr('Email already confirmed'), ok: false };
+                    return { error: yield tr('Email already confirmed', 'opensignup'), ok: false };
                 }
                 yield this.adminforth.resource(this.authResource.resourceId).update(userRecord[this.authResource.columns.find((col) => col.primaryKey).name], {
                     [this.options.confirmEmails.emailConfirmedField]: true,
@@ -252,7 +252,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');
                 process.env.HEAVY_DEBUG && console.log('🐛Sending reset tok to', verifyToken);
-                const emailText = tr(`
+                const emailText = yield tr(`
                   Dear user,
                   Welcome to {brandName}! 
                   
@@ -267,22 +267,32 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                   The {brandName} Team
                                     
                 `, 'opensignup', { brandName, url, verifyToken });
-                const emailHtml = tr(`
-              <html>
-                <head></head>
-                <body>
-                  <p>Dear user,</p>
-                  <p>Welcome to {brandName}!</p>
-                  <p>To confirm your email, click the link below:</p>
-                  <a href="{url}?token={verifyToken}">Confirm email</a>
-                  <p>If you didn't request this, please ignore this email.</p>
-                  <p>Link is valid for 2 hours.</p>
-                  <p>Thanks,</p>
-                  <p>The {brandName} Team</p>
-                </body>
-              </html>
-        `, 'opensignup', { brandName, url, verifyToken });
-                const emailSubject = tr(`Signup request at {brandName}`, 'opensignup', { brandName });
+                const emailData = {
+                    greeting: yield tr('Dear user,', 'opensignup'),
+                    welcome: yield tr('Welcome to {brandName}!', 'opensignup', { brandName }),
+                    instruction: yield tr('To confirm your email, click the link below:', 'opensignup'),
+                    linkText: yield tr('Confirm email', 'opensignup'),
+                    disclaimer: yield tr('If you didn\'t request this, please ignore this email.', 'opensignup'),
+                    validity: yield tr('Link is valid for 2 hours.', 'opensignup'),
+                    thanks: yield tr('Thanks,', 'opensignup'),
+                    team: yield tr('The {brandName} Team', 'opensignup', { brandName }),
+                };
+                const emailHtml = `
+          <html>
+            <head></head>
+            <body>
+              <p>${emailData.greeting}</p>
+              <p>${emailData.welcome}</p>
+              <p>${emailData.instruction}</p>
+              <a href="${url}?token=${verifyToken}">${emailData.linkText}</a>
+              <p>${emailData.disclaimer}</p>
+              <p>${emailData.validity}</p>
+              <p>${emailData.thanks}</p>
+              <p>${emailData.team}</p>
+            </body>
+          </html>
+        `;
+                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);
                 return { ok: true };

package/index.ts

@@ -165,19 +165,19 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
         const { token, password } = body;
         const { email } = await this.adminforth.auth.verify(token, 'tempVerifyEmailToken', false);
         if (!email) {
-          return { error: 'Invalid token', ok: false };
+          return { error: await tr('Invalid token', 'opensignup'), ok: false };
         }
 
         if(!password) {
-          return { error: tr('Password is required', 'opensignup'), ok: false };
+          return { error: await tr('Password is required', 'opensignup'), ok: false };
         }
         const userRecord = await this.adminforth.resource(this.authResource.resourceId).get(Filters.EQ(this.emailField.name, email));
         if (!userRecord) {
-          return { error: tr('User not found'), ok: false };
+          return { error: await tr('User not found', 'opensignup'), ok: false };
         }
 
         if (userRecord[this.options.confirmEmails.emailConfirmedField]) {
-          return { error: tr('Email already confirmed'), ok: false };
+          return { error: await tr('Email already confirmed', 'opensignup'), ok: false };
         }
 
         await this.adminforth.resource(this.authResource.resourceId).update(userRecord[this.authResource.columns.find((col) => col.primaryKey).name], {
@@ -294,7 +294,7 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
 
         const verifyToken = this.adminforth.auth.issueJWT({email, issuer: brandName }, 'tempVerifyEmailToken', '2h');
         process.env.HEAVY_DEBUG && console.log('🐛Sending reset tok to', verifyToken);
-        const emailText = tr(`
+        const emailText = await tr(`
                   Dear user,
                   Welcome to {brandName}! 
                   
@@ -310,24 +310,34 @@ export default class OpenSignupPlugin extends AdminForthPlugin {
                                     
                 `, 'opensignup', { brandName, url, verifyToken }
         );
+
+        const emailData = {
+          greeting: await tr('Dear user,', 'opensignup'),
+          welcome: await tr('Welcome to {brandName}!', 'opensignup', { brandName }),
+          instruction: await tr('To confirm your email, click the link below:', 'opensignup'),
+          linkText: await tr('Confirm email', 'opensignup'),
+          disclaimer: await tr('If you didn\'t request this, please ignore this email.', 'opensignup'),
+          validity: await tr('Link is valid for 2 hours.', 'opensignup'),
+          thanks: await tr('Thanks,', 'opensignup'),
+          team: await tr('The {brandName} Team', 'opensignup', { brandName }),
+        };
           
-        const emailHtml = tr(`
-              <html>
-                <head></head>
-                <body>
-                  <p>Dear user,</p>
-                  <p>Welcome to {brandName}!</p>
-                  <p>To confirm your email, click the link below:</p>
-                  <a href="{url}?token={verifyToken}">Confirm email</a>
-                  <p>If you didn't request this, please ignore this email.</p>
-                  <p>Link is valid for 2 hours.</p>
-                  <p>Thanks,</p>
-                  <p>The {brandName} Team</p>
-                </body>
-              </html>
-        `, 'opensignup', { brandName, url, verifyToken });
-
-        const emailSubject = tr(`Signup request at {brandName}`, 'opensignup', { brandName });
+        const emailHtml = `
+          <html>
+            <head></head>
+            <body>
+              <p>${emailData.greeting}</p>
+              <p>${emailData.welcome}</p>
+              <p>${emailData.instruction}</p>
+              <a href="${url}?token=${verifyToken}">${emailData.linkText}</a>
+              <p>${emailData.disclaimer}</p>
+              <p>${emailData.validity}</p>
+              <p>${emailData.thanks}</p>
+              <p>${emailData.team}</p>
+            </body>
+          </html>
+        `;
+        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);

package/package.json

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