fix TTA-83: Returning to login functions to subscribe

Author: Rodrigo Lins

src/app/modules/login/login.component.ts

@@ -7,7 +7,7 @@ import { SocialAuthService, SocialUser } from 'angularx-social-login';
 import { environment } from 'src/environments/environment';
 import { EnvironmentType } from 'src/environments/enum';
 import { LoginService } from './services/login.service';
-import { map } from 'rxjs/operators';
+import {   tap } from 'rxjs/operators';
 @Component({
   selector: 'app-login',
   templateUrl: './login.component.html',
@@ -42,30 +42,26 @@ export class LoginComponent implements OnInit {
   }
 
   login() {
-    return this.azureAdB2CService.isLogin().pipe(
-      map(isLogin => {
-        if (isLogin) {
+    this.azureAdB2CService.isLogin().subscribe(isLogin => {
+      if (isLogin) {
+        this.router.navigate(['']);
+      } else {
+        this.azureAdB2CService.signIn().subscribe(() => {
+          this.featureToggleCookiesService.setCookies();
+          this.azureAdB2CService.setCookies();
           this.router.navigate(['']);
-        } else {
-          this.azureAdB2CService.signIn().subscribe(() => {
-            this.featureToggleCookiesService.setCookies();
-            this.azureAdB2CService.setCookies();
-            this.router.navigate(['']);
-          });
-        }
-      })
-    );
+        });
+      }
+    });
   }
 
   loginWithGoogle() {
-    return this.loginService.isLogin().pipe(
-      map(isLogin => {
-        if (isLogin) {
-          this.router.navigate(['']);
-        } else {
-          this.loginService.signIn();
-        }
-      })
-    );
+    this.loginService.isLogin().subscribe(isLogin => {
+      if (isLogin) {
+        this.router.navigate(['']);
+      } else {
+        this.loginService.signIn();
+      }
+    });
   }
 }

src/app/modules/user/services/user-info.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { JwtHelperService } from '@auth0/angular-jwt';
+import { Observable, of } from 'rxjs';
 import { GROUPS } from '../../../../environments/environment';
 
 import { LoginService } from '../../login/services/login.service';