Merge branch 'master' into feat/mfa

src/api/controllers/ApiKeyController.ts

@@ -44,8 +44,9 @@ export class ApiKeyController {
     await getRepository(ApiKey).save({
       id,
       secretHash,
+      creator,
       description: data.description,
-      creator
+      expires: data.expires
     });
 
     return { token };

src/api/data/ApiKeyData/index.ts

@@ -8,9 +8,9 @@ export function convertApiKeyToData(apiKey: ApiKey): GetApiKeyData {
   return {
     id: apiKey.id,
     description: apiKey.description,
+    expires: apiKey.expires,
     creator: convertContactToData(apiKey.creator),
-    createdAt: apiKey.createdAt,
-    secretHash: apiKey.secretHash
+    createdAt: apiKey.createdAt
   };
 }
 

src/api/data/ApiKeyData/interface.ts

@@ -1,20 +1,25 @@
-import { IsIn, IsString } from "class-validator";
+import { IsDate, IsIn, IsOptional, IsString } from "class-validator";
 import { GetContactData } from "../ContactData";
 import { GetPaginatedQuery } from "../PaginatedData";
+import { Type } from "class-transformer";
 
 export class CreateApiKeyData {
   @IsString()
   description!: string;
+
+  @IsOptional()
+  @Type(() => Date)
+  @IsDate()
+  expires!: Date | null;
 }
 
 export interface GetApiKeyData extends CreateApiKeyData {
   id: string;
   creator: GetContactData;
   createdAt: Date;
-  secretHash: string;
 }
 
 export class GetApiKeysQuery extends GetPaginatedQuery {
-  @IsIn(["createdAt"])
+  @IsIn(["createdAt", "expires"])
   sort?: string;
 }

src/core/services/AuthService.ts

@@ -11,7 +11,7 @@ async function isValidApiKey(key: string): Promise<boolean> {
   const [_, secret] = key.split("_");
   const secretHash = crypto.createHash("sha256").update(secret).digest("hex");
   const apiKey = await getRepository(ApiKey).findOne({ secretHash });
-  return !!apiKey;
+  return !!apiKey && (!apiKey.expires || apiKey.expires > new Date());
 }
 
 class AuthService {

src/migrations/1698938717666-AddApiKeyExpiryDate.ts

@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddApiKeyExpiryDate1698938717666 implements MigrationInterface {
+  name = "AddApiKeyExpiryDate1698938717666";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "api_key" ADD "expires" TIMESTAMP`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "api_key" DROP COLUMN "expires"`);
+  }
+}

src/models/ApiKey.ts

@@ -18,6 +18,9 @@ export default class ApiKey {
   @CreateDateColumn()
   createdAt!: Date;
 
+  @Column({ type: Date, nullable: true })
+  expires!: Date | null;
+
   @Column()
   secretHash!: string;