wip

packages/infrastructure/adapters/automation/auth/SessionCookieStore.ts

@@ -277,14 +277,13 @@ export class SessionCookieStore {
   validateCookieConfiguration(targetUrl: string): Result<Cookie[]> {
     try {
       if (!this.cachedState || this.cachedState.cookies.length === 0) {
-        return Result.err('No cookies found in session store');
+        return Result.err<Cookie[]>(new Error('No cookies found in session store'));
       }
 
-      const result = this.validateCookiesForUrl(this.cachedState.cookies, targetUrl, true);
-      return result;
+      return this.validateCookiesForUrl(this.cachedState.cookies, targetUrl, true);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      return Result.err(`Cookie validation failed: ${message}`);
+      return Result.err<Cookie[]>(new Error(`Cookie validation failed: ${message}`));
     }
   }
 
@@ -299,62 +298,57 @@ export class SessionCookieStore {
     requireAuthCookies = false
   ): Result<Cookie[]> {
     try {
-      // Validate each cookie's domain/path
       const validatedCookies: Cookie[] = [];
-      let firstValidationError: string | null = null;
+      let firstValidationError: Error | null = null;
 
       for (const cookie of cookies) {
         try {
           new CookieConfiguration(cookie, targetUrl);
           validatedCookies.push(cookie);
         } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          
-          // Capture first validation error to return if all cookies fail
+          const err = error instanceof Error ? error : new Error(String(error));
+
           if (!firstValidationError) {
-            firstValidationError = message;
+            firstValidationError = err;
           }
-          
+
           this.logger?.warn('Cookie validation failed', {
             name: cookie.name,
-            error: message,
+            error: err.message,
           });
-          // Skip invalid cookie, continue with others
         }
       }
 
       if (validatedCookies.length === 0) {
-        // Return the specific validation error from the first failed cookie
-        return Result.err(firstValidationError || 'No valid cookies found for target URL');
+        return Result.err<Cookie[]>(
+          firstValidationError ?? new Error('No valid cookies found for target URL')
+        );
       }
 
-      // Check required cookies only if requested (for authentication validation)
       if (requireAuthCookies) {
         const cookieNames = validatedCookies.map((c) => c.name.toLowerCase());
-        
-        // Check for irsso_members
+
         const hasIrssoMembers = cookieNames.some((name) =>
           name.includes('irsso_members') || name.includes('irsso')
         );
-        
-        // Check for authtoken_members
+
         const hasAuthtokenMembers = cookieNames.some((name) =>
           name.includes('authtoken_members') || name.includes('authtoken')
         );
-        
+
         if (!hasIrssoMembers) {
-          return Result.err('Required cookie missing: irsso_members');
+          return Result.err<Cookie[]>(new Error('Required cookie missing: irsso_members'));
         }
-        
+
         if (!hasAuthtokenMembers) {
-          return Result.err('Required cookie missing: authtoken_members');
+          return Result.err<Cookie[]>(new Error('Required cookie missing: authtoken_members'));
         }
       }
 
-      return Result.ok(validatedCookies);
+      return Result.ok<Cookie[]>(validatedCookies);
     } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      return Result.err(`Cookie validation failed: ${message}`);
+      const err = error instanceof Error ? error : new Error(String(error));
+      return Result.err<Cookie[]>(new Error(`Cookie validation failed: ${err.message}`));
     }
   }