@semapps/auth 0.7.0 → 0.8.1

package/mixins/auth.js

@@ -19,21 +19,23 @@ const AuthMixin = {
     accountsDataset: 'settings',
     podProvider: false
   },
-  dependencies: ['api', 'webid'],
+  dependencies: ['api'],
   async created() {
     const { jwtPath, reservedUsernames, accountsDataset, podProvider } = this.settings;
 
-    this.broker.createService(AuthJWTService, {
+    this.broker.createService({
+      mixins: [AuthJWTService],
       settings: { jwtPath }
     });
 
-    this.broker.createService(AuthAccountService, {
+    this.broker.createService({
+      mixins: [AuthAccountService],
       settings: { reservedUsernames },
       adapter: new TripleStoreAdapter({ type: 'AuthAccount', dataset: accountsDataset })
     });
 
     if (podProvider) {
-      this.broker.createService(CapabilitiesService, { settings: { path: this.settings.capabilitiesPath } });
+      this.broker.createService({ mixins: [CapabilitiesService], settings: { path: this.settings.capabilitiesPath } });
     }
   },
   async started() {
@@ -51,7 +53,9 @@ const AuthMixin = {
 
     this.passport.use(this.passportId, this.strategy);
 
-    for (const route of this.getApiRoutes()) {
+    const { pathname: basePath } = new URL(this.settings.baseUrl);
+
+    for (const route of this.getApiRoutes(basePath)) {
       await this.broker.call('api.addRoute', { route });
     }
   },

package/mixins/auth.sso.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const session = require('express-session');
 const AuthMixin = require('./auth');
 const saveRedirectUrl = require('../middlewares/saveRedirectUrl');
@@ -33,8 +34,7 @@ const AuthSSOMixin = {
         webId = accountData.webId;
         newUser = false;
 
-        // TODO update account with recent information
-        // await ctx.call('webid.edit', profileData, { meta: { webId } });
+        // TODO update account with recent profileData information
 
         ctx.emit('auth.connected', { webId, accountData, ssoData }, { meta: { webId: null, dataset: null } });
       } else {
@@ -47,7 +47,7 @@ const AuthSSOMixin = {
           email: profileData.email,
           username: profileData.username
         });
-        webId = await ctx.call('webid.create', this.pickWebIdData({ nick: accountData.username, ...profileData }));
+        webId = await ctx.call('webid.createWebId', this.pickWebIdData({ nick: accountData.username, ...profileData }));
         newUser = true;
 
         // Link the webId with the account
@@ -66,11 +66,11 @@ const AuthSSOMixin = {
     }
   },
   methods: {
-    getApiRoutes() {
+    getApiRoutes(basePath) {
       const sessionMiddleware = session({ secret: this.settings.sessionSecret, maxAge: null });
       return [
         {
-          path: '/auth',
+          path: path.join(basePath, '/auth'),
           name: 'auth',
           use: [sessionMiddleware, this.passport.initialize(), this.passport.session()],
           aliases: {
@@ -78,7 +78,7 @@ const AuthSSOMixin = {
           }
         },
         {
-          path: '/auth/logout',
+          path: path.join(basePath, '/auth/logout'),
           name: 'auth-logout',
           use: [sessionMiddleware, this.passport.initialize(), this.passport.session()],
           aliases: {

package/package.json

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

package/services/account.js

@@ -88,6 +88,12 @@ module.exports = {
       const accounts = await this._find(ctx, { query: { email } });
       return accounts.length > 0;
     },
+    /** Overwrite find method, to filter accounts with tombstone. */
+    async find(ctx) {
+      /** @type {object[]} */
+      const accounts = await this._find(ctx, ctx.params);
+      return accounts.filter(account => !account.deletedAt);
+    },
     async findByUsername(ctx) {
       const { username } = ctx.params;
       const accounts = await this._find(ctx, { query: { username } });
@@ -184,6 +190,34 @@ module.exports = {
         '@id': account['@id'],
         ...params
       });
+    },
+    async deleteByWebId(ctx) {
+      const { webId } = ctx.params;
+      const account = await ctx.call('auth.account.findByWebId', { webId });
+
+      if (account) {
+        await this._remove(ctx, { id: account['@id'] });
+        return true;
+      }
+
+      return false;
+    },
+    // Remove email and password from an account, set deletedAt timestamp.
+    async setTombstone(ctx) {
+      const { webId } = ctx.params;
+      const account = await ctx.call('auth.account.findByWebId', { webId });
+
+      return await this._update(ctx, {
+        // Set all values to undefined...
+        ...Object.fromEntries(Object.keys(account).map(key => [key, null])),
+        '@id': account['@id'],
+        // ...except for
+        webId: account.webId,
+        username: account.username,
+        podUri: account.podUri,
+        // And add a deletedAt date.
+        deletedAt: new Date().toISOString()
+      });
     }
   },
   methods: {

package/services/auth.local.js

@@ -1,9 +1,11 @@
+const path = require('path');
 const { Strategy } = require('passport-local');
 const AuthMixin = require('../mixins/auth');
 const sendToken = require('../middlewares/sendToken');
 const { MoleculerError } = require('moleculer').Errors;
 const AuthMailService = require('./mail');
 
+/** @type {import('moleculer').ServiceSchema} */
 const AuthLocalService = {
   name: 'auth',
   mixins: [AuthMixin],
@@ -27,13 +29,15 @@ const AuthLocalService = {
       }
     }
   },
+  dependencies: ['webid'],
   async created() {
     const { mail } = this.settings;
 
     this.passportId = 'local';
 
     if (mail !== false) {
-      await this.broker.createService(AuthMailService, {
+      this.broker.createService({
+        mixins: [AuthMailService],
         settings: {
           ...mail
         }
@@ -43,6 +47,8 @@ const AuthLocalService = {
   actions: {
     async signup(ctx) {
       const { username, email, password, interactionId, ...rest } = ctx.params;
+      // This is going to get in our way otherwise when waiting for completions.
+      ctx.meta.skipObjectsWatcher = true;
 
       if (username && username.length < 2) {
         throw new Error('The username must be at least 2 characters long');
@@ -56,7 +62,7 @@ const AuthLocalService = {
       });
 
       const profileData = { nick: username, email, ...rest };
-      const webId = await ctx.call('webid.create', this.pickWebIdData(profileData));
+      const webId = await ctx.call('webid.createWebId', this.pickWebIdData(profileData));
 
       // Link the webId with the account
       accountData = await ctx.call('auth.account.attachWebId', { accountUri: accountData['@id'], webId });
@@ -148,9 +154,9 @@ const AuthLocalService = {
         }
       );
     },
-    getApiRoutes() {
+    getApiRoutes(basePath) {
       const loginRoute = {
-        path: '/auth/login',
+        path: path.join(basePath, '/auth/login'),
         name: 'auth-login',
         use: [this.passport.initialize()],
         aliases: {
@@ -159,7 +165,7 @@ const AuthLocalService = {
       };
 
       const logoutRoute = {
-        path: '/auth/logout',
+        path: path.join(basePath, '/auth/logout'),
         name: 'auth-logout',
         aliases: {
           'GET /': 'auth.logout'
@@ -167,7 +173,7 @@ const AuthLocalService = {
       };
 
       const signupRoute = {
-        path: '/auth/signup',
+        path: path.join(basePath, '/auth/signup'),
         name: 'auth-signup',
         aliases: {
           'POST /': 'auth.signup'
@@ -175,7 +181,7 @@ const AuthLocalService = {
       };
 
       const formRoute = {
-        path: '/auth',
+        path: path.join(basePath, '/auth'),
         name: 'auth',
         aliases: {
           'GET /': 'auth.redirectToForm'
@@ -183,14 +189,14 @@ const AuthLocalService = {
       };
 
       const resetPasswordRoute = {
-        path: '/auth/reset_password',
+        path: path.join(basePath, '/auth/reset_password'),
         name: 'auth-reset-password',
         aliases: {
           'POST /': 'auth.resetPassword'
         }
       };
       const setNewPasswordRoute = {
-        path: '/auth/new_password',
+        path: path.join(basePath, '/auth/new_password'),
         name: 'auth-new-password',
         aliases: {
           'POST /': 'auth.setNewPassword'
@@ -198,7 +204,7 @@ const AuthLocalService = {
       };
 
       const accountSettingsRoute = {
-        path: '/auth/account',
+        path: path.join(basePath, '/auth/account'),
         name: 'auth-account',
         aliases: {
           'GET /': 'auth.account.findSettingsByWebId',