Merge pull request #362 from stevermeister/development

feat(ssr-cookie): implement improved cookie retrieval from request

Author: pavankjadda

projects/ngx-cookie-service-ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ngx-cookie-service-ssr",
   "description": "Angular SSR cookie service",
-  "version": "20.0.0",
+  "version": "20.1.0",
   "license": "MIT",
   "author": "Stepan Suvorov <[email protected]>",
   "keywords": [

projects/ngx-cookie-service-ssr/src/lib/ssr-cookie.service.ts

@@ -1,5 +1,5 @@
 import { isPlatformBrowser } from '@angular/common';
-import { inject, Injectable, PLATFORM_ID, REQUEST, DOCUMENT } from '@angular/core';
+import { DOCUMENT, inject, Injectable, PLATFORM_ID, REQUEST } from '@angular/core';
 import { SameSite } from 'ngx-cookie-service';
 
 @Injectable({
@@ -11,6 +11,35 @@ export class SsrCookieService {
   private readonly request = inject(REQUEST, { optional: true });
   private readonly documentIsAccessible: boolean = isPlatformBrowser(this.platformId);
 
+  /**
+   * Helper method to safely get cookies from request object
+   * Handles both Angular's REQUEST interface and Express's req interface
+   */
+  private getRequestCookies(): string | null {
+    if (!this.request) {
+      return null;
+    }
+
+    // Handle Angular REQUEST object (has headers.get method)
+    if (this.request.headers && typeof this.request.headers.get === 'function') {
+      return this.request.headers.get('cookie');
+    }
+
+    // Handle Express request object (has headers object and get method)
+    const reqAny = this.request as any;
+    if (typeof reqAny.get === 'function') {
+      return reqAny.get('cookie') || reqAny.get('Cookie');
+    }
+
+    // Handle direct headers object access
+    const headers = this.request.headers as any;
+    if (headers && headers != null && typeof headers === 'object') {
+      return headers['cookie'] || headers['Cookie'];
+    }
+
+    return null;
+  }
+
   /**
    * Get cookie Regular Expression
    *
@@ -57,7 +86,7 @@ export class SsrCookieService {
   check(name: string): boolean {
     name = encodeURIComponent(name);
     const regExp: RegExp = SsrCookieService.getCookieRegExp(name);
-    return regExp.test(this.documentIsAccessible ? this.document.cookie : this.request?.headers.get('cookie'));
+    return regExp.test(this.documentIsAccessible ? this.document.cookie : this.getRequestCookies());
   }
 
   /**
@@ -73,7 +102,7 @@ export class SsrCookieService {
     if (this.check(name)) {
       name = encodeURIComponent(name);
       const regExp: RegExp = SsrCookieService.getCookieRegExp(name);
-      const result = regExp.exec(this.documentIsAccessible ? this.document.cookie : this.request?.headers.get('cookie'));
+      const result = regExp.exec(this.documentIsAccessible ? this.document.cookie : this.getRequestCookies());
       return result?.[1] ? SsrCookieService.safeDecodeURIComponent(result[1]) : '';
     }
     return '';
@@ -89,7 +118,7 @@ export class SsrCookieService {
    */
   getAll(): { [key: string]: string } {
     const cookies: { [key: string]: string } = {};
-    const cookieString: any = this.documentIsAccessible ? this.document?.cookie : this.request?.headers.get('cookie');
+    const cookieString: any = this.documentIsAccessible ? this.document?.cookie : this.getRequestCookies();
 
     if (cookieString && cookieString !== '') {
       cookieString.split(';').forEach((currentCookie: string) => {

projects/ngx-cookie-service/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ngx-cookie-service",
   "description": "Angular cookie service",
-  "version": "20.0.0",
+  "version": "20.1.0",
   "license": "MIT",
   "author": "Stepan Suvorov <[email protected]>",
   "keywords": [

server-example.ts

@@ -7,25 +7,22 @@
     "esModuleInterop": true,
     "declaration": false,
     "experimentalDecorators": true,
-    "module": "es2020",
+    "module": "ES2022",
     "moduleResolution": "bundler",
     "importHelpers": true,
     "target": "ES2022",
     "typeRoots": [
       "node_modules/@types"
     ],
     "lib": [
-      "es2020",
+      "ES2022",
       "dom"
     ],
     "paths": {
       "ngx-cookie-service": [
         "dist/ngx-cookie-service/ngx-cookie-service",
         "dist/ngx-cookie-service"
       ],
-      "ngx-cookie-service-ssr": [
-        "dist/ngx-cookie-service-ssr"
-      ]
     },
     "useDefineForClassFields": false
   },