feat(web): token never expiration

web/crux-ui/i18n.json

@@ -14,7 +14,7 @@
     "/auth/settings/edit-profile": ["settings"],
     "/auth/settings/change-password": ["settings"],
     "/auth/settings/new-password": ["settings"],
-    "/auth/settings/tokens": ["settings"],
+    "/auth/settings/tokens": ["settings", "tokens"],
     "/auth/verify": ["verify"],
     "/projects": ["projects"],
     "/projects/[projectId]": ["projects", "versions", "images", "deployments"],

web/crux-ui/src/components/settings/create-token-card.tsx

@@ -6,15 +6,15 @@ import { DyoHeading } from '@app/elements/dyo-heading'
 import { DyoInput } from '@app/elements/dyo-input'
 import { DyoLabel } from '@app/elements/dyo-label'
 import { defaultApiErrorHandler } from '@app/errors'
-import { GeneratedToken, GenerateToken } from '@app/models'
+import { GeneratedToken, GenerateToken, TokenExpiration } from '@app/models'
 import { API_TOKENS } from '@app/routes'
 import { sendForm } from '@app/utils'
 import { generateTokenSchema } from '@app/validations/token'
 import { useFormik } from 'formik'
 import useTranslation from 'next-translate/useTranslation'
 import { MutableRefObject } from 'react'
 
-const EXPIRATION_VALUES = [30, 60, 90]
+const EXPIRATION_VALUES: TokenExpiration[] = [30, 60, 90, 'never']
 
 interface CreateTokenCardProps {
   className?: string
@@ -81,7 +81,7 @@ const CreateTokenCard = (props: CreateTokenCardProps) => {
           className="text-bright"
           choices={EXPIRATION_VALUES}
           selection={formik.values.expirationInDays}
-          converter={it => t('common:days', { days: it })}
+          converter={it => (it === 'never' ? t('common:never') : t('common:days', { days: it }))}
           onSelectionChange={it => {
             formik.setFieldValue('expirationInDays', it, false)
           }}

web/crux-ui/src/models/token.ts

@@ -1,3 +1,5 @@
+export type TokenExpiration = number | 'never'
+
 export class Token {
   id: string
 
@@ -11,7 +13,7 @@ export class Token {
 export class GenerateToken {
   name: string
 
-  expirationInDays: number
+  expirationInDays: TokenExpiration
 }
 
 export class GeneratedToken extends Token {

web/crux-ui/src/pages/auth/settings/tokens.tsx

@@ -87,7 +87,7 @@ const TokensPage = (props: TokensPageProps) => {
   const itemTemplate = (item: GeneratedToken) => [
     <a>{item.name}</a>,
     <a>{utcDateToLocale(item.createdAt)}</a>,
-    <a>{utcDateToLocale(item.expiresAt)}</a>,
+    <a>{item.expiresAt ? utcDateToLocale(item.expiresAt) : t('common:never')}</a>,
     <div className="flex flex-row justify-center">
       <Image
         className="cursor-pointer"

web/crux-ui/src/validations/token.ts

@@ -4,5 +4,10 @@ import { nameRule } from './common'
 // eslint-disable-next-line import/prefer-default-export
 export const generateTokenSchema = yup.object().shape({
   name: nameRule.required(),
-  expirationInDays: yup.number().required(),
+  expirationInDays: yup.mixed().test(
+    'is-token-expiration',
+    // eslint-disable-next-line no-template-curly-in-string
+    '${label} is not a valid token expiration',
+    value => value === 'never' || typeof value === 'number',
+  ),
 })

web/crux/prisma/migrations/20230626125151_token_expiration_optional/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Token" ALTER COLUMN "expiresAt" DROP NOT NULL;

web/crux/prisma/schema.prisma

@@ -28,12 +28,12 @@ model Team {
 }
 
 model Token {
-  id        String   @id @default(uuid()) @db.Uuid
-  userId    String   @db.Uuid
-  name      String   @db.VarChar(70)
-  createdAt DateTime @default(now()) @db.Timestamptz(6)
-  expiresAt DateTime @db.Timestamptz(6)
-  nonce     String   @db.Uuid
+  id        String    @id @default(uuid()) @db.Uuid
+  userId    String    @db.Uuid
+  name      String    @db.VarChar(70)
+  createdAt DateTime  @default(now()) @db.Timestamptz(6)
+  expiresAt DateTime? @db.Timestamptz(6)
+  nonce     String    @db.Uuid
 
   @@unique([userId, name, nonce])
 }

web/crux/src/app/token/pipes/token.pipe.ts

@@ -5,7 +5,7 @@ import { GenerateTokenDto } from '../token.dto'
 @Injectable()
 export default class TokenValidationPipe implements PipeTransform {
   async transform(req: GenerateTokenDto) {
-    if (req.expirationInDays <= 0) {
+    if (req.expirationInDays !== 'never' && req.expirationInDays <= 0) {
       throw new CruxBadRequestException({
         property: 'expirationInDays',
         value: req.expirationInDays,

web/crux/src/app/token/token.dto.ts

@@ -1,5 +1,8 @@
 import { Type } from 'class-transformer'
-import { IsDate, IsInt, IsJWT, IsString, IsUUID, Min } from 'class-validator'
+import { IsDate, IsDefined, IsJWT, IsString, IsUUID, Validate } from 'class-validator'
+import IsTokenExpiration from './validation/token-expiration.validator'
+
+export type TokenExpiration = number | 'never'
 
 export class TokenDto {
   @IsUUID()
@@ -10,7 +13,7 @@ export class TokenDto {
 
   @Type(() => Date)
   @IsDate()
-  expiresAt: Date
+  expiresAt?: Date
 
   @Type(() => Date)
   @IsDate()
@@ -21,9 +24,9 @@ export class GenerateTokenDto {
   @IsString()
   name: string
 
-  @IsInt()
-  @Min(1)
-  expirationInDays: number
+  @IsDefined()
+  @Validate(IsTokenExpiration)
+  expirationInDays: TokenExpiration
 }
 
 export class GeneratedTokenDto extends TokenDto {

web/crux/src/app/token/token.service.ts

@@ -15,9 +15,9 @@ export default class TokenService {
 
   async generateToken(req: GenerateTokenDto, identity: Identity): Promise<GeneratedTokenDto> {
     const nonce = uuid()
-    const expirationDate = new Date(Date.now())
-    expirationDate.setDate(expirationDate.getDate() + req.expirationInDays)
-    this.logger.verbose(`Token expires at ${expirationDate.toISOString()}`)
+    const expirationDate =
+      req.expirationInDays === 'never' ? null : TokenService.getExpirationDate(req.expirationInDays)
+    this.logger.verbose(expirationDate ? `Token expires at ${expirationDate.toISOString()}` : 'Token never expries')
 
     const payload: AuthPayload = {
       sub: identity.id,
@@ -33,7 +33,9 @@ export default class TokenService {
       },
     })
 
-    const jwt = this.jwtService.sign({ exp: expirationDate.getTime() / 1000, data: payload })
+    const jwt = this.jwtService.sign(
+      expirationDate ? { exp: expirationDate.getTime() / 1000, data: payload } : { data: payload },
+    )
 
     return this.mapper.generatedTokenToDto(newToken, jwt)
   }
@@ -66,4 +68,10 @@ export default class TokenService {
       },
     })
   }
+
+  private static getExpirationDate(days: number): Date {
+    const expirationDate = new Date(Date.now())
+    expirationDate.setDate(expirationDate.getDate() + days)
+    return expirationDate
+  }
 }

web/crux/src/app/token/validation/token-expiration.validator.ts

@@ -0,0 +1,20 @@
+import { ValidatorConstraint, ValidatorConstraintInterface } from 'class-validator'
+
+@ValidatorConstraint({ name: 'token-expiration', async: false })
+export default class IsTokenExpiration implements ValidatorConstraintInterface {
+  validate(value: any): boolean {
+    if (typeof value === 'number') {
+      return value > 0
+    }
+
+    if (typeof value !== 'string') {
+      return false
+    }
+
+    return value === 'never'
+  }
+
+  defaultMessage(): string {
+    return "$property must be a number in days (at least 1) or 'never'"
+  }
+}