hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 14:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

commit before rebase

Browse Source
This commit is contained in:
lotte
2020-08-31 16:02:26 +02:00
parent f6e8448164
commit 19ca179e7a
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/shared/cookies/browser-klaro.service.ts
View File

@@ -176,17 +176,6 @@ export class BrowserKlaroService extends KlaroService {
// */
// 'piwik_ignore',
],
/*
You can define an optional callback function that will be called each time the
consent state for the given app changes. The consent value will be passed as the
first parameter to the function (true=consented). The `app` config will be
passed as the second parameter.
*/
callback: (consent, app) => {
console.log(consent, app);
this.message$.next('User consent for app ' + app.name + ': consent=' + consent);
},
/*
If 'onlyOnce' is set to 'true', the app will only be executed once regardless
how often the user toggles it on and off. This is relevant e.g. for tracking
@@ -217,6 +206,7 @@ export class BrowserKlaroService extends KlaroService {
.pipe(
take(1),
switchMap((loggedIn: boolean) => {
console.log('loggedIn', loggedIn);
if (loggedIn) {
return this.authService.getAuthenticatedUserFromStore();
}
@@ -232,6 +222,13 @@ export class BrowserKlaroService extends KlaroService {
if (hasValue(user)) {
this.klaroConfig.callback = (consent, app) => this.updateSettingsForUsers(user);
this.klaroConfig.storageName = this.getStorageName(user.uuid);
const anonCookie = this.cookieService.get(this.getStorageName('anonymous'));
if (hasValue(this.getSettingsForUser(user))) {
this.restoreSettingsForUsers(user);
} else if (hasValue(anonCookie)) {
this.cookieService.set(this.getStorageName(user.uuid), anonCookie);
}
}
/**