@semapps/auth 0.8.8 → 0.8.9

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@semapps/auth",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "description": "Authentification module for SemApps",
   "license": "Apache-2.0",
   "author": "Virtual Assembly",
   "dependencies": {
-    "@semapps/ldp": "0.8.8",
-    "@semapps/middlewares": "0.8.8",
-    "@semapps/mime-types": "0.8.8",
-    "@semapps/triplestore": "0.8.8",
+    "@semapps/ldp": "0.8.9",
+    "@semapps/middlewares": "0.8.9",
+    "@semapps/mime-types": "0.8.9",
+    "@semapps/triplestore": "0.8.9",
     "bcrypt": "^5.0.1",
     "express-session": "^1.17.0",
     "jsonwebtoken": "^8.5.1",
@@ -29,5 +29,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "ace1f82c14c082cc24cc9d8498748c7458d96602"
+  "gitHead": "2a8bb8d6e5e1d37995d73ff75d8a7f5ab118ae56"
 }

package/services/auth.local.js

@@ -51,7 +51,7 @@ const AuthLocalService = {
       ctx.meta.skipObjectsWatcher = true;
 
       if (username && username.length < 2) {
-        throw new Error('The username must be at least 2 characters long');
+        throw new MoleculerError('The username must be at least 2 characters long', 400, 'BAD_REQUEST');
       }
 
       let accountData = await ctx.call('auth.account.create', {
@@ -61,21 +61,27 @@ const AuthLocalService = {
         ...this.pickAccountData(rest)
       });
 
-      const profileData = { nick: username, email, ...rest };
-      const webId = await ctx.call('webid.createWebId', this.pickWebIdData(profileData), {
-        meta: {
-          isSignup: true // Allow services to handle directly the webId creation if it is generated by the AuthService
-        }
-      });
+      try {
+        const profileData = { nick: username, email, ...rest };
+        const webId = await ctx.call('webid.createWebId', this.pickWebIdData(profileData), {
+          meta: {
+            isSignup: true // Allow services to handle directly the webId creation if it is generated by the AuthService
+          }
+        });
 
-      // Link the webId with the account
-      accountData = await ctx.call('auth.account.attachWebId', { accountUri: accountData['@id'], webId });
+        // Link the webId with the account
+        accountData = await ctx.call('auth.account.attachWebId', { accountUri: accountData['@id'], webId });
 
-      ctx.emit('auth.registered', { webId, profileData, accountData, interactionId });
+        ctx.emit('auth.registered', { webId, profileData, accountData, interactionId });
 
-      const token = await ctx.call('auth.jwt.generateToken', { payload: { webId } });
+        const token = await ctx.call('auth.jwt.generateToken', { payload: { webId } });
 
-      return { token, webId, newUser: true };
+        return { token, webId, newUser: true };
+      } catch (e) {
+        // Delete account if resource creation failed, or it may cause problems when retrying
+        await ctx.call('auth.account.remove', { id: accountData['@id'] });
+        throw e;
+      }
     },
     async login(ctx) {
       const { username, password, interactionId } = ctx.params;
@@ -117,7 +123,7 @@ const AuthLocalService = {
       const account = await ctx.call('auth.account.findByEmail', { email });
 
       if (!account) {
-        throw new Error('email.not.exists');
+        throw new MoleculerError('email.not.exists', 400, 'BAD_REQUEST');
       }
 
       const token = await ctx.call('auth.account.generateResetPasswordToken', { webId: account.webId });
@@ -133,7 +139,7 @@ const AuthLocalService = {
       const account = await ctx.call('auth.account.findByEmail', { email });
 
       if (!account) {
-        throw new Error('email.not.exists');
+        throw new MoleculerError('email.not.exists', 400, 'BAD_REQUEST');
       }
 
       await ctx.call('auth.account.setNewPassword', { webId: account.webId, token, password });
@@ -152,7 +158,6 @@ const AuthLocalService = {
               done(null, returnedData);
             })
             .catch(e => {
-              console.error(e);
               done(new MoleculerError(e.message, 401), false);
             });
         }