@tramvai/module-cookie 1.90.2 → 1.91.0

package/lib/browser.js

@@ -1,5 +1,6 @@
 import { __decorate } from 'tslib';
 import { Module, Scope } from '@tramvai/core';
+import { ClientHintsModule, USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
 import { Cookies } from '@tinkoff/browser-cookies';
 import { COOKIE_MANAGER_TOKEN } from '@tramvai/tokens-cookie';
 export { COOKIE_MANAGER_TOKEN } from '@tramvai/tokens-cookie';
@@ -26,6 +27,13 @@ const trimSubdomains = (host) => {
     }
     return trimPort(host.indexOf('localhost') >= 0 ? host : `.${host.split('.').slice(-2).join('.')}`);
 };
+const prepareCookieOptions = ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }, { sameSite, noSubdomains, ...options }) => ({
+    ...options,
+    ...(sameSite === 'none' && (!sameSiteNoneCompatible || !secureProtocol) ? {} : { sameSite }),
+    ...(secureProtocol && sameSite === 'none' && sameSiteNoneCompatible ? { secure: true } : {}),
+    expires: calculateExpires(options.expires),
+    domain: noSubdomains ? trimSubdomains(options.domain || defaultHost) : options.domain,
+});
 
 const checkCookieEnabled = () => {
     const testCookieName = 'testcookiesenabled';
@@ -54,29 +62,28 @@ class CookiesFallback {
     }
 }
 class CookieManager {
-    constructor({ cookieOptions = {} } = {}) {
+    constructor({ cookieOptions = {}, userAgent, }) {
         const isSecure = window.location.protocol === 'https:';
         this.cookies = checkCookieEnabled()
             ? new Cookies({
-                sameSite: isSecure ? 'none' : 'lax',
+                sameSite: userAgent.sameSiteNoneCompatible && isSecure ? 'none' : 'lax',
                 secure: isSecure,
                 ...cookieOptions,
             })
             : new CookiesFallback();
+        this.userAgent = userAgent;
     }
     // eslint-disable-next-line class-methods-use-this
     get(name) {
         return this.cookies.get(name) || undefined;
     }
     // eslint-disable-next-line class-methods-use-this
-    set({ name, value, noSubdomains, ...options }) {
-        this.cookies.set(name, value, {
-            ...options,
-            expires: calculateExpires(options.expires),
-            domain: noSubdomains
-                ? trimSubdomains(options.domain || window.location.hostname)
-                : options.domain,
-        });
+    set({ name, value, ...options }) {
+        this.cookies.set(name, value, prepareCookieOptions({
+            userAgent: this.userAgent,
+            defaultHost: window.location.hostname,
+            secureProtocol: window.location.protocol === 'https:',
+        }, options));
     }
     // eslint-disable-next-line class-methods-use-this
     all() {
@@ -92,6 +99,7 @@ let CookieModule = class CookieModule {
 };
 CookieModule = __decorate([
     Module({
+        imports: [ClientHintsModule],
         providers: [
             {
                 // Управление куками в приложении
@@ -106,6 +114,7 @@ CookieModule = __decorate([
                         token: 'temporary cookieOptions',
                         optional: true,
                     },
+                    userAgent: USER_AGENT_TOKEN,
                 },
             },
         ],

package/lib/cookieManager.browser.d.ts

@@ -1,12 +1,15 @@
 import type { CookieOptions } from '@tinkoff/browser-cookies';
+import type { USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
 import type { CookieManager as Interface, CookieSetOptions } from './tokens';
 export declare class CookieManager implements Interface {
     private cookies;
-    constructor({ cookieOptions }?: {
+    private userAgent;
+    constructor({ cookieOptions, userAgent, }: {
         cookieOptions?: CookieOptions;
+        userAgent: typeof USER_AGENT_TOKEN;
     });
     get(name: string): string;
-    set({ name, value, noSubdomains, ...options }: CookieSetOptions): void;
+    set({ name, value, ...options }: CookieSetOptions): void;
     all(): {
         [key: string]: string;
     };

package/lib/cookieManager.server.d.ts

@@ -1,15 +1,18 @@
 import type { REQUEST_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import type { USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
 import type { CookieManager as Interface, CookieOptions, CookieSetOptions } from './tokens';
 export declare class CookieManager implements Interface {
     private cookies;
     private requestManager;
     private responseManager;
-    constructor({ requestManager, responseManager, }: {
+    private userAgent;
+    constructor({ requestManager, responseManager, userAgent, }: {
         requestManager: typeof REQUEST_MANAGER_TOKEN;
         responseManager: typeof RESPONSE_MANAGER_TOKEN;
+        userAgent: typeof USER_AGENT_TOKEN;
     });
     get(name: any): string;
-    set({ name, value, noSubdomains, ...options }: CookieSetOptions): void;
+    set({ name, value, ...options }: CookieSetOptions): void;
     all(): Record<string, string>;
     remove(name: string, options?: CookieOptions): void;
 }

package/lib/server.es.js

@@ -1,6 +1,7 @@
 import { __decorate } from 'tslib';
 import { Module, Scope } from '@tramvai/core';
 import { REQUEST_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import { ClientHintsModule, USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
 import { serialize } from 'cookie';
 import { COOKIE_MANAGER_TOKEN } from '@tramvai/tokens-cookie';
 export { COOKIE_MANAGER_TOKEN } from '@tramvai/tokens-cookie';
@@ -27,25 +28,30 @@ const trimSubdomains = (host) => {
     }
     return trimPort(host.indexOf('localhost') >= 0 ? host : `.${host.split('.').slice(-2).join('.')}`);
 };
+const prepareCookieOptions = ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }, { sameSite, noSubdomains, ...options }) => ({
+    ...options,
+    ...(sameSite === 'none' && (!sameSiteNoneCompatible || !secureProtocol) ? {} : { sameSite }),
+    ...(secureProtocol && sameSite === 'none' && sameSiteNoneCompatible ? { secure: true } : {}),
+    expires: calculateExpires(options.expires),
+    domain: noSubdomains ? trimSubdomains(options.domain || defaultHost) : options.domain,
+});
 
 class CookieManager {
-    constructor({ requestManager, responseManager, }) {
+    constructor({ requestManager, responseManager, userAgent, }) {
         this.requestManager = requestManager;
         this.responseManager = responseManager;
+        this.userAgent = userAgent;
         this.cookies = { ...requestManager.getCookies() };
     }
     get(name) {
         return this.cookies[name];
     }
-    set({ name, value, noSubdomains, ...options }) {
-        this.responseManager.setCookie(name, serialize(name, value, {
-            path: '/',
-            ...options,
-            expires: calculateExpires(options.expires),
-            domain: noSubdomains
-                ? trimSubdomains(options.domain || this.requestManager.getHost())
-                : options.domain,
-        }));
+    set({ name, value, ...options }) {
+        this.responseManager.setCookie(name, serialize(name, value, prepareCookieOptions({
+            userAgent: this.userAgent,
+            defaultHost: this.requestManager.getHost(),
+            secureProtocol: this.requestManager.getUrl().startsWith('https:'),
+        }, { path: '/', ...options })));
         // Записываем в cookie request, так как эти данные могут дальше читаться и использоваться
         this.cookies[name] = value;
     }
@@ -62,6 +68,7 @@ let CookieModule = class CookieModule {
 };
 CookieModule = __decorate([
     Module({
+        imports: [ClientHintsModule],
         providers: [
             {
                 // Управление куками в приложении
@@ -71,6 +78,7 @@ CookieModule = __decorate([
                 deps: {
                     requestManager: REQUEST_MANAGER_TOKEN,
                     responseManager: RESPONSE_MANAGER_TOKEN,
+                    userAgent: USER_AGENT_TOKEN,
                 },
             },
         ],

package/lib/server.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
+var moduleClientHints = require('@tramvai/module-client-hints');
 var cookie = require('cookie');
 var tokensCookie = require('@tramvai/tokens-cookie');
 
@@ -30,25 +31,30 @@ const trimSubdomains = (host) => {
     }
     return trimPort(host.indexOf('localhost') >= 0 ? host : `.${host.split('.').slice(-2).join('.')}`);
 };
+const prepareCookieOptions = ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }, { sameSite, noSubdomains, ...options }) => ({
+    ...options,
+    ...(sameSite === 'none' && (!sameSiteNoneCompatible || !secureProtocol) ? {} : { sameSite }),
+    ...(secureProtocol && sameSite === 'none' && sameSiteNoneCompatible ? { secure: true } : {}),
+    expires: calculateExpires(options.expires),
+    domain: noSubdomains ? trimSubdomains(options.domain || defaultHost) : options.domain,
+});
 
 class CookieManager {
-    constructor({ requestManager, responseManager, }) {
+    constructor({ requestManager, responseManager, userAgent, }) {
         this.requestManager = requestManager;
         this.responseManager = responseManager;
+        this.userAgent = userAgent;
         this.cookies = { ...requestManager.getCookies() };
     }
     get(name) {
         return this.cookies[name];
     }
-    set({ name, value, noSubdomains, ...options }) {
-        this.responseManager.setCookie(name, cookie.serialize(name, value, {
-            path: '/',
-            ...options,
-            expires: calculateExpires(options.expires),
-            domain: noSubdomains
-                ? trimSubdomains(options.domain || this.requestManager.getHost())
-                : options.domain,
-        }));
+    set({ name, value, ...options }) {
+        this.responseManager.setCookie(name, cookie.serialize(name, value, prepareCookieOptions({
+            userAgent: this.userAgent,
+            defaultHost: this.requestManager.getHost(),
+            secureProtocol: this.requestManager.getUrl().startsWith('https:'),
+        }, { path: '/', ...options })));
         // Записываем в cookie request, так как эти данные могут дальше читаться и использоваться
         this.cookies[name] = value;
     }
@@ -65,6 +71,7 @@ exports.CookieModule = class CookieModule {
 };
 exports.CookieModule = tslib.__decorate([
     core.Module({
+        imports: [moduleClientHints.ClientHintsModule],
         providers: [
             {
                 // Управление куками в приложении
@@ -74,6 +81,7 @@ exports.CookieModule = tslib.__decorate([
                 deps: {
                     requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
                     responseManager: tokensCommon.RESPONSE_MANAGER_TOKEN,
+                    userAgent: moduleClientHints.USER_AGENT_TOKEN,
                 },
             },
         ],

package/lib/utils.d.ts

@@ -1,2 +1,18 @@
+import type { USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
+import type { CookieOptions } from './tokens';
 export declare const calculateExpires: (expires?: number | string | Date) => Date;
 export declare const trimSubdomains: (host: string) => string;
+declare type PrepareOptions = {
+    userAgent: typeof USER_AGENT_TOKEN;
+    defaultHost: string;
+    secureProtocol: boolean;
+};
+export declare const prepareCookieOptions: ({ userAgent: { sameSiteNoneCompatible }, defaultHost, secureProtocol }: PrepareOptions, { sameSite, noSubdomains, ...options }: CookieOptions) => {
+    expires: Date;
+    domain: string;
+    secure?: boolean;
+    sameSite?: boolean | "lax" | "strict" | "none";
+    path?: string;
+    httpOnly?: boolean;
+};
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-cookie",
-  "version": "1.90.2",
+  "version": "1.91.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -20,14 +20,15 @@
   },
   "dependencies": {
     "@tinkoff/browser-cookies": "1.4.2",
-    "@tramvai/tokens-cookie": "1.90.2",
+    "@tramvai/tokens-cookie": "1.91.0",
+    "@tramvai/module-client-hints": "1.91.0",
     "cookie": "^0.4.0"
   },
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "1.90.2",
-    "@tramvai/state": "1.90.2",
-    "@tramvai/tokens-common": "1.90.2",
+    "@tramvai/core": "1.91.0",
+    "@tramvai/state": "1.91.0",
+    "@tramvai/tokens-common": "1.91.0",
     "@tinkoff/dippy": "0.7.39",
     "tslib": "^2.0.3"
   },