Skip to content

Commit

Permalink
Merge pull request #180 from stevermeister/master
Browse files Browse the repository at this point in the history
back port master changes to 13.x.x
  • Loading branch information
pavankjadda authored Oct 29, 2021
2 parents 7eb5cbd + 3cf64a8 commit 6b5786a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
- name: Use Node.js 16.x
uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 16.x
- name: Install dependencies
run: npm ci
- name: Lint
run: npm run lint
- name: Format check
run: npm run format:check
- name: Build
run: npm run build -- --prod
run: npm run build --configuration=production
- name: Test
run: npm run test -- --configuration=ci
run: npm run test --configuration=ci
env:
CI: true
2 changes: 1 addition & 1 deletion .github/workflows/npm_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16
- name: Install Angular CLI
run: npm install -g @angular/cli @angular/core
- name: Install NPM Dependencies
Expand Down
8 changes: 4 additions & 4 deletions projects/ngx-cookie-service/src/lib/cookie.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class CookieService {
constructor(
@Inject(DOCUMENT) private document: any,
// Get the `PLATFORM_ID` so we can check if we're in a browser.
@Inject(PLATFORM_ID) private platformId,
@Inject(PLATFORM_ID) private platformId
) {
this.documentIsAccessible = isPlatformBrowser(this.platformId);
}
Expand Down Expand Up @@ -163,7 +163,7 @@ export class CookieService {
domain?: string;
secure?: boolean;
sameSite?: 'Lax' | 'None' | 'Strict';
},
}
): void;

set(
Expand All @@ -173,7 +173,7 @@ export class CookieService {
path?: string,
domain?: string,
secure?: boolean,
sameSite?: 'Lax' | 'None' | 'Strict',
sameSite?: 'Lax' | 'None' | 'Strict'
): void {
if (!this.documentIsAccessible) {
return;
Expand Down Expand Up @@ -218,7 +218,7 @@ export class CookieService {
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`,
`More details : https://github.com/stevermeister/ngx-cookie-service/issues/86#issuecomment-597720130`
);
}
if (options.secure) {
Expand Down

0 comments on commit 6b5786a

Please sign in to comment.