From a14aa04a6c0f1af66db0fc1a3c5f9174693f9208 Mon Sep 17 00:00:00 2001 From: "arnaud.morvan@camptocamp.com" Date: Wed, 19 Sep 2018 18:16:23 +0200 Subject: [PATCH] Show login form when restricted layers in permalink --- contribs/gmf/apps/desktop/index.html.ejs | 4 ++- contribs/gmf/apps/desktop_alt/index.html.ejs | 1 + contribs/gmf/apps/mobile/index.html.ejs | 1 + contribs/gmf/apps/mobile_alt/index.html.ejs | 1 + .../gmf/src/authentication/component.html | 5 +++ contribs/gmf/src/authentication/component.js | 11 +++++- .../src/controllers/AbstractAppController.js | 34 +++++++++++++++++++ contribs/gmf/src/permalink/Permalink.js | 25 +++++++++++++- 8 files changed, 79 insertions(+), 3 deletions(-) diff --git a/contribs/gmf/apps/desktop/index.html.ejs b/contribs/gmf/apps/desktop/index.html.ejs index 20c10b927bb8..3e0d1442a6d8 100644 --- a/contribs/gmf/apps/desktop/index.html.ejs +++ b/contribs/gmf/apps/desktop/index.html.ejs @@ -100,7 +100,9 @@ {{'Login' | translate}} × - +
diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs index 3a5b6d4ce195..7d9f85a19a52 100644 --- a/contribs/gmf/apps/desktop_alt/index.html.ejs +++ b/contribs/gmf/apps/desktop_alt/index.html.ejs @@ -103,6 +103,7 @@ ×
diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs index 1bb2e5c9cfc1..489aa1ade621 100644 --- a/contribs/gmf/apps/mobile/index.html.ejs +++ b/contribs/gmf/apps/mobile/index.html.ejs @@ -152,6 +152,7 @@ diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs index a7aa8caf8db3..5a4b959cabfd 100644 --- a/contribs/gmf/apps/mobile_alt/index.html.ejs +++ b/contribs/gmf/apps/mobile_alt/index.html.ejs @@ -160,6 +160,7 @@ diff --git a/contribs/gmf/src/authentication/component.html b/contribs/gmf/src/authentication/component.html index a213b578630c..bd9314a841a8 100644 --- a/contribs/gmf/src/authentication/component.html +++ b/contribs/gmf/src/authentication/component.html @@ -107,6 +107,11 @@

+ +
+ {{ $ctrl.infoMessage }} +
+
* * @@ -80,6 +81,7 @@ function gmfAuthenticationTemplateUrl($element, $attrs, gmfAuthenticationTemplat * should also allow the user to change its password. Don't add this option alone, use * it in a dedicated authentication component, in a ngeo-modal, directly in * your index.html (see example 2.) + * @htmlAttribute {string} gmf-authentication-info-message Message to show above the authentication form. * * Example 2: * @@ -107,7 +109,8 @@ exports.component_ = { 'allowPasswordReset': ' { + /** @type {angularGettext.Catalog} */ + const gettextCatalog = $injector.get('gettextCatalog'); + this.loginInfoMessage = gettextCatalog.getString( + 'Some layers in this link are not accessible to unauthenticated users. ' + + 'Please log in to see whole data.'); + this.loginRedirectUrl = args.url; + this.loginActive = true; + + const unbind = $scope.$watch(() => this.loginActive, () => { + if (!this.loginActive) { + this.loginInfoMessage = null; + this.loginRedirectUrl = null; + unbind(); + } + }); + }); + /** * @param {gmfx.AuthenticationEvent} evt Event. */ const userChange = (evt) => { + if (this.loginRedirectUrl) { + window.location = this.loginRedirectUrl; + return; + } const user = evt.detail.user; const roleId = (user.username !== null) ? user.role_id : undefined; diff --git a/contribs/gmf/src/permalink/Permalink.js b/contribs/gmf/src/permalink/Permalink.js index f5e6445fe6b3..5678e697e17a 100644 --- a/contribs/gmf/src/permalink/Permalink.js +++ b/contribs/gmf/src/permalink/Permalink.js @@ -62,12 +62,13 @@ import olLayerGroup from 'ol/layer/Group.js'; * @param {ngeo.misc.EventHelper} ngeoEventHelper Ngeo event helper service * @param {ngeo.statemanager.Service} ngeoStateManager The ngeo statemanager service. * @param {ngeo.statemanager.Location} ngeoLocation ngeo location service. + * @param {gmfx.User} gmfUser User. * @ngInject * @ngdoc service * @ngname gmfPermalink */ const exports = function($q, $timeout, $rootScope, $injector, ngeoDebounce, gettextCatalog, ngeoEventHelper, - ngeoStateManager, ngeoLocation) { + ngeoStateManager, ngeoLocation, gmfUser) { /** * @type {!angular.$q} @@ -216,6 +217,12 @@ const exports = function($q, $timeout, $rootScope, $injector, ngeoDebounce, gett this.gmfTreeManager_ = $injector.has('gmfTreeManager') ? $injector.get('gmfTreeManager') : null; + /** + * @type {gmfx.User} + * @private + */ + this.user_ = gmfUser; + // == other properties == /** @@ -467,6 +474,7 @@ const exports = function($q, $timeout, $rootScope, $injector, ngeoDebounce, gett this.initLayers_(); }; + // === Map X, Y, Z === /** @@ -910,6 +918,9 @@ exports.prototype.defaultThemeNameFromFunctionalities = function() { * @private */ exports.prototype.initLayers_ = function() { + const initialUri = window.location.href; + let authenticationRequired = false; + if (!this.gmfThemes_) { return; } @@ -939,6 +950,8 @@ exports.prototype.initLayers_ = function() { const group = gmfThemeThemes.findGroupByName(themes, groupName); if (group) { firstLevelGroups.push(group); + } else { + authenticationRequired = true; } }); } @@ -984,9 +997,15 @@ exports.prototype.initLayers_ = function() { treeCtrl.traverseDepthFirst((treeCtrl) => { if (treeCtrl.node.children === undefined) { const enable = olArray.includes(groupLayersArray, treeCtrl.node.name); + if (enable) { + groupLayersArray.splice(groupLayersArray.indexOf(treeCtrl.node.name), 1); + } treeCtrl.setState(enable ? 'on' : 'off', false); } }); + if (groupLayersArray.length > 0) { + authenticationRequired = true; + } } } }); @@ -999,6 +1018,10 @@ exports.prototype.initLayers_ = function() { } }); }); + + if (authenticationRequired && this.user_.role_id === null) { + this.rootScope_.$broadcast('authenticationrequired', {url: initialUri}); + } }); }); };