@semapps/auth 0.4.0 → 0.4.2-rc.0

package/mixins/auth.sso.js

@@ -69,6 +69,7 @@ const AuthSSOMixin = {
       return [
         {
           path: '/auth',
+          name: 'auth',
           use: [sessionMiddleware, this.passport.initialize(), this.passport.session()],
           aliases: {
             'GET /': [saveRedirectUrl, this.passport.authenticate(this.passportId, { session: false }), redirectToFront]
@@ -76,6 +77,7 @@ const AuthSSOMixin = {
         },
         {
           path: '/auth/logout',
+          name: 'auth-logout',
           use: [sessionMiddleware, this.passport.initialize(), this.passport.session()],
           aliases: {
             'GET /': [saveRedirectUrl, localLogout, redirectToFront]

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@semapps/auth",
-  "version": "0.4.0",
+  "version": "0.4.2-rc.0",
   "description": "Authentification module for SemApps",
   "license": "Apache-2.0",
   "author": "Virtual Assembly",
   "dependencies": {
-    "@semapps/mime-types": "0.4.0",
-    "@semapps/triplestore": "0.4.0",
+    "@semapps/mime-types": "0.4.2-rc.0",
+    "@semapps/triplestore": "0.4.2-rc.0",
     "bcrypt": "^5.0.1",
     "express-session": "^1.17.0",
     "jsonwebtoken": "^8.5.1",
@@ -25,5 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "985c76b612a5ad7a7d6d926eb4aa8d7e69e61a10"
+  "gitHead": "9b11bb0e2dc7a9df7222810174f54d944c346764"
 }

package/services/auth.local.js

@@ -14,6 +14,7 @@ const AuthLocalService = {
     reservedUsernames: [],
     webIdSelection: [],
     accountSelection: [],
+    formUrl: null,
     mail: {
       from: null,
       transport: {
@@ -69,7 +70,25 @@ const AuthLocalService = {
 
       const token = await ctx.call('auth.jwt.generateToken', { payload: { webId: accountData.webId } });
 
-      return { token, webId: accountData.webId, newUser: true };
+      return { token, webId: accountData.webId, newUser: false };
+    },
+    async logout(ctx) {
+      ctx.meta.$statusCode = 302;
+      ctx.meta.$location = ctx.params.redirectUrl || this.settings.formUrl;
+    },
+    async redirectToForm(ctx) {
+      if (this.settings.formUrl) {
+        const formUrl = new URL(this.settings.formUrl);
+        if (ctx.params) {
+          for (let [key, value] of Object.entries(ctx.params)) {
+            formUrl.searchParams.set(key, value);
+          }
+        }
+        ctx.meta.$statusCode = 302;
+        ctx.meta.$location = formUrl.toString();
+      } else {
+        throw new Error('No formUrl defined in auth.local settings')
+      }
     },
     async resetPassword(ctx) {
       const { email } = ctx.params;
@@ -123,27 +142,47 @@ const AuthLocalService = {
     getApiRoutes() {
       const loginRoute = {
         path: '/auth/login',
+        name: 'auth-login',
         use: [this.passport.initialize()],
         aliases: {
           'POST /': [this.passport.authenticate(this.passportId, { session: false }), sendToken]
         }
       };
 
+      const logoutRoute = {
+        path: '/auth/logout',
+        name: 'auth-logout',
+        aliases: {
+          'GET /': 'auth.logout'
+        }
+      };
+
       const signupRoute = {
         path: '/auth/signup',
+        name: 'auth-signup',
         aliases: {
           'POST /': 'auth.signup'
         }
       };
 
+      const formRoute = {
+        path: '/auth',
+        name: 'auth',
+        aliases: {
+          'GET /': 'auth.redirectToForm'
+        }
+      };
+
       const resetPasswordRoute = {
         path: '/auth/reset_password',
+        name: 'auth-reset-password',
         aliases: {
           'POST /': 'auth.resetPassword'
         }
       };
       const setNewPasswordRoute = {
         path: '/auth/new_password',
+        name: 'auth-new-password',
         aliases: {
           'POST /': 'auth.setNewPassword'
         }
@@ -151,6 +190,7 @@ const AuthLocalService = {
 
       const accountSettingsRoute = {
         path: '/auth/account',
+        name: 'auth-account',
         aliases: {
           'GET /': 'auth.account.findSettingsByWebId',
           'POST /': 'auth.account.updateAccountSettings'
@@ -158,7 +198,7 @@ const AuthLocalService = {
         authorization: true
       };
 
-      const routes = [loginRoute, resetPasswordRoute, setNewPasswordRoute, accountSettingsRoute];
+      const routes = [loginRoute, logoutRoute, formRoute, resetPasswordRoute, setNewPasswordRoute, accountSettingsRoute];
 
       if (this.settings.registrationAllowed) {
         return [...routes, signupRoute];