chore: pr feedback

immich-app · Jul 1, 2024 · 7282e0b · 7282e0b
1 parent 0192416
commit 7282e0b
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 35 deletions.
diff --git a/mobile/openapi/lib/model/license_response_dto.dart b/mobile/openapi/lib/model/license_response_dto.dart
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
@@ -8943,12 +8943,22 @@
       },
       "LicenseResponseDto": {
         "properties": {
-          "valid": {
-            "type": "boolean"
+          "activatedAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "activationKey": {
+            "type": "string"
+          },
+          "licenseKey": {
+            "pattern": "/IM(SV|CL)(-[\\dA-Za-z]{4}){8}/",
+            "type": "string"
           }
         },
         "required": [
-          "valid"
+          "activatedAt",
+          "activationKey",
+          "licenseKey"
         ],
         "type": "object"
       },

diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
@@ -887,7 +887,9 @@ export type LicenseKeyDto = {
     licenseKey: string;
 };
 export type LicenseResponseDto = {
-    valid: boolean;
+    activatedAt: string;
+    activationKey: string;
+    licenseKey: string;
 };
 export type SessionResponseDto = {
     createdAt: string;

diff --git a/server/src/dtos/license.dto.ts b/server/src/dtos/license.dto.ts
@@ -11,6 +11,6 @@ export class LicenseKeyDto {
   activationKey!: string;
 }
 
-export class LicenseResponseDto {
-  valid!: boolean;
+export class LicenseResponseDto extends LicenseKeyDto {
+  activatedAt!: Date;
 }
diff --git a/server/src/services/server.service.ts b/server/src/services/server.service.ts
@@ -172,21 +172,23 @@ export class ServerService implements OnEvents {
     if (!license.licenseKey.startsWith('IMSV-')) {
       throw new BadRequestException('Invalid license key');
     }
-    const trimmedLicenseKey = license.licenseKey;
     const licenseValid = this.cryptoRepository.verifySha256(
-      trimmedLicenseKey,
+      license.licenseKey,
       license.activationKey,
       getServerLicensePublicKey(),
     );
 
-    if (licenseValid) {
-      await this.systemMetadataRepository.set(SystemMetadataKey.LICENSE, {
-        licenseKey: license.licenseKey,
-        activationKey: license.activationKey,
-        activatedAt: new Date(),
-      });
+    if (!licenseValid) {
+      throw new BadRequestException('Invalid license key');
     }
 
-    return { valid: licenseValid };
+    const licenseData = {
+      ...license,
+      activatedAt: new Date(),
+    };
+
+    await this.systemMetadataRepository.set(SystemMetadataKey.LICENSE, licenseData);
+
+    return licenseData;
   }
 }
diff --git a/server/src/services/user.service.ts b/server/src/services/user.service.ts
@@ -133,25 +133,27 @@ export class UserService {
     if (!license.licenseKey.startsWith('IMCL-')) {
       throw new BadRequestException('Invalid license key');
     }
-    const trimmedLicenseKey = license.licenseKey;
     const licenseValid = this.cryptoRepository.verifySha256(
-      trimmedLicenseKey,
+      license.licenseKey,
       license.activationKey,
       getClientLicensePublicKey(),
     );
 
-    if (licenseValid) {
-      await this.userRepository.upsertMetadata(auth.user.id, {
-        key: UserMetadataKey.LICENSE,
-        value: {
-          licenseKey: license.licenseKey,
-          activationKey: license.activationKey,
-          activatedAt: new Date(),
-        },
-      });
+    if (!licenseValid) {
+      throw new BadRequestException('Invalid license key');
     }
 
-    return { valid: licenseValid };
+    const licenseData = {
+      ...license,
+      activatedAt: new Date(),
+    };
+
+    await this.userRepository.upsertMetadata(auth.user.id, {
+      key: UserMetadataKey.LICENSE,
+      value: licenseData,
+    });
+
+    return licenseData;
   }
 
   async handleUserSyncUsage(): Promise<JobStatus> {