code cleanup

Author: SteRiccio

src/api/auth/authApiCommon.ts

@@ -0,0 +1,21 @@
+import { UserAuthToken, UserRefreshToken, UserRefreshTokenProps } from '@openforis/arena-core'
+import { Request, Response } from 'express'
+
+export const jwtCookieName = 'jwt'
+export const jwtRefreshTokenCookieName = 'refreshToken'
+
+export const extractRefreshTokenProps = (options: { req: Request }): UserRefreshTokenProps => {
+  const { req } = options
+  return { userAgent: req.headers['user-agent'] ?? '' }
+}
+
+export const setAuthCookies = (options: {
+  res: Response
+  authToken: UserAuthToken
+  refreshToken: UserRefreshToken
+}) => {
+  const { res, authToken, refreshToken } = options
+  const cookieOptions = { httpOnly: true, secure: true }
+  res.cookie(jwtCookieName, authToken, { ...cookieOptions, expires: authToken.expiresAt })
+  res.cookie(jwtRefreshTokenCookieName, refreshToken.token, { ...cookieOptions, expires: refreshToken.expiresAt })
+}

src/api/auth/authTokenRefresh.ts

@@ -2,7 +2,7 @@ import { ServiceRegistry, ServiceType, UserAuthTokenService } from '@openforis/a
 
 import { ExpressInitializer } from '../../server'
 import { ApiEndpoint } from '../endpoint'
-import { jwtRefreshTokenCookieName, setAuthCookies } from './authApiCommon'
+import { extractRefreshTokenProps, jwtRefreshTokenCookieName, setAuthCookies } from './authApiCommon'
 
 export const AuthTokenRefresh: ExpressInitializer = {
   init: (express): void => {
@@ -14,7 +14,7 @@ export const AuthTokenRefresh: ExpressInitializer = {
 
       const authTokenRotationResult = await userRefreshTokenService.rotateTokens({
         refreshToken,
-        refreshTokenProps: { userAgent: req.headers['user-agent'] ?? '' },
+        refreshTokenProps: extractRefreshTokenProps({ req }),
       })
       if (!authTokenRotationResult) {
         return res.status(401).json({ message: 'Invalid or revoked refresh token' })

src/api/auth/login.ts

@@ -16,7 +16,7 @@ import { Logger } from '../../log'
 import { ExpressInitializer } from '../../server'
 import { Requests } from '../../utils'
 import { ApiEndpoint } from '../endpoint'
-import { setAuthCookies } from './authApiCommon'
+import { extractRefreshTokenProps, setAuthCookies } from './authApiCommon'
 
 const logger = new Logger('AuthAPI')
 
@@ -75,7 +75,7 @@ const authenticationSuccessful = (req: Request, res: Response, next: NextFunctio
 
       const authToken = userAuthTokenService.createAuthToken({ userUuid })
 
-      const refreshTokenProps: UserRefreshTokenProps = { userAgent: req.headers['user-agent'] ?? '' }
+      const refreshTokenProps: UserRefreshTokenProps = extractRefreshTokenProps({ req })
 
       userAuthTokenService
         .createRefreshToken({ userUuid, props: refreshTokenProps })

src/service/userRefreshToken/userRefreshTokenServiceConstants.ts

@@ -0,0 +1,5 @@
+export const jwtExpiresMs = 60 * 60 * 1000 // 1 hour
+export const jwtExpiresIn = '1h' // 1 hour
+
+export const jwtRefresshTokenExpireMs = 7 * 24 * 60 * 60 * 1000 // 1 week
+export const jwtRefreshExpiresIn = '1w' // 1 week