ngx-cookie-service - npm Package Compare versions

Comparing version 10.0.1 to 10.1.1

bundles/ngx-cookie-service.umd.js

@@ -367,41 +367,46 @@ (function (global, factory) {
         };
-        /**
-         * @param name     Cookie name
-         * @param value    Cookie value
-         * @param expires  Number of days until the cookies expires or an actual `Date`
-         * @param path     Cookie path
-         * @param domain   Cookie domain
-         * @param secure   Secure flag
-         * @param sameSite OWASP samesite token `Lax`, `None`, or `Strict`. Defaults to `Lax`
-         */
-        CookieService.prototype.set = function (name, value, expires, path, domain, secure, sameSite) {
-            if (sameSite === void 0) { sameSite = 'Lax'; }
+        CookieService.prototype.set = function (name, value, expiresOrOptions, path, domain, secure, sameSite) {
             if (!this.documentIsAccessible) {
                 return;
             }
+            if (typeof expiresOrOptions === 'number' || expiresOrOptions instanceof Date || path || domain || secure || sameSite) {
+                var optionsBody = {
+                    expires: expiresOrOptions,
+                    path: path,
+                    domain: domain,
+                    secure: secure,
+                    sameSite: sameSite ? sameSite : 'Lax',
+                };
+                this.set(name, value, optionsBody);
+                return;
+            }
             var cookieString = encodeURIComponent(name) + '=' + encodeURIComponent(value) + ';';
-            if (expires) {
-                if (typeof expires === 'number') {
-                    var dateExpires = new Date(new Date().getTime() + expires * 1000 * 60 * 60 * 24);
+            var options = expiresOrOptions ? expiresOrOptions : {};
+            if (options.expires) {
+                if (typeof options.expires === 'number') {
+                    var dateExpires = new Date(new Date().getTime() + options.expires * 1000 * 60 * 60 * 24);
                     cookieString += 'expires=' + dateExpires.toUTCString() + ';';
                 }
                 else {
-                    cookieString += 'expires=' + expires.toUTCString() + ';';
+                    cookieString += 'expires=' + options.expires.toUTCString() + ';';
                 }
             }
-            if (path) {
-                cookieString += 'path=' + path + ';';
+            if (options.path) {
+                cookieString += 'path=' + options.path + ';';
             }
-            if (domain) {
-                cookieString += 'domain=' + domain + ';';
+            if (options.domain) {
+                cookieString += 'domain=' + options.domain + ';';
             }
-            if (secure === false && sameSite === 'None') {
-                secure = true;
+            if (options.secure === false && options.sameSite === 'None') {
+                options.secure = true;
                 console.warn("[ngx-cookie-service] Cookie " + name + " was forced with secure flag because sameSite=None." +
                     "More details : https://github.com/stevermeister/ngx-cookie-service/issues/86#issuecomment-597720130");
             }
-            if (secure) {
+            if (options.secure) {
                 cookieString += 'secure;';
             }
-            cookieString += 'sameSite=' + sameSite + ';';
+            if (!options.sameSite) {
+                options.sameSite = 'Lax';
+            }
+            cookieString += 'sameSite=' + options.sameSite + ';';
             this.document.cookie = cookieString;
@@ -419,3 +424,4 @@ };
             }
-            this.set(name, '', new Date('Thu, 01 Jan 1970 00:00:01 GMT'), path, domain, secure, sameSite);
+            var expiresDate = new Date('Thu, 01 Jan 1970 00:00:01 GMT');
+            this.set(name, '', { expires: expiresDate, path: path, domain: domain, secure: secure, sameSite: sameSite });
         };
@@ -422,0 +428,0 @@ /**

bundles/ngx-cookie-service.umd.min.js

@@ -15,3 +15,3 @@ !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("@angular/core"),require("@angular/common")):"function"==typeof define&&define.amd?define("ngx-cookie-service",["exports","@angular/core","@angular/common"],t):t((e=e||self)["ngx-cookie-service"]={},e.ng.core,e.ng.common)}(this,(function(e,t,o){"use strict";
     PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */Object.create;function n(e,t){var o="function"==typeof Symbol&&e[Symbol.iterator];if(!o)return e;var n,r,i=o.call(e),c=[];try{for(;(void 0===t||t-- >0)&&!(n=i.next()).done;)c.push(n.value)}catch(e){r={error:e}}finally{try{n&&!n.done&&(o=i.return)&&o.call(i)}finally{if(r)throw r.error}}return c}Object.create;var r=function(){function e(e,t){this.document=e,this.platformId=t,this.documentIsAccessible=o.isPlatformBrowser(this.platformId)}return e.prototype.check=function(e){return!!this.documentIsAccessible&&(e=encodeURIComponent(e),this.getCookieRegExp(e).test(this.document.cookie))},e.prototype.get=function(e){if(this.documentIsAccessible&&this.check(e)){e=encodeURIComponent(e);var t=this.getCookieRegExp(e).exec(this.document.cookie);return this.safeDecodeURIComponent(t[1])}return""},e.prototype.getAll=function(){var e=this;if(!this.documentIsAccessible)return{};var t={},o=this.document;return o.cookie&&""!==o.cookie&&o.cookie.split(";").forEach((function(o){var r=n(o.split("="),2),i=r[0],c=r[1];t[e.safeDecodeURIComponent(i.replace(/^ /,""))]=e.safeDecodeURIComponent(c)})),t},e.prototype.set=function(e,t,o,n,r,i,c){if(void 0===c&&(c="Lax"),this.documentIsAccessible){var s=encodeURIComponent(e)+"="+encodeURIComponent(t)+";";if(o)if("number"==typeof o)s+="expires="+new Date((new Date).getTime()+1e3*o*60*60*24).toUTCString()+";";else s+="expires="+o.toUTCString()+";";n&&(s+="path="+n+";"),r&&(s+="domain="+r+";"),!1===i&&"None"===c&&(i=!0,console.warn("[ngx-cookie-service] Cookie "+e+" was forced with secure flag because sameSite=None.More details : https://github.com/stevermeister/ngx-cookie-service/issues/86#issuecomment-597720130")),i&&(s+="secure;"),s+="sameSite="+c+";",this.document.cookie=s}},e.prototype.delete=function(e,t,o,n,r){void 0===r&&(r="Lax"),this.documentIsAccessible&&this.set(e,"",new Date("Thu, 01 Jan 1970 00:00:01 GMT"),t,o,n,r)},e.prototype.deleteAll=function(e,t,o,n){if(void 0===n&&(n="Lax"),this.documentIsAccessible){var r=this.getAll();for(var i in r)r.hasOwnProperty(i)&&this.delete(i,e,t,o,n)}},e.prototype.getCookieRegExp=function(e){var t=e.replace(/([\[\]\{\}\(\)\|\=\;\+\?\,\.\*\^\$])/gi,"\\$1");return new RegExp("(?:^"+t+"|;\\s*"+t+")=(.*?)(?:;|$)","g")},e.prototype.safeDecodeURIComponent=function(e){try{return decodeURIComponent(e)}catch(t){return e}},e}();r.ɵprov=t.ɵɵdefineInjectable({factory:function(){return new r(t.ɵɵinject(o.DOCUMENT),t.ɵɵinject(t.PLATFORM_ID))},token:r,providedIn:"root"}),r.decorators=[{type:t.Injectable,args:[{providedIn:"root"}]}],r.ctorParameters=function(){return[{type:void 0,decorators:[{type:t.Inject,args:[o.DOCUMENT]}]},{type:t.InjectionToken,decorators:[{type:t.Inject,args:[t.PLATFORM_ID]}]}]},e.CookieService=r,Object.defineProperty(e,"__esModule",{value:!0})}));
+    ***************************************************************************** */Object.create;function n(e,t){var o="function"==typeof Symbol&&e[Symbol.iterator];if(!o)return e;var n,r,i=o.call(e),c=[];try{for(;(void 0===t||t-- >0)&&!(n=i.next()).done;)c.push(n.value)}catch(e){r={error:e}}finally{try{n&&!n.done&&(o=i.return)&&o.call(i)}finally{if(r)throw r.error}}return c}Object.create;var r=function(){function e(e,t){this.document=e,this.platformId=t,this.documentIsAccessible=o.isPlatformBrowser(this.platformId)}return e.prototype.check=function(e){return!!this.documentIsAccessible&&(e=encodeURIComponent(e),this.getCookieRegExp(e).test(this.document.cookie))},e.prototype.get=function(e){if(this.documentIsAccessible&&this.check(e)){e=encodeURIComponent(e);var t=this.getCookieRegExp(e).exec(this.document.cookie);return this.safeDecodeURIComponent(t[1])}return""},e.prototype.getAll=function(){var e=this;if(!this.documentIsAccessible)return{};var t={},o=this.document;return o.cookie&&""!==o.cookie&&o.cookie.split(";").forEach((function(o){var r=n(o.split("="),2),i=r[0],c=r[1];t[e.safeDecodeURIComponent(i.replace(/^ /,""))]=e.safeDecodeURIComponent(c)})),t},e.prototype.set=function(e,t,o,n,r,i,c){if(this.documentIsAccessible)if("number"==typeof o||o instanceof Date||n||r||i||c){var s={expires:o,path:n,domain:r,secure:i,sameSite:c||"Lax"};this.set(e,t,s)}else{var a=encodeURIComponent(e)+"="+encodeURIComponent(t)+";",u=o||{};if(u.expires)if("number"==typeof u.expires)a+="expires="+new Date((new Date).getTime()+1e3*u.expires*60*60*24).toUTCString()+";";else a+="expires="+u.expires.toUTCString()+";";u.path&&(a+="path="+u.path+";"),u.domain&&(a+="domain="+u.domain+";"),!1===u.secure&&"None"===u.sameSite&&(u.secure=!0,console.warn("[ngx-cookie-service] Cookie "+e+" was forced with secure flag because sameSite=None.More details : https://github.com/stevermeister/ngx-cookie-service/issues/86#issuecomment-597720130")),u.secure&&(a+="secure;"),u.sameSite||(u.sameSite="Lax"),a+="sameSite="+u.sameSite+";",this.document.cookie=a}},e.prototype.delete=function(e,t,o,n,r){if(void 0===r&&(r="Lax"),this.documentIsAccessible){var i=new Date("Thu, 01 Jan 1970 00:00:01 GMT");this.set(e,"",{expires:i,path:t,domain:o,secure:n,sameSite:r})}},e.prototype.deleteAll=function(e,t,o,n){if(void 0===n&&(n="Lax"),this.documentIsAccessible){var r=this.getAll();for(var i in r)r.hasOwnProperty(i)&&this.delete(i,e,t,o,n)}},e.prototype.getCookieRegExp=function(e){var t=e.replace(/([\[\]\{\}\(\)\|\=\;\+\?\,\.\*\^\$])/gi,"\\$1");return new RegExp("(?:^"+t+"|;\\s*"+t+")=(.*?)(?:;|$)","g")},e.prototype.safeDecodeURIComponent=function(e){try{return decodeURIComponent(e)}catch(t){return e}},e}();r.ɵprov=t.ɵɵdefineInjectable({factory:function(){return new r(t.ɵɵinject(o.DOCUMENT),t.ɵɵinject(t.PLATFORM_ID))},token:r,providedIn:"root"}),r.decorators=[{type:t.Injectable,args:[{providedIn:"root"}]}],r.ctorParameters=function(){return[{type:void 0,decorators:[{type:t.Inject,args:[o.DOCUMENT]}]},{type:t.InjectionToken,decorators:[{type:t.Inject,args:[t.PLATFORM_ID]}]}]},e.CookieService=r,Object.defineProperty(e,"__esModule",{value:!0})}));
 //# sourceMappingURL=ngx-cookie-service.umd.min.js.map

esm2015/lib/cookie.service.js

@@ -66,40 +66,46 @@ // This service is based on the `ng2-cookies` package which sadly is not a service and does
     }
-    /**
-     * @param name     Cookie name
-     * @param value    Cookie value
-     * @param expires  Number of days until the cookies expires or an actual `Date`
-     * @param path     Cookie path
-     * @param domain   Cookie domain
-     * @param secure   Secure flag
-     * @param sameSite OWASP samesite token `Lax`, `None`, or `Strict`. Defaults to `Lax`
-     */
-    set(name, value, expires, path, domain, secure, sameSite = 'Lax') {
+    set(name, value, expiresOrOptions, path, domain, secure, sameSite) {
         if (!this.documentIsAccessible) {
             return;
         }
+        if (typeof expiresOrOptions === 'number' || expiresOrOptions instanceof Date || path || domain || secure || sameSite) {
+            const optionsBody = {
+                expires: expiresOrOptions,
+                path,
+                domain,
+                secure,
+                sameSite: sameSite ? sameSite : 'Lax',
+            };
+            this.set(name, value, optionsBody);
+            return;
+        }
         let cookieString = encodeURIComponent(name) + '=' + encodeURIComponent(value) + ';';
-        if (expires) {
-            if (typeof expires === 'number') {
-                const dateExpires = new Date(new Date().getTime() + expires * 1000 * 60 * 60 * 24);
+        const options = expiresOrOptions ? expiresOrOptions : {};
+        if (options.expires) {
+            if (typeof options.expires === 'number') {
+                const dateExpires = new Date(new Date().getTime() + options.expires * 1000 * 60 * 60 * 24);
                 cookieString += 'expires=' + dateExpires.toUTCString() + ';';
             }
             else {
-                cookieString += 'expires=' + expires.toUTCString() + ';';
+                cookieString += 'expires=' + options.expires.toUTCString() + ';';
             }
         }
-        if (path) {
-            cookieString += 'path=' + path + ';';
+        if (options.path) {
+            cookieString += 'path=' + options.path + ';';
         }
-        if (domain) {
-            cookieString += 'domain=' + domain + ';';
+        if (options.domain) {
+            cookieString += 'domain=' + options.domain + ';';
         }
-        if (secure === false && sameSite === 'None') {
-            secure = true;
+        if (options.secure === false && options.sameSite === 'None') {
+            options.secure = true;
             console.warn(`[ngx-cookie-service] Cookie ${name} was forced with secure flag because sameSite=None.` +
                 `More details : https://github.com/stevermeister/ngx-cookie-service/issues/86#issuecomment-597720130`);
         }
-        if (secure) {
+        if (options.secure) {
             cookieString += 'secure;';
         }
-        cookieString += 'sameSite=' + sameSite + ';';
+        if (!options.sameSite) {
+            options.sameSite = 'Lax';
+        }
+        cookieString += 'sameSite=' + options.sameSite + ';';
         this.document.cookie = cookieString;
@@ -116,3 +122,4 @@ }
         }
-        this.set(name, '', new Date('Thu, 01 Jan 1970 00:00:01 GMT'), path, domain, secure, sameSite);
+        const expiresDate = new Date('Thu, 01 Jan 1970 00:00:01 GMT');
+        this.set(name, '', { expires: expiresDate, path, domain, secure, sameSite });
     }
@@ -162,2 +169,2 @@ /**
 ];
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cookie.service.js","sourceRoot":"","sources":["../../../../projects/ngx-cookie-service/src/lib/cookie.service.ts"],"names":[],"mappings":"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","sourcesContent":["// This service is based on the `ng2-cookies` package which sadly is not a service and does\n// not use `DOCUMENT` injection and therefore doesn't work well with AoT production builds.\n// Package: https://github.com/BCJTI/ng2-cookies\n\nimport { Injectable, Inject, PLATFORM_ID, InjectionToken } from '@angular/core';\nimport { DOCUMENT, isPlatformBrowser } from '@angular/common';\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class CookieService {\n  private readonly documentIsAccessible: boolean;\n\n  constructor(\n    // The type `Document` may not be used here. Although a fix is on its way,\n    // we will go with `any` for now to support Angular 2.4.x projects.\n    // Issue: https://github.com/angular/angular/issues/12631\n    // Fix: https://github.com/angular/angular/pull/14894\n    @Inject(DOCUMENT) private document: any,\n    // Get the `PLATFORM_ID` so we can check if we're in a browser.\n    @Inject(PLATFORM_ID) private platformId: InjectionToken<object>\n  ) {\n    this.documentIsAccessible = isPlatformBrowser(this.platformId);\n  }\n\n  /**\n   * @param name Cookie name\n   * @returns boolean - whether cookie with specified name exists\n   */\n  check(name: string): boolean {\n    if (!this.documentIsAccessible) {\n      return false;\n    }\n\n    name = encodeURIComponent(name);\n\n    const regExp: RegExp = this.getCookieRegExp(name);\n    const exists: boolean = regExp.test(this.document.cookie);\n\n    return exists;\n  }\n\n  /**\n   * @param name Cookie name\n   * @returns property value\n   */\n  get(name: string): string {\n    if (this.documentIsAccessible && this.check(name)) {\n      name = encodeURIComponent(name);\n\n      const regExp: RegExp = this.getCookieRegExp(name);\n      const result: RegExpExecArray = regExp.exec(this.document.cookie);\n\n      return this.safeDecodeURIComponent(result[1]);\n    } else {\n      return '';\n    }\n  }\n\n  /**\n   * @returns all the cookies in json\n   */\n  getAll(): { [key: string]: string } {\n    if (!this.documentIsAccessible) {\n      return {};\n    }\n\n    const cookies: { [key: string]: string } = {};\n    const document: any = this.document;\n\n    if (document.cookie && document.cookie !== '') {\n      document.cookie.split(';').forEach((currentCookie) => {\n        const [cookieName, cookieValue] = currentCookie.split('=');\n        cookies[this.safeDecodeURIComponent(cookieName.replace(/^ /, ''))] = this.safeDecodeURIComponent(cookieValue);\n      });\n    }\n\n    return cookies;\n  }\n\n  /**\n   * @param name     Cookie name\n   * @param value    Cookie value\n   * @param expires  Number of days until the cookies expires or an actual `Date`\n   * @param path     Cookie path\n   * @param domain   Cookie domain\n   * @param secure   Secure flag\n   * @param sameSite OWASP samesite token `Lax`, `None`, or `Strict`. Defaults to `Lax`\n   */\n  set(\n    name: string,\n    value: string,\n    expires?: number | Date,\n    path?: string,\n    domain?: string,\n    secure?: boolean,\n    sameSite: 'Lax' | 'None' | 'Strict' = 'Lax'\n  ): void {\n    if (!this.documentIsAccessible) {\n      return;\n    }\n\n    let cookieString: string = encodeURIComponent(name) + '=' + encodeURIComponent(value) + ';';\n\n    if (expires) {\n      if (typeof expires === 'number') {\n        const dateExpires: Date = new Date(new Date().getTime() + expires * 1000 * 60 * 60 * 24);\n\n        cookieString += 'expires=' + dateExpires.toUTCString() + ';';\n      } else {\n        cookieString += 'expires=' + expires.toUTCString() + ';';\n      }\n    }\n\n    if (path) {\n      cookieString += 'path=' + path + ';';\n    }\n\n    if (domain) {\n      cookieString += 'domain=' + domain + ';';\n    }\n\n    if (secure === false && sameSite === 'None') {\n      secure = true;\n      console.warn(\n        `[ngx-cookie-service] Cookie ${name} was forced with secure flag because sameSite=None.` +\n          `More details : https://github.com/stevermeister/ngx-cookie-service/issues/86#issuecomment-597720130`\n      );\n    }\n    if (secure) {\n      cookieString += 'secure;';\n    }\n\n    cookieString += 'sameSite=' + sameSite + ';';\n\n    this.document.cookie = cookieString;\n  }\n\n  /**\n   * @param name   Cookie name\n   * @param path   Cookie path\n   * @param domain Cookie domain\n   */\n  delete(name: string, path?: string, domain?: string, secure?: boolean, sameSite: 'Lax' | 'None' | 'Strict' = 'Lax'): void {\n    if (!this.documentIsAccessible) {\n      return;\n    }\n\n    this.set(name, '', new Date('Thu, 01 Jan 1970 00:00:01 GMT'), path, domain, secure, sameSite);\n  }\n\n  /**\n   * @param path   Cookie path\n   * @param domain Cookie domain\n   */\n  deleteAll(path?: string, domain?: string, secure?: boolean, sameSite: 'Lax' | 'None' | 'Strict' = 'Lax'): void {\n    if (!this.documentIsAccessible) {\n      return;\n    }\n\n    const cookies: any = this.getAll();\n\n    for (const cookieName in cookies) {\n      if (cookies.hasOwnProperty(cookieName)) {\n        this.delete(cookieName, path, domain, secure, sameSite);\n      }\n    }\n  }\n\n  /**\n   * @param name Cookie name\n   * @returns property RegExp\n   */\n  private getCookieRegExp(name: string): RegExp {\n    const escapedName: string = name.replace(/([\\[\\]\\{\\}\\(\\)\\|\\=\\;\\+\\?\\,\\.\\*\\^\\$])/gi, '\\\\$1');\n\n    return new RegExp('(?:^' + escapedName + '|;\\\\s*' + escapedName + ')=(.*?)(?:;|$)', 'g');\n  }\n\n  private safeDecodeURIComponent(encodedURIComponent: string): string {\n    try {\n      return decodeURIComponent(encodedURIComponent);\n    } catch {\n      // probably it is not uri encoded. return as is\n      return encodedURIComponent;\n    }\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cookie.service.js","sourceRoot":"","sources":["../../../../projects/ngx-cookie-service/src/lib/cookie.service.ts"],"names":[],"mappings":"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","sourcesContent":["// This service is based on the `ng2-cookies` package which sadly is not a service and does\n// not use `DOCUMENT` injection and therefore doesn't work well with AoT production builds.\n// Package: https://github.com/BCJTI/ng2-cookies\n\nimport { Injectable, Inject, PLATFORM_ID, InjectionToken } from '@angular/core';\nimport { DOCUMENT, isPlatformBrowser } from '@angular/common';\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class CookieService {\n  private readonly documentIsAccessible: boolean;\n\n  constructor(\n    // The type `Document` may not be used here. Although a fix is on its way,\n    // we will go with `any` for now to support Angular 2.4.x projects.\n    // Issue: https://github.com/angular/angular/issues/12631\n    // Fix: https://github.com/angular/angular/pull/14894\n    @Inject(DOCUMENT) private document: any,\n    // Get the `PLATFORM_ID` so we can check if we're in a browser.\n    @Inject(PLATFORM_ID) private platformId: InjectionToken<object>\n  ) {\n    this.documentIsAccessible = isPlatformBrowser(this.platformId);\n  }\n\n  /**\n   * @param name Cookie name\n   * @returns boolean - whether cookie with specified name exists\n   */\n  check(name: string): boolean {\n    if (!this.documentIsAccessible) {\n      return false;\n    }\n\n    name = encodeURIComponent(name);\n\n    const regExp: RegExp = this.getCookieRegExp(name);\n    const exists: boolean = regExp.test(this.document.cookie);\n\n    return exists;\n  }\n\n  /**\n   * @param name Cookie name\n   * @returns property value\n   */\n  get(name: string): string {\n    if (this.documentIsAccessible && this.check(name)) {\n      name = encodeURIComponent(name);\n\n      const regExp: RegExp = this.getCookieRegExp(name);\n      const result: RegExpExecArray = regExp.exec(this.document.cookie);\n\n      return this.safeDecodeURIComponent(result[1]);\n    } else {\n      return '';\n    }\n  }\n\n  /**\n   * @returns all the cookies in json\n   */\n  getAll(): { [key: string]: string } {\n    if (!this.documentIsAccessible) {\n      return {};\n    }\n\n    const cookies: { [key: string]: string } = {};\n    const document: any = this.document;\n\n    if (document.cookie && document.cookie !== '') {\n      document.cookie.split(';').forEach((currentCookie) => {\n        const [cookieName, cookieValue] = currentCookie.split('=');\n        cookies[this.safeDecodeURIComponent(cookieName.replace(/^ /, ''))] = this.safeDecodeURIComponent(cookieValue);\n      });\n    }\n\n    return cookies;\n  }\n\n  /**\n   * @param name     Cookie name\n   * @param value    Cookie value\n   * @param expires  Number of days until the cookies expires or an actual `Date`\n   * @param path     Cookie path\n   * @param domain   Cookie domain\n   * @param secure   Secure flag\n   * @param sameSite OWASP samesite token `Lax`, `None`, or `Strict`. Defaults to `Lax`\n   */\n  set(name: string, value: string, expires?: number | Date, path?: string, domain?: string, secure?: boolean, sameSite?: 'Lax' | 'None' | 'Strict'): void;\n\n  /**\n   * Cookie's parameters:\n   * <pre>\n   * expires  Number of days until the cookies expires or an actual `Date`\n   * path     Cookie path\n   * domain   Cookie domain\n   * secure   Secure flag\n   * sameSite OWASP samesite token `Lax`, `None`, or `Strict`. Defaults to `Lax`\n   * </pre>\n   * @param name     Cookie name\n   * @param value    Cookie value\n   * @param options  Body with cookie's params\n   */\n  set(\n    name: string,\n    value: string,\n    options?: {\n      expires?: number | Date;\n      path?: string;\n      domain?: string;\n      secure?: boolean;\n      sameSite?: 'Lax' | 'None' | 'Strict';\n    }\n  ): void;\n\n  set(\n    name: string,\n    value: string,\n    expiresOrOptions?: number | Date | any,\n    path?: string,\n    domain?: string,\n    secure?: boolean,\n    sameSite?: 'Lax' | 'None' | 'Strict'\n  ): void {\n    if (!this.documentIsAccessible) {\n      return;\n    }\n\n    if (typeof expiresOrOptions === 'number' || expiresOrOptions instanceof Date || path || domain || secure || sameSite) {\n      const optionsBody = {\n        expires: expiresOrOptions,\n        path,\n        domain,\n        secure,\n        sameSite: sameSite ? sameSite : 'Lax',\n      };\n\n      this.set(name, value, optionsBody);\n      return;\n    }\n\n    let cookieString: string = encodeURIComponent(name) + '=' + encodeURIComponent(value) + ';';\n\n    const options = expiresOrOptions ? expiresOrOptions : {};\n\n    if (options.expires) {\n      if (typeof options.expires === 'number') {\n        const dateExpires: Date = new Date(new Date().getTime() + options.expires * 1000 * 60 * 60 * 24);\n\n        cookieString += 'expires=' + dateExpires.toUTCString() + ';';\n      } else {\n        cookieString += 'expires=' + options.expires.toUTCString() + ';';\n      }\n    }\n\n    if (options.path) {\n      cookieString += 'path=' + options.path + ';';\n    }\n\n    if (options.domain) {\n      cookieString += 'domain=' + options.domain + ';';\n    }\n\n    if (options.secure === false && options.sameSite === 'None') {\n      options.secure = true;\n      console.warn(\n        `[ngx-cookie-service] Cookie ${name} was forced with secure flag because sameSite=None.` +\n          `More details : https://github.com/stevermeister/ngx-cookie-service/issues/86#issuecomment-597720130`\n      );\n    }\n    if (options.secure) {\n      cookieString += 'secure;';\n    }\n\n    if (!options.sameSite) {\n      options.sameSite = 'Lax';\n    }\n\n    cookieString += 'sameSite=' + options.sameSite + ';';\n\n    this.document.cookie = cookieString;\n  }\n\n  /**\n   * @param name   Cookie name\n   * @param path   Cookie path\n   * @param domain Cookie domain\n   */\n  delete(name: string, path?: string, domain?: string, secure?: boolean, sameSite: 'Lax' | 'None' | 'Strict' = 'Lax'): void {\n    if (!this.documentIsAccessible) {\n      return;\n    }\n    const expiresDate = new Date('Thu, 01 Jan 1970 00:00:01 GMT');\n    this.set(name, '', { expires: expiresDate, path, domain, secure, sameSite });\n  }\n\n  /**\n   * @param path   Cookie path\n   * @param domain Cookie domain\n   */\n  deleteAll(path?: string, domain?: string, secure?: boolean, sameSite: 'Lax' | 'None' | 'Strict' = 'Lax'): void {\n    if (!this.documentIsAccessible) {\n      return;\n    }\n\n    const cookies: any = this.getAll();\n\n    for (const cookieName in cookies) {\n      if (cookies.hasOwnProperty(cookieName)) {\n        this.delete(cookieName, path, domain, secure, sameSite);\n      }\n    }\n  }\n\n  /**\n   * @param name Cookie name\n   * @returns property RegExp\n   */\n  private getCookieRegExp(name: string): RegExp {\n    const escapedName: string = name.replace(/([\\[\\]\\{\\}\\(\\)\\|\\=\\;\\+\\?\\,\\.\\*\\^\\$])/gi, '\\\\$1');\n\n    return new RegExp('(?:^' + escapedName + '|;\\\\s*' + escapedName + ')=(.*?)(?:;|$)', 'g');\n  }\n\n  private safeDecodeURIComponent(encodedURIComponent: string): string {\n    try {\n      return decodeURIComponent(encodedURIComponent);\n    } catch {\n      // probably it is not uri encoded. return as is\n      return encodedURIComponent;\n    }\n  }\n}\n"]}

fesm2015/ngx-cookie-service.js

@@ -63,40 +63,46 @@ import { ɵɵdefineInjectable, ɵɵinject, PLATFORM_ID, Injectable, Inject, InjectionToken } from '@angular/core';
     }
-    /**
-     * @param name     Cookie name
-     * @param value    Cookie value
-     * @param expires  Number of days until the cookies expires or an actual `Date`
-     * @param path     Cookie path
-     * @param domain   Cookie domain
-     * @param secure   Secure flag
-     * @param sameSite OWASP samesite token `Lax`, `None`, or `Strict`. Defaults to `Lax`
-     */
-    set(name, value, expires, path, domain, secure, sameSite = 'Lax') {
+    set(name, value, expiresOrOptions, path, domain, secure, sameSite) {
         if (!this.documentIsAccessible) {
             return;
         }
+        if (typeof expiresOrOptions === 'number' || expiresOrOptions instanceof Date || path || domain || secure || sameSite) {
+            const optionsBody = {
+                expires: expiresOrOptions,
+                path,
+                domain,
+                secure,
+                sameSite: sameSite ? sameSite : 'Lax',
+            };
+            this.set(name, value, optionsBody);
+            return;
+        }
         let cookieString = encodeURIComponent(name) + '=' + encodeURIComponent(value) + ';';
-        if (expires) {
-            if (typeof expires === 'number') {
-                const dateExpires = new Date(new Date().getTime() + expires * 1000 * 60 * 60 * 24);
+        const options = expiresOrOptions ? expiresOrOptions : {};
+        if (options.expires) {
+            if (typeof options.expires === 'number') {
+                const dateExpires = new Date(new Date().getTime() + options.expires * 1000 * 60 * 60 * 24);
                 cookieString += 'expires=' + dateExpires.toUTCString() + ';';
             }
             else {
-                cookieString += 'expires=' + expires.toUTCString() + ';';
+                cookieString += 'expires=' + options.expires.toUTCString() + ';';
             }
         }
-        if (path) {
-            cookieString += 'path=' + path + ';';
+        if (options.path) {
+            cookieString += 'path=' + options.path + ';';
         }
-        if (domain) {
-            cookieString += 'domain=' + domain + ';';
+        if (options.domain) {
+            cookieString += 'domain=' + options.domain + ';';
         }
-        if (secure === false && sameSite === 'None') {
-            secure = true;
+        if (options.secure === false && options.sameSite === 'None') {
+            options.secure = true;
             console.warn(`[ngx-cookie-service] Cookie ${name} was forced with secure flag because sameSite=None.` +
                 `More details : https://github.com/stevermeister/ngx-cookie-service/issues/86#issuecomment-597720130`);
         }
-        if (secure) {
+        if (options.secure) {
             cookieString += 'secure;';
         }
-        cookieString += 'sameSite=' + sameSite + ';';
+        if (!options.sameSite) {
+            options.sameSite = 'Lax';
+        }
+        cookieString += 'sameSite=' + options.sameSite + ';';
         this.document.cookie = cookieString;
@@ -113,3 +119,4 @@ }
         }
-        this.set(name, '', new Date('Thu, 01 Jan 1970 00:00:01 GMT'), path, domain, secure, sameSite);
+        const expiresDate = new Date('Thu, 01 Jan 1970 00:00:01 GMT');
+        this.set(name, '', { expires: expiresDate, path, domain, secure, sameSite });
     }
@@ -116,0 +123,0 @@ /**

lib/cookie.service.d.ts

@@ -34,2 +34,22 @@ import { InjectionToken } from '@angular/core';
     /**
+     * Cookie's parameters:
+     * <pre>
+     * expires  Number of days until the cookies expires or an actual `Date`
+     * path     Cookie path
+     * domain   Cookie domain
+     * secure   Secure flag
+     * sameSite OWASP samesite token `Lax`, `None`, or `Strict`. Defaults to `Lax`
+     * </pre>
+     * @param name     Cookie name
+     * @param value    Cookie value
+     * @param options  Body with cookie's params
+     */
+    set(name: string, value: string, options?: {
+        expires?: number | Date;
+        path?: string;
+        domain?: string;
+        secure?: boolean;
+        sameSite?: 'Lax' | 'None' | 'Strict';
+    }): void;
+    /**
      * @param name   Cookie name
@@ -36,0 +56,0 @@ * @param path   Cookie path

ngx-cookie-service.metadata.json

@@ -1,1 +0,1 @@
-{"__symbolic":"module","version":4,"metadata":{"CookieService":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable","line":7,"character":1},"arguments":[{"providedIn":"root"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":18,"character":5},"arguments":[{"__symbolic":"reference","module":"@angular/common","name":"DOCUMENT","line":18,"character":12}]}],[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":20,"character":5},"arguments":[{"__symbolic":"reference","module":"@angular/core","name":"PLATFORM_ID","line":20,"character":12}]}]],"parameters":[{"__symbolic":"reference","name":"any"},{"__symbolic":"reference","name":"InjectionToken","module":"@angular/core","arguments":[{"__symbolic":"error","message":"Expression form not supported","line":20,"character":60,"module":"./lib/cookie.service"}]}]}],"check":[{"__symbolic":"method"}],"get":[{"__symbolic":"method"}],"getAll":[{"__symbolic":"method"}],"set":[{"__symbolic":"method"}],"delete":[{"__symbolic":"method"}],"deleteAll":[{"__symbolic":"method"}],"getCookieRegExp":[{"__symbolic":"method"}],"safeDecodeURIComponent":[{"__symbolic":"method"}]},"statics":{"ɵprov":{}}}},"origins":{"CookieService":"./lib/cookie.service"},"importAs":"ngx-cookie-service"}
+{"__symbolic":"module","version":4,"metadata":{"CookieService":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable","line":7,"character":1},"arguments":[{"providedIn":"root"}]}],"members":{"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":18,"character":5},"arguments":[{"__symbolic":"reference","module":"@angular/common","name":"DOCUMENT","line":18,"character":12}]}],[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":20,"character":5},"arguments":[{"__symbolic":"reference","module":"@angular/core","name":"PLATFORM_ID","line":20,"character":12}]}]],"parameters":[{"__symbolic":"reference","name":"any"},{"__symbolic":"reference","name":"InjectionToken","module":"@angular/core","arguments":[{"__symbolic":"error","message":"Expression form not supported","line":20,"character":60,"module":"./lib/cookie.service"}]}]}],"check":[{"__symbolic":"method"}],"get":[{"__symbolic":"method"}],"getAll":[{"__symbolic":"method"}],"set":[{"__symbolic":"method"},{"__symbolic":"method"},{"__symbolic":"method"}],"delete":[{"__symbolic":"method"}],"deleteAll":[{"__symbolic":"method"}],"getCookieRegExp":[{"__symbolic":"method"}],"safeDecodeURIComponent":[{"__symbolic":"method"}]},"statics":{"ɵprov":{}}}},"origins":{"CookieService":"./lib/cookie.service"},"importAs":"ngx-cookie-service"}

package.json

 {
   "name": "ngx-cookie-service",
   "description": "an (aot ready) angular (4.2+) cookie service",
-  "version": "10.0.1",
+  "version": "10.1.1",
   "license": "MIT",
@@ -6,0 +6,0 @@ "author": "Stepan Suvorov <[e-mail]>",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

133277

increased by9.03%

Lines of code

921

increased by4.78%

No dependency changes