Merge stable to master

Author: timotheeguerin

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.12.1
+
+### Hot fix:
+* Subscriptions not loading if not cached [\#1027](https://github.com/Azure/BatchLabs/issues/1027)
+
 # 0.12.0
 [All items](https://github.com/Azure/BatchLabs/milestone/14?closed=1)
 

app/services/adal/adal.service.spec.ts

@@ -2,6 +2,7 @@ import * as moment from "moment";
 
 import { AdalService } from "app/services/adal";
 import { AccessToken } from "client/core/aad/access-token/access-token.model";
+import { Observable } from "rxjs";
 import { F } from "test/utils";
 
 const tenant1 = "tenant-1";
@@ -18,10 +19,13 @@ const token1 = new AccessToken({
 
 describe("AdalService spec", () => {
     let service: AdalService;
-    const aadServiceSpy = {};
+    let aadServiceSpy;
     let remoteSpy;
 
     beforeEach(() => {
+        aadServiceSpy = {
+            tenantsIds: Observable.of([]),
+        };
         remoteSpy = {
             getBatchLabsApp: () => ({ aadService: aadServiceSpy }),
             send: jasmine.createSpy("accessTokenData").and.returnValue(Promise.resolve(token1)),

app/services/adal/adal.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { Observable } from "rxjs";
+import { BehaviorSubject, Observable } from "rxjs";
 
 import { AADService } from "client/core/aad";
 import { AccessTokenCache } from "client/core/aad/access-token/access-token-cache";
@@ -11,23 +11,27 @@ const defaultResource = Constants.AAD.defaultResource;
 
 @Injectable()
 export class AdalService {
+    public tenantsIds: Observable<string[]>;
+
     private aadService: AADService;
     private tokenCache = new AccessTokenCache();
     private _waitingPromises: StringMap<Promise<AccessToken>> = {};
+    private _tenantsIds = new BehaviorSubject<string[]>([]);
 
     constructor(private remote: ElectronRemote) {
         this.aadService = remote.getBatchLabsApp().aadService;
+        // Need to do this as aadService.tenantIds is in the node processs and electron lose information in the transfer
+        this.aadService.tenantsIds.subscribe((val) => {
+            this._tenantsIds.next(val);
+        });
+        this.tenantsIds = this._tenantsIds.asObservable();
     }
 
     public logout() {
         this.aadService.logout();
         this._waitingPromises = {};
     }
 
-    public get tenantsIds() {
-        return this.aadService.tenantsIds;
-    }
-
     public get currentUser() {
         return this.aadService.currentUser;
     }

package.json

@@ -9,7 +9,7 @@
     "name": "Microsoft Corporation",
     "email": "tiguerin@microsoft.com"
   },
-  "version": "0.12.0",
+  "version": "0.12.1",
   "main": "build/client/main.prod.js",
   "scripts": {
     "ts": "ts-node --project tsconfig.node.json",