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

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@semapps/auth",
-  "version": "0.4.0-alpha.0",
+  "version": "0.4.0-alpha.4",
   "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.4",
+    "@semapps/triplestore": "0.4.0-alpha.4",
     "bcrypt": "^5.0.1",
     "express-session": "^1.17.0",
     "jsonwebtoken": "^8.5.1",
@@ -22,5 +22,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1c0962ddc0bc571bcbdd4af58efc72a2569889ef"
+  "gitHead": "2ba923a2a0799a03a99cbe9af67f0a1b3bdda139"
 }

package/services/account.js

@@ -54,11 +54,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);
@@ -100,7 +99,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/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);
         }