Merge remote-tracking branch 'origin/bugfix/10.5.17/Unable-to-change-status-to-complete-if-observations-contain-french-characters' into bugfix/10.5.17/Unable-to-change-status-to-complete-if-observations-contain-french-characters

Author: mjabascal10

CHANGELOG.md

@@ -2,3 +2,5 @@
 ## Bugfix
 -Fixed unable-to-change-status-to-complete-if-observations-contain-french-characters.
 -Fixed Elastic filter time adds unnecessary /d to intervals in Log Explorer
+-Fixed handle special characters in password query parameter
+

frontend/src/app/core/auth/user-route-access-service.ts

@@ -9,7 +9,6 @@ import {StateStorageService} from './state-storage.service';
 export class UserRouteAccessService implements CanActivate {
   constructor(
     private router: Router,
-    private loginModalService: ModalService,
     private accountService: AccountService,
     private stateStorageService: StateStorageService
   ) {
@@ -23,30 +22,23 @@ export class UserRouteAccessService implements CanActivate {
     return this.checkLogin(authorities, state.url);
   }
 
-  checkLogin(authorities: string[], url: string): Promise<boolean> {
-    return this.accountService.identity().then(account => {
-      if (!authorities || authorities.length === 0) {
-        return false;
+  async checkLogin(authorities: string[], url: string): Promise<boolean> {
+    const account = await this.accountService.identity();
+    if (!authorities || authorities.length === 0) {
+      return false;
+    }
+    if (account) {
+      const hasAnyAuthority = this.accountService.hasAnyAuthority(authorities);
+      if (hasAnyAuthority) {
+        return true;
       }
-      if (account) {
-        const hasAnyAuthority = this.accountService.hasAnyAuthority(authorities);
-        if (hasAnyAuthority) {
-          return true;
-        }
-        if (isDevMode()) {
-          console.error('User has not any of required authorities: ', authorities);
-        }
-        return false;
+      if (isDevMode()) {
+        console.error('User has not any of required authorities: ', authorities);
       }
-
+      return false;
+    } else {
       this.stateStorageService.storeUrl(url);
-      this.router.navigate(['/dashboard/overview']).then(() => {
-        // only show the login dialog, if the user hasn't logged in yet
-        if (!account) {
-          // this.loginModalService.open();
-        }
-      });
       return false;
-    });
+    }
   }
 }

frontend/src/app/shared/components/auth/login/login.component.ts

@@ -1,4 +1,4 @@
-import {AfterViewInit, Component, OnInit} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {DomSanitizer} from '@angular/platform-browser';
 import {ActivatedRoute, Router} from '@angular/router';
@@ -14,6 +14,7 @@ import {ThemeChangeBehavior} from '../../../behaviors/theme-change.behavior';
 import {ADMIN_DEFAULT_EMAIL, ADMIN_ROLE, DEMO_URL, USER_ROLE} from '../../../constants/global.constant';
 import {stringParamToQueryParams} from '../../../util/query-params-to-filter.util';
 import {PasswordResetInitComponent} from '../password-reset/init/password-reset-init.component';
+import {StateStorageService} from "../../../../core/auth/state-storage.service";
 
 @Component({
   selector: 'app-login',
@@ -48,7 +49,8 @@ export class LoginComponent implements OnInit {
     private modalService: NgbModal,
     private themeChangeBehavior: ThemeChangeBehavior,
     private spinner: NgxSpinnerService,
-    private apiServiceCheckerService: ApiServiceCheckerService
+    private apiServiceCheckerService: ApiServiceCheckerService,
+    private stateStorageService: StateStorageService
   ) {
     this.credentials = {};
     this.isInDemo = window.location.href.includes(DEMO_URL);
@@ -166,8 +168,9 @@ export class LoginComponent implements OnInit {
   startNavigation() {
     this.accountService.identity(true).then(account => {
       if (account) {
+        const url = this.stateStorageService.getUrl();
         const redirectTo = (account.authorities.includes(ADMIN_ROLE) && account.email === ADMIN_DEFAULT_EMAIL)
-          ? '/getting-started' : '/dashboard/overview';
+          ? '/getting-started' : !!url ? url : '/dashboard/overview';
         this.router.navigate([redirectTo])
           .then(() => this.spinner.hide());
       } else {

frontend/src/app/shared/components/utm/util/utm-agent-console/utm-agent-console.component.ts

@@ -198,7 +198,9 @@ export class UtmAgentConsoleComponent implements OnInit, OnDestroy {
 
   checkPassword() {
     const uuid = UUID.UUID();
-    this.accountService.checkPassword(this.pass, uuid).subscribe(response => {
+    const encodedPassword = encodeURIComponent(this.pass);
+    const encodedUUID = encodeURIComponent(uuid);
+    this.accountService.checkPassword(encodedPassword, encodedUUID).subscribe(response => {
       if (response.body !== uuid) {
         this.toast.showError('Invalid check UUID', 'UUID to check your password does not match');
       } else {