Merge branch 'AdminTemplateRedesign' into WizardDescriptionRefactor
This commit is contained in:
commit
868de6bf78
|
@ -119,7 +119,9 @@ export class AppComponent implements OnInit, AfterViewInit {
|
|||
this.onlySplash = false;
|
||||
}
|
||||
if (!this.cookieService.check("cookiesConsent")) {
|
||||
this.cookieService.set("cookiesConsent", "false", 356);
|
||||
// this.cookieService.set("cookiesConsent", "false", 356);
|
||||
this.cookieService.set("cookiesConsent", "false", 356,null,null,false, 'Lax');
|
||||
|
||||
}
|
||||
|
||||
this.hasBreadCrumb = this.router.events.pipe(
|
||||
|
@ -152,7 +154,8 @@ export class AppComponent implements OnInit, AfterViewInit {
|
|||
|
||||
this.statusChangeSubscription = this.ccService.statusChange$.subscribe((event: NgcStatusChangeEvent) => {
|
||||
if (event.status == "dismiss") {
|
||||
this.cookieService.set("cookiesConsent", "true", 365);
|
||||
// this.cookieService.set("cookiesConsent", "true", 365);
|
||||
this.cookieService.set("cookiesConsent", "true", 356,null,null,false, 'Lax');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
@ -81,7 +81,8 @@ export class AuthService extends BaseService {
|
|||
return this.http.post(url, loginInfo, { headers: this.headers }).pipe(
|
||||
map((res: any) => {
|
||||
const principal = this.current(res.payload);
|
||||
this.cookieService.set('cookiesConsent', 'true', 356);
|
||||
// this.cookieService.set('cookiesConsent', 'true', 356);
|
||||
this.cookieService.set("cookiesConsent", "true", 356,null,null,false, 'Lax');
|
||||
//this.loginContextSubject.next(true);
|
||||
return principal;
|
||||
}),
|
||||
|
@ -105,7 +106,8 @@ export class AuthService extends BaseService {
|
|||
return this.http.post(url, credentials, { headers: this.headers }).pipe(
|
||||
map((res: any) => {
|
||||
const principal = this.current(res.payload);
|
||||
this.cookieService.set('cookiesConsent', 'true', 356);
|
||||
// this.cookieService.set('cookiesConsent', 'true', 356);
|
||||
this.cookieService.set("cookiesConsent", "true", 356,null,null,false, 'Lax');
|
||||
//this.loginContextSubject.next(true);
|
||||
return principal;
|
||||
}),
|
||||
|
|
Loading…
Reference in New Issue