@things-factory/auth-base 6.2.27 → 6.2.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "6.2.27",
+  "version": "6.2.30",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -42,5 +42,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "6d414311ca45c329e93606fe46edd7ea53c819c5"
+  "gitHead": "6dcd4ae0df733f128ec362e88cae5267added386"
 }

package/server/middlewares/jwt-authenticate-middleware.ts

@@ -1,13 +1,17 @@
 import passport from 'koa-passport'
 import { ExtractJwt, Strategy as JWTstrategy } from 'passport-jwt'
 
+import { config } from '@things-factory/env'
+
 import { makeVerificationToken } from '../controllers/utils/make-verification-token'
 import { saveVerificationToken } from '../controllers/utils/save-verification-token'
 import { User, UserStatus } from '../service/user/user'
 import { VerificationTokenType } from '../service/verification-token/verification-token'
-import { clearAccessTokenCookie, getAccessTokenCookie } from '../utils/access-token-cookie'
+import { clearAccessTokenCookie, getAccessTokenCookie, setAccessTokenCookie } from '../utils/access-token-cookie'
 import { SECRET } from '../utils/get-secret'
 
+const sessionExpiryPolicy = config.get('session/expiryPolicy', 'fixed')
+
 passport.use(
   new JWTstrategy(
     {
@@ -65,6 +69,14 @@ export async function jwtAuthenticateMiddleware(context, next) {
       } else {
         context.state.user = userEntity
         context.state.decodedToken = decoded
+
+        if (sessionExpiryPolicy == 'rolling') {
+          /* To renew the expiry time on each request, a token is issued and the session is updated. */
+
+          const token = await userEntity.sign()
+          setAccessTokenCookie(context, token)
+        }
+
         await next()
       }
     }

package/server/service/user/user.ts

@@ -28,6 +28,8 @@ import { getDomainsWithPrivilege } from '../../utils/get-user-domains'
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 
+const sessionExpirySeconds = Number(config.get('session/expirySeconds')) || '7d'
+
 export enum UserStatus {
   INACTIVE = 'inactive',
   ACTIVATED = 'activated',
@@ -164,7 +166,7 @@ export class User {
 
   /* signing for jsonwebtoken */
   async sign(options?) {
-    var { expiresIn = '7d', subdomain } = options || {}
+    var { expiresIn = sessionExpirySeconds, subdomain } = options || {}
 
     var user = {
       id: this.id,