@semapps/auth 0.4.0-alpha.14 → 0.4.0-alpha.17

package/mixins/auth.sso.js

@@ -41,13 +41,17 @@ const AuthSSOMixin = {
         }
 
         accountData = await ctx.call('auth.account.create', { uuid: profileData.uuid, email: profileData.email });
-        webId = await ctx.call('webid.create', { nick: accountData.username, ...profileData });
+        webId = await ctx.call('webid.create', this.pickWebIdData({ nick: accountData.username, ...profileData }));
         newUser = true;
 
         // Link the webId with the account
         await ctx.call('auth.account.attachWebId', { accountUri: accountData['@id'], webId });
 
-        ctx.emit('auth.registered', { webId, profileData, accountData, ssoData }, { meta: { webId: null, dataset: null } });
+        ctx.emit(
+          'auth.registered',
+          { webId, profileData, accountData, ssoData },
+          { meta: { webId: null, dataset: null } }
+        );
       }
 
       const token = await ctx.call('auth.jwt.generateToken', { payload: { webId } });

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@semapps/auth",
-  "version": "0.4.0-alpha.14",
+  "version": "0.4.0-alpha.17",
   "description": "Authentification module for SemApps",
   "license": "Apache-2.0",
   "author": "Virtual Assembly",
   "dependencies": {
-    "@semapps/mime-types": "0.4.0-alpha.14",
-    "@semapps/triplestore": "0.4.0-alpha.14",
+    "@semapps/mime-types": "0.4.0-alpha.17",
+    "@semapps/triplestore": "0.4.0-alpha.17",
     "bcrypt": "^5.0.1",
     "express-session": "^1.17.0",
     "jsonwebtoken": "^8.5.1",
@@ -22,5 +22,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d84cc686bf0a0404a94cefe9d8b5828a058659da"
+  "gitHead": "82ae033aade5af9edb2c119040c2cb0478e9a712"
 }

package/services/account.js

@@ -16,7 +16,7 @@ module.exports = {
       let { uuid, username, password, email, webId, ...rest } = ctx.params;
       const hashedPassword = password ? await this.hashPassword(password) : undefined;
 
-      email = email.toLowerCase();
+      email = email && email.toLowerCase();
 
       const emailExists = await ctx.call('auth.account.emailExists', { email });
       if (emailExists) {
@@ -102,7 +102,7 @@ module.exports = {
   methods: {
     async isValidUsername(ctx, username) {
       // Ensure the username has no space or special characters
-      if (!/^[a-z0-9\-_.]+$/.exec(username)) {
+      if (!/^[a-z0-9\-+_.]+$/.exec(username)) {
         throw new Error('username.invalid');
       }
 

package/services/migration.js

@@ -1,4 +1,5 @@
 const { MIME_TYPES } = require('@semapps/mime-types');
+const { getSlugFromUri } = require('@semapps/ldp');
 
 module.exports = {
   name: 'auth.migration',
@@ -13,7 +14,7 @@ module.exports = {
           try {
             await ctx.call('auth.account.create', {
               email: user[emailPredicate],
-              username: user[usernamePredicate],
+              username: usernamePredicate ? user[usernamePredicate] : getSlugFromUri(user.id),
               webId: user.id
             });
           } catch (e) {