@semapps/auth 1.0.10 → 1.1.1

package/mixins/auth.js

@@ -14,6 +14,8 @@ const AuthMixin = {
     capabilitiesPath: undefined,
     registrationAllowed: true,
     reservedUsernames: [],
+    minPasswordLength: 1,
+    minUsernameLength: 1,
     webIdSelection: [],
     accountSelection: [],
     accountsDataset: 'settings',
@@ -21,7 +23,8 @@ const AuthMixin = {
   },
   dependencies: ['api'],
   async created() {
-    const { jwtPath, reservedUsernames, accountsDataset, podProvider } = this.settings;
+    const { jwtPath, reservedUsernames, minPasswordLength, minUsernameLength, accountsDataset, podProvider } =
+      this.settings;
 
     this.broker.createService({
       mixins: [AuthJWTService],
@@ -30,7 +33,7 @@ const AuthMixin = {
 
     this.broker.createService({
       mixins: [AuthAccountService],
-      settings: { reservedUsernames },
+      settings: { reservedUsernames, minPasswordLength, minUsernameLength },
       adapter: new TripleStoreAdapter({ type: 'AuthAccount', dataset: accountsDataset })
     });
 

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@semapps/auth",
-  "version": "1.0.10",
+  "version": "1.1.1",
   "description": "Authentification module for SemApps",
   "license": "Apache-2.0",
   "author": "Virtual Assembly",
   "dependencies": {
-    "@semapps/ldp": "1.0.10",
-    "@semapps/middlewares": "1.0.10",
-    "@semapps/mime-types": "1.0.10",
-    "@semapps/triplestore": "1.0.10",
+    "@semapps/ldp": "1.1.1",
+    "@semapps/middlewares": "1.1.1",
+    "@semapps/mime-types": "1.1.1",
+    "@semapps/triplestore": "1.1.1",
     "bcrypt": "^5.0.1",
     "express-session": "^1.17.0",
     "jsonwebtoken": "^8.5.1",
@@ -21,6 +21,7 @@
     "passport-cas2": "0.0.12",
     "passport-local": "^1.0.0",
     "pug": "^3.0.2",
+    "speakingurl": "^14.0.1",
     "url-join": "^4.0.1"
   },
   "publishConfig": {
@@ -29,5 +30,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "5da36242c69e3969d9af815b790734cbce40f1f1"
+  "gitHead": "5782cd74389aea502368e292be5b827ddf3d123d"
 }

package/services/account.js

@@ -1,53 +1,88 @@
 const bcrypt = require('bcrypt');
+const createSlug = require('speakingurl');
 const DbService = require('moleculer-db');
 const { TripleStoreAdapter } = require('@semapps/triplestore');
 const crypto = require('crypto');
 
+// Taken from https://stackoverflow.com/a/9204568/7900695
+const emailRegexp = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+
 module.exports = {
   name: 'auth.account',
   mixins: [DbService],
   adapter: new TripleStoreAdapter({ type: 'AuthAccount', dataset: 'settings' }),
   settings: {
     idField: '@id',
-    reservedUsernames: ['relay']
+    reservedUsernames: ['relay'],
+    minPasswordLength: 1,
+    minUsernameLength: 1
   },
   dependencies: ['triplestore'],
   actions: {
     async create(ctx) {
       let { uuid, username, password, email, webId, ...rest } = ctx.params;
-      const hashedPassword = password ? await this.hashPassword(password) : undefined;
 
-      email = email && email.toLowerCase();
+      // FORMAT AND VERIFY PASSWORD
+
+      if (password) {
+        if (password.length < this.settings.minPasswordLength) {
+          throw new Error('password.too-short');
+        }
+
+        password = await this.hashPassword(password);
+      }
+
+      // FORMAT AND VERIFY EMAIL
 
-      const emailExists = !email ? false : await ctx.call('auth.account.emailExists', { email });
-      if (emailExists) {
-        throw new Error('email.already.exists');
+      if (email) {
+        email = email.toLowerCase();
+
+        const emailExists = await ctx.call('auth.account.emailExists', { email });
+        if (emailExists) {
+          throw new Error('email.already.exists');
+        }
+
+        if (!emailRegexp.test(email)) {
+          throw new Error('email.invalid');
+        }
       }
 
+      // FORMAT AND VERIFY USERNAME
+
       if (username) {
-        if (!ctx.meta.isSystemCall) await this.isValidUsername(ctx, username);
+        if (!ctx.meta.isSystemCall) {
+          const { isValid, error } = await this.isValidUsername(ctx, username);
+          if (!isValid) throw new Error(error);
+        }
       } else if (email) {
-        // If username is not provided, find an username based on the email
-        const usernameFromEmail = email.split('@')[0].toLowerCase();
-        let usernameValid = false;
-        let i = 0;
-        do {
-          username = i === 0 ? usernameFromEmail : usernameFromEmail + i;
-          try {
-            usernameValid = await this.isValidUsername(ctx, username);
-          } catch (e) {
-            // Do nothing, the loop will continue
+        // If username is not provided, find one automatically from the email (without errors)
+        username = createSlug(email.split('@')[0].toLowerCase());
+
+        let { isValid, error } = await this.isValidUsername(ctx, username);
+
+        if (!isValid) {
+          if (error === 'username.invalid' || error === 'username.too-short') {
+            // If username generated from email is invalid, use a generic name
+            username = 'user';
           }
-          i++;
-        } while (!usernameValid);
-      } else throw new Error('you must provide at least a username or an email address');
+
+          // If necessary, add a number after the username
+          let i = 0;
+          do {
+            username = i === 0 ? username : username + i;
+            ({ isValid } = await this.isValidUsername(ctx, username));
+          } while (!isValid);
+        }
+      } else {
+        throw new Error('You must provide at least a username or an email address');
+      }
 
       return await this._create(ctx, {
         ...rest,
         uuid,
         username,
         email,
-        hashedPassword,
+        hashedPassword: password,
         webId
       });
     },
@@ -219,23 +254,29 @@ module.exports = {
   },
   methods: {
     async isValidUsername(ctx, username) {
+      let error;
+
       // Ensure the username has no space or special characters
       if (!/^[a-z0-9\-+_.]+$/.exec(username)) {
-        throw new Error('username.invalid');
+        error = 'username.invalid';
+      }
+
+      if (username.length < this.settings.minUsernameLength) {
+        error = 'username.too-short';
       }
 
       // Ensure we don't use reservedUsernames
       if (this.settings.reservedUsernames.includes(username)) {
-        throw new Error('username.already.exists');
+        error = 'username.reserved';
       }
 
       // Ensure username doesn't already exist
       const usernameExists = await ctx.call('auth.account.usernameExists', { username });
       if (usernameExists) {
-        throw new Error('username.already.exists');
+        error = 'username.already.exists';
       }
 
-      return true;
+      return { isValid: !error, error };
     },
     async hashPassword(password) {
       return new Promise((resolve, reject) => {

package/services/auth.local.js

@@ -14,6 +14,8 @@ const AuthLocalService = {
     jwtPath: null,
     registrationAllowed: true,
     reservedUsernames: [],
+    minPasswordLength: 1,
+    minUsernameLength: 1,
     webIdSelection: [],
     accountSelection: [],
     formUrl: null,
@@ -47,13 +49,10 @@ const AuthLocalService = {
   actions: {
     async signup(ctx) {
       const { username, email, password, ...rest } = ctx.params;
+
       // This is going to get in our way otherwise when waiting for completions.
       ctx.meta.skipObjectsWatcher = true;
 
-      if (username && username.length < 2) {
-        throw new MoleculerError('The username must be at least 2 characters long', 400, 'BAD_REQUEST');
-      }
-
       let accountData = await ctx.call('auth.account.create', {
         username,
         email,
@@ -62,7 +61,7 @@ const AuthLocalService = {
       });
 
       try {
-        const profileData = { nick: username, email, ...rest };
+        const profileData = { nick: accountData.username, email: accountData.email, ...rest };
         const webId = await ctx.call('webid.createWebId', this.pickWebIdData(profileData), {
           meta: {
             isSignup: true // Allow services to handle directly the webId creation if it is generated by the AuthService

package/services/capabilities.js

@@ -12,16 +12,12 @@ const CapabilitiesService = {
   mixins: [ControlledContainerMixin],
   settings: {
     path: CAPABILITIES_ROUTE,
+    acceptedTypes: ['acl:Authorization'],
     excludeFromMirror: true,
     activateTombstones: false,
     permissions: {},
     newResourcesPermissions: {},
-    description: {
-      labelMap: {
-        en: 'Capabilities'
-      },
-      internal: true
-    }
+    typeIndex: 'private'
   },
   hooks: {
     before: {