@semapps/auth 0.8.0 → 0.8.1

package/mixins/auth.js

@@ -23,17 +23,19 @@ const AuthMixin = {
   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');
@@ -65,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: {
@@ -77,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.8.0",
+  "version": "0.8.1",
   "description": "Authentification module for SemApps",
   "license": "Apache-2.0",
   "author": "Virtual Assembly",
   "dependencies": {
-    "@semapps/ldp": "0.8.0",
-    "@semapps/middlewares": "0.8.0",
-    "@semapps/mime-types": "0.8.0",
-    "@semapps/triplestore": "0.8.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": "9ab99a4751d5240ec9d6df985bf00dc21c348ef4"
+  "gitHead": "c056166a50822060e229c20efd2eb6ee666fc743"
 }

package/services/auth.local.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const { Strategy } = require('passport-local');
 const AuthMixin = require('../mixins/auth');
 const sendToken = require('../middlewares/sendToken');
@@ -35,7 +36,8 @@ const AuthLocalService = {
     this.passportId = 'local';
 
     if (mail !== false) {
-      await this.broker.createService(AuthMailService, {
+      this.broker.createService({
+        mixins: [AuthMailService],
         settings: {
           ...mail
         }
@@ -152,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: {
@@ -163,7 +165,7 @@ const AuthLocalService = {
       };
 
       const logoutRoute = {
-        path: '/auth/logout',
+        path: path.join(basePath, '/auth/logout'),
         name: 'auth-logout',
         aliases: {
           'GET /': 'auth.logout'
@@ -171,7 +173,7 @@ const AuthLocalService = {
       };
 
       const signupRoute = {
-        path: '/auth/signup',
+        path: path.join(basePath, '/auth/signup'),
         name: 'auth-signup',
         aliases: {
           'POST /': 'auth.signup'
@@ -179,7 +181,7 @@ const AuthLocalService = {
       };
 
       const formRoute = {
-        path: '/auth',
+        path: path.join(basePath, '/auth'),
         name: 'auth',
         aliases: {
           'GET /': 'auth.redirectToForm'
@@ -187,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'
@@ -202,7 +204,7 @@ const AuthLocalService = {
       };
 
       const accountSettingsRoute = {
-        path: '/auth/account',
+        path: path.join(basePath, '/auth/account'),
         name: 'auth-account',
         aliases: {
           'GET /': 'auth.account.findSettingsByWebId',