@semapps/auth 0.4.0-alpha.13 → 0.4.0-alpha.16

package/mixins/auth.js

@@ -24,7 +24,7 @@ const AuthMixin = {
 
     await this.broker.createService(AuthAccountService, {
       settings: { reservedUsernames },
-      adapter: new TripleStoreAdapter({ type: 'AuthAccount', dataset: accountsDataset }),
+      adapter: new TripleStoreAdapter({ type: 'AuthAccount', dataset: accountsDataset })
     });
   },
   async started() {
@@ -115,7 +115,9 @@ const AuthMixin = {
     },
     pickAccountData(data) {
       if (this.settings.accountSelection.length > 0) {
-        return Object.fromEntries(this.settings.accountSelection.filter(key => key in data).map(key => [key, data[key]]));
+        return Object.fromEntries(
+          this.settings.accountSelection.filter(key => key in data).map(key => [key, data[key]])
+        );
       } else {
         return data || {};
       }

package/mixins/auth.sso.js

@@ -32,25 +32,29 @@ const AuthSSOMixin = {
         newUser = false;
 
         // TODO update account with recent information
-        // await this.broker.call('webid.edit', profileData, { meta: { webId } });
+        // await ctx.call('webid.edit', profileData, { meta: { webId } });
 
-        await this.broker.emit('auth.connected', { webId, accountData });
+        ctx.emit('auth.connected', { webId, accountData, ssoData }, { meta: { webId: null, dataset: null } });
       } else {
         if (!this.settings.registrationAllowed) {
           throw new Error('registration.not-allowed');
         }
 
         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 }, { 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: accountData.webId } });
+      const token = await ctx.call('auth.jwt.generateToken', { payload: { webId } });
 
       return { token, newUser };
     }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@semapps/auth",
-  "version": "0.4.0-alpha.13",
+  "version": "0.4.0-alpha.16",
   "description": "Authentification module for SemApps",
   "license": "Apache-2.0",
   "author": "Virtual Assembly",
   "dependencies": {
-    "@semapps/mime-types": "0.4.0-alpha.13",
-    "@semapps/triplestore": "0.4.0-alpha.13",
+    "@semapps/mime-types": "0.4.0-alpha.16",
+    "@semapps/triplestore": "0.4.0-alpha.16",
     "bcrypt": "^5.0.1",
     "express-session": "^1.17.0",
     "jsonwebtoken": "^8.5.1",
@@ -15,12 +15,12 @@
     "moleculer-web": "^0.10.0-beta1",
     "openid-client": "^4.7.4",
     "passport": "^0.4.1",
-    "passport-cas2": "0.0.11",
+    "passport-cas2": "0.0.12",
     "passport-local": "^1.0.0",
     "url-join": "^4.0.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8d9719359c3e791abe17a1c3e615fb138a0edf33"
+  "gitHead": "035fb21fc25fe669392a95e222b76eb54c96a0ed"
 }

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/auth.local.js

@@ -12,7 +12,7 @@ const AuthLocalService = {
     registrationAllowed: true,
     reservedUsernames: [],
     webIdSelection: [],
-    accountSelection: [],
+    accountSelection: []
   },
   created() {
     this.passportId = 'local';
@@ -21,7 +21,12 @@ const AuthLocalService = {
     async signup(ctx) {
       const { username, email, password, ...rest } = ctx.params;
 
-      let accountData = await ctx.call('auth.account.create', { username, email, password, ...this.pickAccountData(rest) });
+      let accountData = await ctx.call('auth.account.create', {
+        username,
+        email,
+        password,
+        ...this.pickAccountData(rest)
+      });
 
       const profileData = { nick: username, email, ...rest };
       const webId = await ctx.call('webid.create', this.pickWebIdData(profileData));

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) {