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

package/package.json

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

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 });
     }