Merge pull request #5598 from camptocamp/GSGMF-1241_2fa-form

Fix double factor authentication form when changing password
camptocamp · Mar 9, 2020 · 7438756 · 7438756
2 parents 0b76d12 + adcaedd
commit 7438756
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/contribs/gmf/src/authentication/Service.js b/contribs/gmf/src/authentication/Service.js
@@ -290,7 +290,7 @@ export class AuthenticationService extends olEventsEventTarget {
    */
   handleLogin_(checkingLoginStatus, resp) {
     if (resp.data.is_password_changed === false && this.forcePasswordChange) {
-      const event = new ngeoCustomEvent('mustChangePassword', {username: resp.data.username});
+      const event = new ngeoCustomEvent('mustChangePassword', {user: resp.data});
       this.dispatchEvent(event);
       return;
     }

diff --git a/contribs/gmf/src/authentication/component.html b/contribs/gmf/src/authentication/component.html
@@ -127,7 +127,7 @@
           ng-attr-placeholder="{{'Confirm new password' | translate}}"/>
     </div>
     <div ng-if="$ctrl.gmfUser.otp_uri" class="form-group">
-      <label translate>Two factor authentication barcode:</label>
+      <label translate>Two factor authentication QR code:</label>
       <div><img class="" ng-src="{{$ctrl.otpImage}}"></div>
     </div>
     <div ng-if="$ctrl.gmfUser.two_factor_totp_secret" class="form-group">

diff --git a/contribs/gmf/src/authentication/component.js b/contribs/gmf/src/authentication/component.js
@@ -246,8 +246,9 @@ class AuthenticationController {
     this.userMustChangeItsPassword = false;
 
 
-    listen(gmfAuthenticationService, 'mustChangePassword', (event) => {
-      const username = /** @type {CustomEvent} */ (event).detail.username;
+    listen(gmfAuthenticationService, 'mustChangePassword', event => {
+      const username = /** @type {CustomEvent} */ (event).detail.user.username;
+      this.gmfUser = /** @type {CustomEvent} */ (event).detail.user;
       this.changingPasswordUsername = username;
       this.changingPassword = true;
       this.userMustChangeItsPassword = true;