Skip to content

Commit

Permalink
Merge pull request #303 from stevermeister/development
Browse files Browse the repository at this point in the history
release version 17.1.0
  • Loading branch information
pavankjadda authored Feb 3, 2024
2 parents a4f8de1 + 18b0717 commit d63be32
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 16 deletions.
2 changes: 1 addition & 1 deletion projects/ngx-cookie-service-ssr/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ngx-cookie-service-ssr",
"description": "Angular SSR cookie service",
"version": "17.0.1",
"version": "17.1.0",
"license": "MIT",
"author": "Stepan Suvorov <[email protected]>",
"keywords": [
Expand Down
27 changes: 22 additions & 5 deletions projects/ngx-cookie-service-ssr/src/lib/ssr-cookie.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,22 @@ export class SsrCookieService {
* @param path Cookie path
* @param domain Cookie domain
* @param secure Secure flag
* @param sameSite OWASP samesite token `Lax`, `None`, or `Strict`. Defaults to `Lax`
* @param sameSite OWASP same site token `Lax`, `None`, or `Strict`. Defaults to `Lax`
* @param partitioned Partitioned flag
*
* @author: Stepan Suvorov
* @since: 1.0.0
*/
set(name: string, value: string, expires?: number | Date, path?: string, domain?: string, secure?: boolean, sameSite?: 'Lax' | 'None' | 'Strict'): void;
set(
name: string,
value: string,
expires?: number | Date,
path?: string,
domain?: string,
secure?: boolean,
sameSite?: 'Lax' | 'None' | 'Strict',
partitioned?: boolean
): void;

/**
* Set cookie based on provided information
Expand All @@ -137,8 +147,8 @@ export class SsrCookieService {
* 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`
* secure Cookie secure flag
* sameSite OWASP same site token `Lax`, `None`, or `Strict`. Defaults to `Lax`
* </pre>
*
* @param name Cookie name
Expand All @@ -157,6 +167,7 @@ export class SsrCookieService {
domain?: string;
secure?: boolean;
sameSite?: 'Lax' | 'None' | 'Strict';
partitioned?: boolean;
}
): void;

Expand All @@ -167,7 +178,8 @@ export class SsrCookieService {
path?: string,
domain?: string,
secure?: boolean,
sameSite?: 'Lax' | 'None' | 'Strict'
sameSite?: 'Lax' | 'None' | 'Strict',
partitioned?: boolean
): void {
if (!this.documentIsAccessible) {
return;
Expand All @@ -180,6 +192,7 @@ export class SsrCookieService {
domain,
secure,
sameSite: sameSite ? sameSite : 'Lax',
partitioned,
};

this.set(name, value, optionsBody);
Expand Down Expand Up @@ -225,6 +238,10 @@ export class SsrCookieService {

cookieString += 'sameSite=' + options.sameSite + ';';

if (options.partitioned) {
cookieString += 'Partitioned;';
}

this.document.cookie = cookieString;
}

Expand Down
2 changes: 1 addition & 1 deletion projects/ngx-cookie-service/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ngx-cookie-service",
"description": "Angular cookie service",
"version": "17.0.1",
"version": "17.1.0",
"license": "MIT",
"author": "Stepan Suvorov <[email protected]>",
"keywords": [
Expand Down
17 changes: 13 additions & 4 deletions projects/ngx-cookie-service/src/lib/cookie.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ describe('NgxCookieServiceService', () => {
expect(documentCookieSetterSpy).toHaveBeenCalledWith('foo=bar;domain=example.com;sameSite=Lax;');
});
it('should set cookie with secure option', () => {
cookieService.set('foo', 'bar', undefined, undefined, undefined, true, 'Lax');
cookieService.set('foo', 'bar', undefined, undefined, undefined, true, 'Lax', false);

expect(documentCookieSetterSpy).toHaveBeenCalledWith('foo=bar;secure;sameSite=Lax;');
});
Expand All @@ -215,7 +215,7 @@ describe('NgxCookieServiceService', () => {
expect(documentCookieSetterSpy).toHaveBeenCalledWith('foo=bar;secure;sameSite=Lax;');
});
it('should set cookie with forced secure flag when SameSite option is "None"', () => {
cookieService.set('foo', 'bar', undefined, undefined, undefined, false, 'None');
cookieService.set('foo', 'bar', undefined, undefined, undefined, false, 'None', false);

expect(documentCookieSetterSpy).toHaveBeenCalledWith('foo=bar;secure;sameSite=None;');
});
Expand All @@ -225,7 +225,7 @@ describe('NgxCookieServiceService', () => {
expect(documentCookieSetterSpy).toHaveBeenCalledWith('foo=bar;secure;sameSite=None;');
});
it('should set cookie with SameSite option', () => {
cookieService.set('foo', 'bar', undefined, undefined, undefined, false, 'Strict');
cookieService.set('foo', 'bar', undefined, undefined, undefined, false, 'Strict', false);

expect(documentCookieSetterSpy).toHaveBeenCalledWith('foo=bar;sameSite=Strict;');
});
Expand All @@ -236,12 +236,21 @@ describe('NgxCookieServiceService', () => {
});
it('should set cookie with all options', () => {
const expiresDate = new Date('Mon, 15 Mar 2021 10:00:00 GMT');
cookieService.set('foo', 'bar', expiresDate, '/test', 'example.com', true, 'Strict');
cookieService.set('foo', 'bar', expiresDate, '/test', 'example.com', true, 'Strict', false);

expect(documentCookieSetterSpy).toHaveBeenCalledWith(
'foo=bar;expires=Mon, 15 Mar 2021 10:00:00 GMT;path=/test;domain=example.com;secure;sameSite=Strict;'
);
});
it('should set cookie with partitioned', () => {
const expiresDate = new Date('Mon, 15 Mar 2021 10:00:00 GMT');
cookieService.set('foo', 'bar', expiresDate, '/test', 'example.com', true, 'Strict', true);

expect(documentCookieSetterSpy).toHaveBeenCalledWith(
'foo=bar;expires=Mon, 15 Mar 2021 10:00:00 GMT;path=/test;domain=example.com;secure;sameSite=Strict;Partitioned;'
);
});

it('should set cookie with all options in options body', () => {
const expiresDate = new Date('Mon, 15 Mar 2021 10:00:00 GMT');

Expand Down
19 changes: 14 additions & 5 deletions projects/ngx-cookie-service/src/lib/cookie.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export interface CookieOptions {
domain?: string;
secure?: boolean;
sameSite?: SameSite;
partitioned?: boolean;
}

@Injectable({
Expand Down Expand Up @@ -138,7 +139,8 @@ export class CookieService {
* @param path Cookie path
* @param domain Cookie domain
* @param secure Secure flag
* @param sameSite OWASP samesite token `Lax`, `None`, or `Strict`. Defaults to `Lax`
* @param partitioned Partitioned flag
* @param sameSite OWASP same site token `Lax`, `None`, or `Strict`. Defaults to `Lax`
*
* @author: Stepan Suvorov
* @since: 1.0.0
Expand All @@ -150,7 +152,8 @@ export class CookieService {
path?: CookieOptions['path'],
domain?: CookieOptions['domain'],
secure?: CookieOptions['secure'],
sameSite?: SameSite
sameSite?: SameSite,
partitioned?: CookieOptions['partitioned']
): void;

/**
Expand All @@ -161,8 +164,8 @@ export class CookieService {
* 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`
* secure flag
* sameSite OWASP same site token `Lax`, `None`, or `Strict`. Defaults to `Lax`
* </pre>
*
* @param name Cookie name
Expand All @@ -181,7 +184,8 @@ export class CookieService {
path?: CookieOptions['path'],
domain?: CookieOptions['domain'],
secure?: CookieOptions['secure'],
sameSite?: SameSite
sameSite?: SameSite,
partitioned?: CookieOptions['partitioned']
): void {
if (!this.documentIsAccessible) {
return;
Expand All @@ -194,6 +198,7 @@ export class CookieService {
domain,
secure,
sameSite: sameSite ? sameSite : 'Lax',
partitioned,
};

this.set(name, value, optionsBody);
Expand Down Expand Up @@ -239,6 +244,10 @@ export class CookieService {

cookieString += 'sameSite=' + options.sameSite + ';';

if (options.partitioned) {
cookieString += 'Partitioned;';
}

this.document.cookie = cookieString;
}

Expand Down

0 comments on commit d63be32

Please sign in to comment.