@semapps/auth 0.4.0-alpha.0 → 0.4.0-alpha.12

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,20 @@ const AuthMixin = {
     jwtPath: null,
     registrationAllowed: true,
     reservedUsernames: [],
-    webIdSelection: []
+    webIdSelection: [],
+    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() {

package/package.json

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

package/services/account.js

@@ -16,6 +16,8 @@ module.exports = {
       let { uuid, username, password, email, webId } = 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');
@@ -54,11 +56,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 +93,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 +101,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/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 });
     }
 

package/services/migration.js

@@ -10,11 +10,15 @@ module.exports = {
 
       for (let user of results['ldp:contains']) {
         if (user[emailPredicate]) {
-          await ctx.call('auth.account.create', {
-            email: user[emailPredicate],
-            username: user[usernamePredicate],
-            webId: user.id
-          });
+          try {
+            await ctx.call('auth.account.create', {
+              email: user[emailPredicate],
+              username: user[usernamePredicate],
+              webId: user.id
+            });
+          } catch (e) {
+            console.log(`Unable to create account for user ${user.id}. Error message: ${e.message}`);
+          }
         } else {
           console.log('No email found for user ' + user.id);
         }