refactor: way to change region and profile, now session flow is managed more clearly

Author: urz9999

src/app/services/credentials.service.ts

@@ -67,14 +67,12 @@ export class CredentialsService extends NativeService {
 
   refreshCredentials() {
     // Get all the info we need
-    const workspace = this.configurationService.getDefaultWorkspaceSync();
-
     if (!this.refreshStrategySubcribeAll) {
       this.refreshStrategySubcribeAll = true;
       concat(
-        this.awsStrategy.refreshCredentials(workspace),
-        this.azureStrategy.refreshCredentials(workspace),
-        this.awsSsoStrategy.refreshCredentials(workspace)
+        this.awsStrategy.refreshCredentials(this.configurationService),
+        this.azureStrategy.refreshCredentials(this.configurationService),
+        this.awsSsoStrategy.refreshCredentials(this.configurationService)
       ).subscribe(
         () => {
           this.appService.redrawList.emit(true);

src/app/services/workspace.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from '@angular/core';
+import {EventEmitter, Injectable} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {AppService, LoggerLevel, ToastLevel} from '../services-system/app.service';
 import {NativeService} from '../services-system/native-service';
@@ -13,9 +13,15 @@ import {ProxyService} from './proxy.service';
 import {environment} from '../../environments/environment';
 import {KeychainService} from '../services-system/keychain.service';
 import {SessionService} from './session.service';
+import {CredentialsService} from './credentials.service';
 
 // Import AWS node style
 const AWS = require('aws-sdk');
+
+export enum SessionStatus {
+  ERROR
+}
+
 @Injectable({
   providedIn: 'root'
 })
@@ -259,7 +265,7 @@ export class WorkspaceService extends NativeService {
           // Something went wrong save it to the logger file
           this.appService.logger(err.code, LoggerLevel.ERROR, this);
           this.appService.logger(err.stack, LoggerLevel.ERROR, this);
-          // this.appService.toast('There was a problem assuming role with SAML, please retry', ToastLevel.WARN);
+          this.appService.toast('There was a problem assuming role with SAML, please retry', ToastLevel.WARN);
 
           // Emit ko
           this.appService.refreshReturnStatusEmit.emit(session);

src/app/session/session-card/session-card.component.html

@@ -9,8 +9,8 @@
     </ng-container>
   </div>
   <div class="information-offset" (click)="switchCredentials()">
-    <i class="status-item fas fa-circle {{session.active ? 'active' : 'offline'}}" *ngIf="!session.loading"></i>
-    <i class="status-item far fa-spinner-third fa-spin" *ngIf="session.loading"></i>
+    <i class="status-item fas fa-circle {{session.active ? 'active' : 'offline'}}" *ngIf="!(session.loading && (session.account.type === eAccountType.AWS_SSO))"></i>
+    <i class="status-item far fa-spinner-third fa-spin" *ngIf="session.loading && (session.account.type === eAccountType.AWS_SSO)"></i>
   </div>
 
   <ng-container dropdown placement="right" [autoClose]="true">
@@ -82,7 +82,7 @@
       <ng-select bindLabel="{{session.account.type === eAccountType.AZURE ? 'location' : 'region'}}" bindValue="{{session.account.type === eAccountType.AZURE ? 'location' : 'region'}}" [items]="regionOrLocations" [(ngModel)]="selectedDefaultRegion" placeholder="{{placeholder}}"></ng-select>
 
       <button type="button" (click)="goBack();" class="pull-left disabled">Back</button>
-      <button type="button" (click)="changeDefaultRegion();" [disabled]="!selectedDefaultRegion" [ngClass]="(!selectedDefaultRegion) ? 'pull-right disabled': 'pull-right'">Save</button>
+      <button type="button" (click)="changeRegion();" [disabled]="!selectedDefaultRegion" [ngClass]="(!selectedDefaultRegion) ? 'pull-right disabled': 'pull-right'">Save</button>
     </div>
   </div>
 </ng-template>
@@ -104,7 +104,7 @@
                  placeholder="select a profile"></ng-select>
 
       <button type="button" (click)="goBack();" class="pull-left disabled">Back</button>
-      <button type="button" (click)="changeDefaultProfile();" [disabled]="!selectedProfile" [ngClass]="(!selectedProfile) ? 'pull-right disabled': 'pull-right'">Save</button>
+      <button type="button" (click)="changeProfile();" [disabled]="!selectedProfile" [ngClass]="(!selectedProfile) ? 'pull-right disabled': 'pull-right'">Save</button>
     </div>
   </div>
 </ng-template>

src/app/session/session-card/session-card.component.ts

@@ -248,25 +248,23 @@ export class SessionCardComponent extends AntiMemLeak implements OnInit {
   /**
    * Set the region for the session
    */
-  changeDefaultRegion() {
+  changeRegion() {
     if (this.selectedDefaultRegion) {
-      this.workspace = this.configurationService.getDefaultWorkspaceSync();
-
-      this.workspace.sessions.forEach(session => {
-        if (session.id === this.session.id) {
-          session.account.region = this.selectedDefaultRegion;
-          this.session.account.region = this.selectedDefaultRegion;
-          this.configurationService.updateWorkspaceSync(this.workspace);
-
-          this.sessionService.invalidateSessionToken(session);
-
-          if (this.session.active) {
-            this.startSession();
-          } else {
-            this.appService.redrawList.emit(true);
-          }
-        }
-      });
+
+      if (this.session.active) {
+        this.sessionService.stopSession(this.session);
+      }
+
+      this.session.account.region = this.selectedDefaultRegion;
+      this.sessionService.invalidateSessionToken(this.session);
+      this.sessionService.updateSession(this.session);
+
+      if (this.session.active) {
+        this.startSession();
+      } else {
+        this.appService.redrawList.emit(true);
+      }
+
 
       this.appService.toast('Default region has been changed!', ToastLevel.SUCCESS, 'Region changed!');
       this.modalRef.hide();
@@ -321,10 +319,10 @@ export class SessionCardComponent extends AntiMemLeak implements OnInit {
     }
   }
 
-  changeDefaultProfile() {
+  changeProfile() {
     if (this.selectedProfile) {
       if (this.session.active) {
-        this.sessionService.removeFromIniFile(this.session.profile);
+        this.sessionService.stopSession(this.session);
       }
 
       this.sessionService.addProfile(this.selectedProfile);

src/app/shared/tray-menu/tray-menu.component.ts

@@ -49,7 +49,7 @@ export class TrayMenuComponent extends AntiMemLeak implements OnInit {
       let icon = '';
       let label = '';
       const profile = this.configurationService.getDefaultWorkspaceSync().profiles.filter(p => p.id === session.profile)[0];
-      const iconValue = profile.name === 'default' ? 'home' : 'user';
+      const iconValue = (profile && profile.name === 'default') ? 'home' : 'user';
 
       switch (session.account.type) {
         case AccountType.AWS_PLAIN_USER:

src/app/strategies/refreshCredentialsStrategy.ts

@@ -1,9 +1,13 @@
 import {Workspace} from '../models/workspace';
 import {Session} from '../models/session';
 import {concat, Observable, of} from 'rxjs';
+import {CredentialsService} from '../services/credentials.service';
+import {ConfigurationService} from '../services-system/configuration.service';
 
 export abstract class RefreshCredentialsStrategy {
-  refreshCredentials(workspace: Workspace): Observable<any> {
+  refreshCredentials(configurationService: ConfigurationService): Observable<any> {
+    const workspace = configurationService.getDefaultWorkspaceSync();
+
     const activeSessions = this.getActiveSessions(workspace);
 
     // Refresh all active sessions credentials