Moving graph token out of initialization to be called on demand (#2487)

* Moving graph token to be loaded on demand rather than at initialization time

* adding first to subscription so unsubscribe happens and cleans up

Author: hartra344

AzureFunctions.AngularClient/src/app/aad-registration/aad-registration.component.ts

@@ -64,10 +64,13 @@ export class AadRegistrationComponent extends FunctionAppContextComponent implem
     }
 
     ngOnInit() {
-        this._portalService.getStartupInfo().first().subscribe(info => {
-            this.graphToken = info.graphToken;
-            this.setModel();
-        });
+        this._portalService.getAdToken('graph')
+            .subscribe(tokenData => {
+                this.graphToken = tokenData.result.token;
+            },
+            err => {
+                this.processError(err, "Error retrieving graph yoken")
+            });
     }
 
     openAuth() {

AzureFunctions.AngularClient/src/app/shared/models/portal-resources.ts

@@ -650,9 +650,6 @@
     public static keysDialog_getFunctionUrl: string = "keysDialog_getFunctionUrl";
     public static keysDialog_key: string = "keysDialog_key";
     public static keysDialog_url: string = "keysDialog_url";
-    public static keysDialog_domain: string = "keysDialog_domain";
-    public static keysDialog_warning: string = "keysDialog_warning";
-    public static keysDialog_noHttps: string = "keysDialog_noHttps";
     public static downloadFunctionAppContent: string = "downloadFunctionAppContent";
     public static functionKeys_renewConfirmation: string = "functionKeys_renewConfirmation";
     public static emptyBrowse: string = "emptyBrowse";

AzureFunctions.AngularClient/src/app/shared/models/portal.ts

@@ -22,7 +22,6 @@ export interface StartupInfo {
     acceptLanguage: string;
     effectiveLocale: string;
     resourceId: string;
-    graphToken: string;
     theme: string;
     crmInfo?: CrmInfo;
     armEndpoint?: string;
@@ -198,3 +197,9 @@ export enum PartSize {
      */
     Custom = 99,
 }
+
+
+export interface TokenResponse { 
+    tokenType: 'graph' | 'azureTfsApi';
+    token: string
+}

AzureFunctions.AngularClient/src/app/shared/services/portal.service.ts

@@ -143,6 +143,33 @@ export class PortalService {
         this.postMessage(Verbs.openBladeCollectorInputs, JSON.stringify(payload));
         return this.operationStream
             .filter(o => o.operationId === operationId)
+            .first()
+            .switchMap((o: DataMessage<BladeResult>) => {
+                if (o.data.status === 'success') {
+                    return Observable.of(o.data);
+                } else if (o.data.status === 'cancelled') {
+                    return Observable.of(null);
+                } else {
+                    return Observable.throw(o.data);
+                }
+            });
+    }
+
+    getAdToken(tokenType: 'graph' | 'azureTfsApi'){
+        this.logAction('portal-service', `get-ad-token: ${tokenType}`, null);
+        const operationId = Guid.newGuid();
+
+        const payload = {
+            operationId: operationId,
+            data: {
+                tokenType: tokenType
+            }
+        }
+
+        this.postMessage('get-ad-token', JSON.stringify(payload));
+        return this.operationStream
+            .filter(o=> o.operationId === operationId)
+            .first()
             .switchMap((o: DataMessage<BladeResult>) => {
                 if (o.data.status === 'success') {
                     return Observable.of(o.data);

AzureFunctions.AngularClient/src/app/shared/services/user.service.ts

@@ -43,7 +43,6 @@ export class UserService {
 
         this._startupInfo = {
             token: null,
-            graphToken: null,
             subscriptions: null,
             sessionId: null,
             acceptLanguage: null,
@@ -131,7 +130,6 @@ export class UserService {
                 .subscribe(r => {
                     const info = {
                         token: token,
-                        graphToken: this._startupInfo.graphToken,
                         subscriptions: r.subs,
                         sessionId: this._startupInfo.sessionId,
                         acceptLanguage: this._startupInfo.acceptLanguage,