@teipublisher/pb-components 2.16.0 → 2.18.0

package/src/pb-login.js

@@ -1,6 +1,7 @@
 import { LitElement, html, css } from 'lit-element';
 import { pbMixin, waitOnce } from './pb-mixin.js';
 import { translate } from "./pb-i18n.js";
+import { registry } from "./urls.js";
 import '@polymer/iron-ajax';
 import '@polymer/paper-dialog';
 import '@polymer/paper-dialog-scrollable';
@@ -250,6 +251,15 @@ export class PbLogin extends pbMixin(LitElement) {
             }
         }
         this.emitTo('pb-login', resp);
+
+        if (this.loggedIn) {
+            registry.currentUser = {
+                user: this.user,
+                groups: this.groups
+            }
+        } else {
+            registry.currentUser = null;
+        }
     }
 
     _handleError() {
@@ -266,6 +276,7 @@ export class PbLogin extends pbMixin(LitElement) {
             this._loginDialog.open();
         }
 
+        registry.currentUser = null;
         this.emitTo('pb-login', resp);
     }
 

package/src/pb-restricted.js

@@ -1,6 +1,41 @@
 import { LitElement, html, css } from 'lit-element';
 import { pbMixin } from './pb-mixin.js';
+import { registry } from './urls.js';
 
+/**
+ * 
+ * @param {Array<String>} arr array containg string values (name of groups)
+ * @param {String} val value to check if it's in the array
+ * @returns true if the checked values is in the array
+ */
+function _isItemInArray(arr, val) {
+    return arr.some((arrVal) => val === arrVal);
+}
+
+/**
+ * 
+ * @param {object} user user name returned by login function; 
+ * @param {object} groups contains groups (an array) the logged user is a member of
+ * @param {string} targetGroups string containing (optionally) space separated list of target groups
+ * @returns true if user is member of one of the target groups
+ */
+export function isLoggedIn(user, groups, targetGroups) {
+    if (user == null) {
+        return false;
+    }
+    if (targetGroups) {
+        if (!groups) {
+            return false;
+        }
+        const groupArray = targetGroups.split(/[\s+,]+/);
+        let exists = false;
+        groupArray.forEach(async (oneItem) => {
+            exists = _isItemInArray(groups, oneItem) || exists;
+        });
+        return exists;
+    }
+    return true;
+}
 
 /**
  * Show content if the user is logged in. Optionally requires the user
@@ -18,7 +53,9 @@ export class PbRestricted extends pbMixin(LitElement) {
     static get properties() {
         return {
             ...super.properties,
-            /** Id of the pb-login element to connect to */
+            /** Id of the pb-login element to connect to 
+             * @deprecated no longer used
+             */
             login: {
                 type: String
             },
@@ -50,15 +87,10 @@ export class PbRestricted extends pbMixin(LitElement) {
             this.classList.add('fallback');
         }
 
-        const login = document.getElementById(this.login);
-        if (!login) {
-            console.error('<pb-restricted> connected pb-login element not found!');
-            return;
-        }
         this.subscribeTo('pb-login', (ev) => {
             this.show = this._loggedIn(ev.detail.user, ev.detail.groups);
         }, []);
-        this.show = login.loggedIn && this._loggedIn(login.user, login.groups);
+        this.show = registry.currentUser && this._loggedIn(registry.currentUser.user, registry.currentUser.groups);
     }
 
     render() {
@@ -74,43 +106,13 @@ export class PbRestricted extends pbMixin(LitElement) {
             }
 
             :host(.fallback), :host([show]) {
-                display: block;
+                display: inherit;
             }
         `;
     }
 
-    /**
-     * 
-     * @param {Array<String>} arr array containg string values (name of groups)
-     * @param {String} val value to check if it's in the array
-     * @returns true if the checked values is in the array
-     */
-    _isItemInArray(arr, val) {
-        return arr.some((arrVal) => val === arrVal);
-    }
-
-    /**
-     * 
-     * @param {object} user user name returned by login function; 
-     * @param {object} groups contains groups (an array) the logged user is a member of
-     * @returns true if user is member of one of defined groups
-     */
     _loggedIn(user, groups) {
-        if (user == null) {
-            return false;
-        }
-        if (this.group) {
-            if (!groups) {
-                return false;
-            }
-            let groupArray = this.group.split(/[\s+,]+/);
-            let exists = false;
-            groupArray.forEach(async (oneItem) => {
-                exists = this._isItemInArray(groups, oneItem) || exists;
-            });
-            return exists;
-        }
-        return true;
+        return isLoggedIn(user, groups, this.group);
     }
 }
 customElements.define('pb-restricted', PbRestricted);

package/src/urls.js

@@ -69,6 +69,12 @@ class Registry {
 
         this.urlIgnore = new Set();
         this.pathParams = new Set();
+
+        /**
+         * Information about the user currently logged in or null. If a user is logged in
+         * this will be an object with two properties: `user` and `groups`.
+         */
+        this.currentUser = null;
     }
 
     configure(usePath = true, idHash = false, rootPath = '', urlPattern, ignoredParams) {