Update process lifetime for connect

incorbador · incorbador · commit bad28fdf15a8 · 2024-12-17T14:39:00.000+01:00
diff --git a/packages/web-core/src/models/connect/connectProcess.ts b/packages/web-core/src/models/connect/connectProcess.ts
@@ -6,89 +6,111 @@ export class ConnectProcess {
   readonly id: string;
   readonly projectId: string;
   readonly frontendApiUrl: string;
-  readonly expiresAt: number;
   readonly loginData: ConnectLoginInitData | null;
   readonly appendData: ConnectAppendInitData | null;
   readonly manageData: ConnectManageInitData | null;
 
   constructor(
     id: string,
     projectId: string,
-    expiresAt: number,
     frontendApiUrl: string,
     loginData: ConnectLoginInitData | null,
     appendData: ConnectAppendInitData | null,
     manageData: ConnectManageInitData | null,
   ) {
     this.id = id;
     this.projectId = projectId;
-    this.expiresAt = expiresAt;
     this.frontendApiUrl = frontendApiUrl;
     this.loginData = loginData;
     this.appendData = appendData;
     this.manageData = manageData;
   }
 
   isValid(): boolean {
-    return this.expiresAt > Date.now() / 1000 + 10;
+    return true;
   }
 
   resetLoginData(): ConnectProcess {
-    return new ConnectProcess(
-      this.id,
-      this.projectId,
-      this.expiresAt,
-      this.frontendApiUrl,
-      null,
-      this.appendData,
-      this.manageData,
-    );
+    return new ConnectProcess(this.id, this.projectId, this.frontendApiUrl, null, this.appendData, this.manageData);
   }
 
-  copyWithLoginData(loginData: ConnectLoginInitData, expiresAt: number): ConnectProcess {
+  copyWithLoginData(loginData: ConnectLoginInitData): ConnectProcess {
     return new ConnectProcess(
       this.id,
       this.projectId,
-      expiresAt,
       this.frontendApiUrl,
       loginData,
       this.appendData,
       this.manageData,
     );
   }
 
-  copyWithAppendData(appendData: ConnectAppendInitData, expiresAt: number): ConnectProcess {
+  copyWithAppendData(appendData: ConnectAppendInitData): ConnectProcess {
     return new ConnectProcess(
       this.id,
       this.projectId,
-      expiresAt,
       this.frontendApiUrl,
       this.loginData,
       appendData,
       this.manageData,
     );
   }
 
-  copyWithManageData(manageData: ConnectManageInitData, expiresAt: number): ConnectProcess {
+  copyWithManageData(manageData: ConnectManageInitData): ConnectProcess {
     return new ConnectProcess(
       this.id,
       this.projectId,
-      expiresAt,
       this.frontendApiUrl,
       this.loginData,
       this.appendData,
       manageData,
     );
   }
 
+  getValidLoginData(): ConnectLoginInitData | undefined {
+    if (!this.loginData || !this.loginData.expiresAt) {
+      return;
+    }
+
+    if (this.loginData.expiresAt < Date.now()) {
+      return;
+    }
+
+    return this.loginData;
+  }
+
+  getValidAppendData(): ConnectAppendInitData | undefined {
+    if (!this.appendData || !this.appendData.expiresAt) {
+      return;
+    }
+
+    if (this.appendData.expiresAt < Date.now()) {
+      return;
+    }
+
+    return this.appendData;
+  }
+
+  getValidManageData(): ConnectManageInitData | undefined {
+    if (!this.manageData || !this.manageData.expiresAt) {
+      return;
+    }
+
+    if (this.manageData.expiresAt < Date.now()) {
+      return;
+    }
+
+    return this.manageData;
+  }
+
   static loadFromStorage(projectId: string): ConnectProcess | undefined {
     const serialized = localStorage.getItem(getStorageKey(projectId));
     if (!serialized) {
       return undefined;
     }
 
-    const { id, expiresAt, frontendApiUrl, loginData, appendData, manageData } = JSON.parse(serialized);
-    const process = new ConnectProcess(id, projectId, expiresAt, frontendApiUrl, loginData, appendData, manageData);
+    const { id, frontendApiUrl, loginData, appendData, manageData } = JSON.parse(serialized);
+    const process = new ConnectProcess(id, projectId, frontendApiUrl, loginData, appendData, manageData);
     if (!process.isValid()) {
       return undefined;
     }
@@ -101,7 +123,6 @@ export class ConnectProcess {
       getStorageKey(this.projectId),
       JSON.stringify({
         id: this.id,
-        expiresAt: this.expiresAt,
         frontendApiUrl: this.frontendApiUrl,
         loginData: this.loginData,
         appendData: this.appendData,
diff --git a/packages/web-core/src/models/connect/login.ts b/packages/web-core/src/models/connect/login.ts
@@ -4,16 +4,19 @@ export type ConnectLoginInitData = {
   loginAllowed: boolean;
   conditionalUIChallenge: string | null;
   flags: Record<string, string>;
+  expiresAt?: number;
 };
 
 export interface ConnectAppendInitData {
   appendAllowed: boolean;
   flags: Record<string, string>;
+  expiresAt?: number;
 }
 
 export interface ConnectManageInitData {
   manageAllowed: boolean;
   flags: Record<string, string>;
+  expiresAt?: number;
 }
 
 export interface ConnectManageListData {
diff --git a/packages/web-core/src/services/ConnectService.ts b/packages/web-core/src/services/ConnectService.ts
@@ -22,7 +22,6 @@ import type {
   ConnectManageListRsp,
 } from '../api/v2';
 import { CorbadoConnectApi, PasskeyEventType } from '../api/v2';
-import type { AuthProcess } from '../models/authProcess';
 import { ConnectFlags } from '../models/connect/connectFlags';
 import { ConnectInvitation } from '../models/connect/connectInvitation';
 import { ConnectLastLogin } from '../models/connect/connectLastLogin';
@@ -93,7 +92,7 @@ export class ConnectService {
     return out;
   }
 
-  #setApisV2(process?: AuthProcess): void {
+  #setApisV2(process?: ConnectProcess): void {
     let frontendApiUrl = this.#getDefaultFrontendApiUrl();
     if (process?.frontendApiUrl && process?.frontendApiUrl.length > 0) {
       frontendApiUrl = process.frontendApiUrl;
@@ -124,9 +123,11 @@ export class ConnectService {
 
   async loginInit(abortController: AbortController): Promise<Result<ConnectLoginInitData, CorbadoError>> {
     const existingProcess = ConnectProcess.loadFromStorage(this.#projectId);
+    const maybeLoginData = existingProcess?.getValidLoginData();
     if (
-      existingProcess?.loginData &&
-      !existingProcess?.loginData.loginAllowed &&
+      existingProcess &&
+      maybeLoginData &&
+      !maybeLoginData.loginAllowed &&
       ConnectInvitation.loadFromStorage()?.token
     ) {
       existingProcess.resetLoginData().persistToStorage();
@@ -135,8 +136,8 @@ export class ConnectService {
       this.#setApisV2(existingProcess);
 
       // process has already been initialized
-      if (existingProcess?.loginData) {
-        return Ok(existingProcess.loginData);
+      if (maybeLoginData) {
+        return Ok(maybeLoginData);
       }
     }
 
@@ -168,20 +169,24 @@ export class ConnectService {
       loginAllowed: res.val.loginAllowed,
       conditionalUIChallenge: res.val.conditionalUIChallenge ?? null,
       flags: flags.getItemsObject(),
+      expiresAt: res.val.expiresAt,
     };
 
-    // update local state
-    const newProcess = new ConnectProcess(
-      res.val.token,
-      this.#projectId,
-      res.val.expiresAt,
-      res.val.frontendApiUrl,
-      loginData,
-      null,
-      null,
-    );
-    this.#setApisV2(newProcess);
-    newProcess.persistToStorage();
+    if (existingProcess && existingProcess.id === res.val.token) {
+      const p = existingProcess.copyWithLoginData(loginData);
+      p.persistToStorage();
+    } else {
+      const newProcess = new ConnectProcess(
+        res.val.token,
+        this.#projectId,
+        res.val.frontendApiUrl,
+        loginData,
+        null,
+        null,
+      );
+      this.#setApisV2(newProcess);
+      newProcess.persistToStorage();
+    }
 
     // persist flags
     flags.persistToStorage(this.#projectId);
@@ -192,7 +197,7 @@ export class ConnectService {
   async #getExistingProcess(generator: () => Promise<Result<unknown, CorbadoError>>): Promise<ConnectProcess | null> {
     const existingProcess = ConnectProcess.loadFromStorage(this.#projectId);
     if (existingProcess) {
-      log.debug('process found', existingProcess.expiresAt);
+      log.debug('process found');
       return existingProcess;
     }
 
@@ -287,8 +292,9 @@ export class ConnectService {
       this.#setApisV2(existingProcess);
 
       // process has already been initialized
-      if (existingProcess?.appendData) {
-        return Ok(existingProcess.appendData);
+      const maybeAppendData = existingProcess?.getValidAppendData();
+      if (maybeAppendData) {
+        return Ok(maybeAppendData);
       }
     }
 
@@ -311,17 +317,17 @@ export class ConnectService {
     const appendData: ConnectAppendInitData = {
       appendAllowed: res.val.appendAllowed,
       flags: flags.getItemsObject(),
+      expiresAt: res.val.expiresAt,
     };
 
     // update local state with process
-    if (existingProcess) {
-      const p = existingProcess.copyWithAppendData(appendData, res.val.expiresAt);
+    if (existingProcess && existingProcess.id === res.val.processID) {
+      const p = existingProcess.copyWithAppendData(appendData);
       p.persistToStorage();
     } else {
       const newProcess = new ConnectProcess(
         res.val.processID,
         this.#projectId,
-        res.val.expiresAt,
         res.val.frontendApiUrl,
         null,
         appendData,
@@ -435,8 +441,9 @@ export class ConnectService {
       this.#setApisV2(existingProcess);
 
       // process has already been initialized
-      if (existingProcess?.manageData) {
-        return Ok(existingProcess.manageData);
+      const maybeManageData = existingProcess?.getValidManageData();
+      if (maybeManageData) {
+        return Ok(maybeManageData);
       }
     }
 
@@ -459,17 +466,17 @@ export class ConnectService {
     const manageData: ConnectManageInitData = {
       manageAllowed: res.val.manageAllowed,
       flags: flags.getItemsObject(),
+      expiresAt: res.val.expiresAt,
     };
 
     // update local state with process
-    if (existingProcess) {
-      const p = existingProcess.copyWithManageData(manageData, res.val.expiresAt);
+    if (existingProcess && existingProcess.id === res.val.processID) {
+      const p = existingProcess.copyWithManageData(manageData);
       p.persistToStorage();
     } else {
       const newProcess = new ConnectProcess(
         res.val.processID,
         this.#projectId,
-        res.val.expiresAt,
         res.val.frontendApiUrl,
         null,
         null,
