make sid and sub optional again

island-is · Jan 17, 2025 · 25363b4 · 25363b4
1 parent 9587a64
commit 25363b4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 29 deletions.
diff --git a/libs/api/domains/license-service/src/lib/licenseService.service.ts b/libs/api/domains/license-service/src/lib/licenseService.service.ts
@@ -484,20 +484,23 @@ export class LicenseService {
     const licenseType = this.mapLicenseType(genericUserLicenseType)
     const client = await this.getClient<typeof licenseType>(licenseType)
 
-    const barcodeSessionKey = this.getBarcodeSessionKey(licenseType, user.sub)
-    const activeBarcodeSession = await this.barcodeService.getSessionCache(barcodeSessionKey)
-
-    if (activeBarcodeSession && activeBarcodeSession !== user.sid) {
-      // If the user has an active session for the license type, we should not create a new barcode
-      this.logger.info(
-        `User has an active session for license: ${licenseType}`,
-      )
+      const barcodeSessionKey = user.sub ? this.getBarcodeSessionKey(licenseType, user.sub) : undefined
+    if (barcodeSessionKey) {
+      const activeBarcodeSession = await this.barcodeService.getSessionCache(barcodeSessionKey)
+
+      if (activeBarcodeSession && activeBarcodeSession !== user.sid) {
+        // If the user has an active session for the license type, we should not create a new barcode
+        this.logger.info(
+          `User has an active session for license: ${licenseType}`,
+        )
 
-      throw new ProblemError({
-        type: ProblemType.BAD_SUBJECT,
-        title: `User has an active session for license type: ${licenseType}`,
-      })
+        throw new ProblemError({
+          type: ProblemType.BAD_SUBJECT,
+          title: `User has an active session for license type: ${licenseType}`,
+        })
+      }
     }
+
     if (
       genericUserLicense.license.pkpassStatus !==
       GenericUserLicensePkPassStatus.Available
@@ -538,7 +541,7 @@ export class LicenseService {
         licenseType,
         extraData,
       }),
-      this.barcodeService.setSessionCache(barcodeSessionKey, user.sid),
+      barcodeSessionKey && user.sid && this.barcodeService.setSessionCache(barcodeSessionKey, user.sid),
     ])
 
     return tokenPayload

diff --git a/libs/auth-nest-tools/src/lib/auth.ts b/libs/auth-nest-tools/src/lib/auth.ts
@@ -6,8 +6,8 @@ import {
 } from '@island.is/shared/types'
 
 export interface Auth {
-  sub: string
-  sid: string
+  sub?: string
+  sid?: string
   nationalId?: string
   scope: string[]
   authorization: string

diff --git a/libs/auth-nest-tools/src/lib/jwt.payload.ts b/libs/auth-nest-tools/src/lib/jwt.payload.ts
@@ -9,8 +9,8 @@ export interface JwtAct {
 }
 
 export interface JwtPayload {
-  sub: string
-  sid: string
+  sub?: string
+  sid?: string
   nationalId?: string
   scope: string | string[]
   client_id: string

diff --git a/libs/auth-nest-tools/src/lib/jwt.strategy.spec.ts b/libs/auth-nest-tools/src/lib/jwt.strategy.spec.ts
@@ -80,8 +80,6 @@ describe('JwtStrategy#validate', () => {
       nationalId: '1234567890',
       scope: ['test-scope-1'],
       client_id: 'test-client',
-      sub: 'sub',
-      sid: 'sid',
       delegationType: [AuthDelegationType.Custom],
       actor: {
         nationalId: '1234565555',
@@ -124,8 +122,6 @@ describe('JwtStrategy#validate', () => {
       nationalId: '1234567890',
       scope: ['test-scope-1'],
       client_id: 'test-client',
-      sid: 'sid',
-      sub: 'sub',
     }
     const request = {
       headers: {
@@ -155,8 +151,6 @@ describe('JwtStrategy#validate', () => {
         nationalId: '1234564321',
         scope: ['test-scope-2'],
       },
-      sid: 'sid',
-      sub: 'sub',
     }
 
     // Act
@@ -178,16 +172,12 @@ describe('JwtStrategy#validate', () => {
       scope: ['test-scope-1'],
       client_id: 'test-client',
       client_nationalId: '1234565555',
-      sid: 'sid',
-      sub: 'sub',
     }
 
     const personPayload: JwtPayload = {
       scope: ['test-scope-1'],
       client_id: 'test-client',
       nationalId: '1234567890',
-      sub: 'sub',
-      sid: 'sid',
     }
 
     // Act

diff --git a/libs/auth-nest-tools/src/lib/mock-auth.guard.ts b/libs/auth-nest-tools/src/lib/mock-auth.guard.ts
@@ -12,8 +12,6 @@ export class MockAuthGuard implements CanActivate {
     this.auth = {
       nationalId: '0101302989',
       authorization: '',
-      sid: '',
-      sub: '',
       client: 'mock',
       scope: [],
       ...auth,