From 16a52847800589d07569e01bbdf8d540353db612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 26 Feb 2019 13:59:30 +0100 Subject: [PATCH 1/3] Incrase the timeout --- buildtools/check-example.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/check-example.js b/buildtools/check-example.js index 3846e0d2fd85..af7b6818be77 100644 --- a/buildtools/check-example.js +++ b/buildtools/check-example.js @@ -51,7 +51,7 @@ page.onResourceError = function(resourceError) { } }; page.onResourceTimeout = page.onResourceError; -page.settings.resourceTimeout = 2000; +page.settings.resourceTimeout = 4000; page.onUrlChanged = function(url) { console.log('URL changed: ' + url); }; From bdeb87856e243e665911e1de19c99b68b02cc98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 26 Feb 2019 12:56:59 +0100 Subject: [PATCH 2/3] Fix force password change --- contribs/gmf/apps/desktop/index.html.ejs | 3 +- contribs/gmf/apps/mobile/index.html.ejs | 3 +- .../gmf/src/authentication/component.html | 27 ++---------------- contribs/gmf/src/authentication/component.js | 28 +++++++++---------- .../src/controllers/AbstractAppController.js | 22 ++++++++------- 5 files changed, 29 insertions(+), 54 deletions(-) diff --git a/contribs/gmf/apps/desktop/index.html.ejs b/contribs/gmf/apps/desktop/index.html.ejs index 5462748417a9..d22946b91274 100644 --- a/contribs/gmf/apps/desktop/index.html.ejs +++ b/contribs/gmf/apps/desktop/index.html.ejs @@ -280,8 +280,7 @@ + ng-model="mainCtrl.userMustChangeItsPassword">

{{'You must change your password' | translate}} diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs index 470d0222744e..c94b237dac54 100644 --- a/contribs/gmf/apps/mobile/index.html.ejs +++ b/contribs/gmf/apps/mobile/index.html.ejs @@ -157,8 +157,7 @@ + ng-model="mainCtrl.userMustChangeItsPassword">

{{'You must change your password' | translate}} diff --git a/contribs/gmf/src/authentication/component.html b/contribs/gmf/src/authentication/component.html index bd9314a841a8..a8ecc65dc6cb 100644 --- a/contribs/gmf/src/authentication/component.html +++ b/contribs/gmf/src/authentication/component.html @@ -69,41 +69,18 @@ type="button" class="form-control btn btn-default" value="{{'Cancel' | translate}}" - ng-if="!$ctrl.userMustChangeItsPassword()" + ng-if="!$ctrl.userMustChangeItsPassword" ng-click="$ctrl.changePasswordReset()" />

- - -
- -

- {{'Password Changed' | translate}} -

-
-
- {{'Your password has successfully been changed.' | translate}} -
-
- -
-

diff --git a/contribs/gmf/src/authentication/component.js b/contribs/gmf/src/authentication/component.js index 6b3d0799087e..f65359b7e810 100644 --- a/contribs/gmf/src/authentication/component.js +++ b/contribs/gmf/src/authentication/component.js @@ -87,8 +87,7 @@ function gmfAuthenticationTemplateUrl($element, $attrs, gmfAuthenticationTemplat * * + * ng-model="mainCtrl.userMustChangeItsPassword"> *
*

* {{'You must change your password' | translate}} @@ -209,7 +208,7 @@ exports.AuthenticationController_ = class { * @type {boolean} * @export */ - this.changePasswordModalShown = false; + this.userMustChangeItsPassword = false; /** * @type {boolean} @@ -268,6 +267,7 @@ exports.AuthenticationController_ = class { if (this.forcePasswordChange) { this.changingPassword = true; } + this.userMustChangeItsPassword = (this.gmfUser.is_password_changed === false && this.forcePasswordChange); } @@ -319,8 +319,11 @@ exports.AuthenticationController_ = class { // Send request with current credentials, which may fail if the old password given is incorrect. this.gmfAuthenticationService_.changePassword(oldPwd, newPwd, confPwd) .then(() => { - this.changePasswordModalShown = true; this.changePasswordReset(); + this.setError_( + [gettextCatalog.getString('Your password has successfully been changed.')], + ngeoMessageMessage.Type.INFORMATION + ); }) .catch((err) => { this.setError_(gettextCatalog.getString('Incorrect old password.')); @@ -408,20 +411,15 @@ exports.AuthenticationController_ = class { this.newPwdConfVal = ''; } - /** - * @return {boolean} True if the user must change is password and if the "forcePasswordChange" option of - * this component is set to true. - * @export - */ - userMustChangeItsPassword() { - return (this.gmfUser.is_password_changed === false && this.forcePasswordChange); - } - /** * @param {string|Array.} errors Errors. + * @param {ngeoMessageMessage.Type} [messageType] Type. * @private */ - setError_(errors) { + setError_(errors, messageType) { + if (messageType == undefined) { + messageType = ngeoMessageMessage.Type.ERROR; + } if (this.error) { this.resetError_(); } @@ -438,7 +436,7 @@ exports.AuthenticationController_ = class { this.notification_.notify({ msg: error, target: container, - type: ngeoMessageMessage.Type.ERROR + type: messageType }); }, this); } diff --git a/contribs/gmf/src/controllers/AbstractAppController.js b/contribs/gmf/src/controllers/AbstractAppController.js index 8d254a1931bd..33426817ba76 100644 --- a/contribs/gmf/src/controllers/AbstractAppController.js +++ b/contribs/gmf/src/controllers/AbstractAppController.js @@ -129,6 +129,12 @@ const exports = function(config, $scope, $injector) { */ this.loginInfoMessage = null; + /** + * @type {boolean} + * @export + */ + this.userMustChangeItsPassword = false; + $scope.$on('authenticationrequired', (event, args) => { /** @type {angularGettext.Catalog} */ const gettextCatalog = $injector.get('gettextCatalog'); @@ -348,6 +354,12 @@ const exports = function(config, $scope, $injector) { * @export */ this.gmfUser = $injector.get('gmfUser'); + $scope.$watch( + () => this.gmfUser.is_password_changed, + (value) => { + this.userMustChangeItsPassword = value === false; + } + ); /** * @type {ngeox.miscGetBrowserLanguage} @@ -622,16 +634,6 @@ const exports = function(config, $scope, $injector) { }; -/** - * @return {boolean} Return true if a user exists and its 'is_password_changed' value is explicitly set - * to false. - * @export - */ -exports.prototype.userMustChangeItsPassword = function() { - return this.gmfUser.is_password_changed === false; -}; - - /** * @param {Array.} layers Layers list. * @param {Array.} labels default_basemap list. From 4a2a32194c23bac523ceb835cda7fe90594d250c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 26 Feb 2019 10:50:46 +0100 Subject: [PATCH 3/3] Use the new Google API key --- contribs/gmf/apps/desktop_alt/index.html.ejs | 2 +- examples/googlestreetview.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs index 79d59f9c4cb7..fcbc8607a1d1 100644 --- a/contribs/gmf/apps/desktop_alt/index.html.ejs +++ b/contribs/gmf/apps/desktop_alt/index.html.ejs @@ -354,7 +354,7 @@ - + <% for (var chunk in htmlWebpackPlugin.files.chunks) { %> <% } %> diff --git a/examples/googlestreetview.html b/examples/googlestreetview.html index 3eeac4e51b67..a3dc19968763 100644 --- a/examples/googlestreetview.html +++ b/examples/googlestreetview.html @@ -36,7 +36,7 @@

- +