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

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,13 @@ 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/package.json

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

package/services/account.js

@@ -13,9 +13,11 @@ 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();
+
       const emailExists = await ctx.call('auth.account.emailExists', { email });
       if (emailExists) {
         throw new Error('email.already.exists');
@@ -36,6 +38,7 @@ module.exports = {
       }
 
       return await this._create(ctx, {
+        ...rest,
         uuid,
         username,
         email,
@@ -54,11 +57,10 @@ module.exports = {
     async verify(ctx) {
       const { username, password } = ctx.params;
 
-      const accounts = await this._find(ctx, {
-        query: {
-          username
-        }
-      });
+      // If the username includes a @, assume it is an email
+      const query = username.includes('@') ? { email: username } : { username };
+
+      const accounts = await this._find(ctx, { query });
 
       if (accounts.length > 0) {
         const passwordMatch = await this.comparePassword(password, accounts[0].hashedPassword);
@@ -92,7 +94,7 @@ module.exports = {
       const account = await ctx.call('auth.account.findByWebId', { webId });
 
       return await this._update(ctx, {
-        '@id': account.id,
+        '@id': account['@id'],
         hashedPassword
       });
     }
@@ -100,7 +102,7 @@ module.exports = {
   methods: {
     async isValidUsername(ctx, username) {
       // Ensure the username has no space or special characters
-      if (!/^[a-zA-Z0-9\-_.]+$/.exec(username)) {
+      if (!/^[a-z0-9\-_.]+$/.exec(username)) {
         throw new Error('username.invalid');
       }
 

package/services/auth.local.js

@@ -11,18 +11,19 @@ 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

package/services/jwt.js

@@ -14,6 +14,9 @@ module.exports = {
 
     if (!fs.existsSync(privateKeyPath) && !fs.existsSync(publicKeyPath)) {
       console.log('JWT keypair not found, generating...');
+      if (!fs.existsSync(this.settings.jwtPath)) {
+        fs.mkdirSync(this.settings.jwtPath);
+      }
       await this.actions.generateKeyPair({ privateKeyPath, publicKeyPath });
     }