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

package/mixins/auth.js

@@ -1,7 +1,8 @@
+const passport = require('passport');
+const { Errors: E } = require('moleculer-web');
+const { TripleStoreAdapter } = require('@semapps/triplestore');
 const AuthAccountService = require('../services/account');
 const AuthJWTService = require('../services/jwt');
-const { Errors: E } = require('moleculer-web');
-const passport = require('passport');
 
 const AuthMixin = {
   settings: {
@@ -9,18 +10,21 @@ const AuthMixin = {
     jwtPath: null,
     registrationAllowed: true,
     reservedUsernames: [],
-    webIdSelection: []
+    webIdSelection: [],
+    accountSelection: [],
+    accountsDataset: 'settings'
   },
   dependencies: ['api', 'webid'],
   async created() {
-    const { jwtPath, reservedUsernames } = this.settings;
+    const { jwtPath, reservedUsernames, accountsDataset } = this.settings;
 
     await this.broker.createService(AuthJWTService, {
       settings: { jwtPath }
     });
 
     await this.broker.createService(AuthAccountService, {
-      settings: { reservedUsernames }
+      settings: { reservedUsernames },
+      adapter: new TripleStoreAdapter({ type: 'AuthAccount', dataset: accountsDataset })
     });
   },
   async started() {
@@ -108,6 +112,15 @@ const AuthMixin = {
       } else {
         return data;
       }
+    },
+    pickAccountData(data) {
+      if (this.settings.accountSelection.length > 0) {
+        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,9 +32,9 @@ 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');
@@ -47,10 +47,10 @@ const AuthSSOMixin = {
         // 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.11",
+  "version": "0.4.0-alpha.14",
   "description": "Authentification module for SemApps",
   "license": "Apache-2.0",
   "author": "Virtual Assembly",
   "dependencies": {
-    "@semapps/mime-types": "0.4.0-alpha.11",
-    "@semapps/triplestore": "0.4.0-alpha.11",
+    "@semapps/mime-types": "0.4.0-alpha.14",
+    "@semapps/triplestore": "0.4.0-alpha.14",
     "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": "fe2f720f4685e29be79bcf18d139611de5037919"
+  "gitHead": "d84cc686bf0a0404a94cefe9d8b5828a058659da"
 }

package/services/account.js

@@ -13,7 +13,7 @@ module.exports = {
   dependencies: ['triplestore'],
   actions: {
     async create(ctx) {
-      let { uuid, username, password, email, webId } = ctx.params;
+      let { uuid, username, password, email, webId, ...rest } = ctx.params;
       const hashedPassword = password ? await this.hashPassword(password) : undefined;
 
       email = email.toLowerCase();
@@ -38,6 +38,7 @@ module.exports = {
       }
 
       return await this._create(ctx, {
+        ...rest,
         uuid,
         username,
         email,

package/services/auth.local.js

@@ -11,18 +11,24 @@ const AuthLocalService = {
     jwtPath: null,
     registrationAllowed: true,
     reservedUsernames: [],
-    webIdSelection: []
+    webIdSelection: [],
+    accountSelection: []
   },
   created() {
     this.passportId = 'local';
   },
   actions: {
     async signup(ctx) {
-      const { username, email, password, ...otherData } = ctx.params;
+      const { username, email, password, ...rest } = ctx.params;
 
-      let accountData = await ctx.call('auth.account.create', { username, email, password });
+      let accountData = await ctx.call('auth.account.create', {
+        username,
+        email,
+        password,
+        ...this.pickAccountData(rest)
+      });
 
-      const profileData = { nick: username, email, ...otherData };
+      const profileData = { nick: username, email, ...rest };
       const webId = await ctx.call('webid.create', this.pickWebIdData(profileData));
 
       // Link the webId with the account