@mindline/sync 1.0.23 → 1.0.25

package/hybridspa.ts

@@ -88,42 +88,36 @@ function seeProfile(spaCode: string,  instance: IPublicClientApplication) {
 export function getTenantInfo(user: User, instance: IPublicClientApplication) {
   debugger;
 
-  let authResult: AuthenticationResult;
   instance
     .acquireTokenByCode({ code: user.spacode })
-    .then((result) => (authResult = result))
+    .then((result) => {
+      // prepare access token in Authorization headers as part of options
+      const headers = new Headers();
+      const bearer = `Bearer ${result.accessToken}`;
+      headers.append("Authorization", bearer);
+      const options = {
+        method: "GET",
+        headers: headers,
+      };
+      // prepare tenant info endpoint
+      var tenantEndpoint = graphConfig.graphTenantEndpoint;
+      tenantEndpoint += "(tenantId='";
+      tenantEndpoint += user.tid;
+      tenantEndpoint += "')";
+      console.log(
+        "request made to Graph API tenant endpoint at: " + new Date().toString()
+      );
+      // make tenant endpoint call
+      fetch(tenantEndpoint, options)
+        .then((response) => response.json())
+        .then((body) => {
+          console.log("Successfully Fetched Data from Graph API:", body);
+          user.companyName = body.displayName;
+          user.companyDomain = body.defaultDomainName;
+        })
+        .catch((error) => console.log(error));
+    })
     .catch((e: any) => {
       console.log(e);
     });
-  const headers = new Headers();
-  const bearer = `Bearer ${authResult.accessToken}`;
-  headers.append("Authorization", bearer);
-
-  const options = {
-    method: "GET",
-    headers: headers,
-  };
-
-  var tenantEndpoint = graphConfig.graphTenantEndpoint;
-  tenantEndpoint += "(tenantId='";
-  tenantEndpoint += user.tid;
-  tenantEndpoint += "')";
-
-  console.log(
-    "request made to Graph API tenant endpoint at: " + new Date().toString()
-  );
-
-  let r = null;
-  fetch(tenantEndpoint, options)
-    .then((response) => response.json())
-    .then((response) => {
-      r = response;
-      console.log("Successfully Fetched Data from Graph API:", response);
-    })
-    .catch((error) => console.log(error));
-
-  if(r!==null) {
-    user.companyName = r.displayName;
-    user.companyDomain = r.defaultDomainName;
-  }
 }

package/index.ts

@@ -206,9 +206,6 @@ function DummyInit(ii: InitInfo)
     //      Returns: users, targets, configs for each workspace
 export function InitGet(ii: InitInfo, instance: IPublicClientApplication, debug: boolean): boolean
 {
-  if(debug)
-    debugger;
-
   // if empty user array, retrieve dummy data from JSON to populate UI
   let l = ii.us.length;
   if(l === 0) return DummyInit(ii);
@@ -217,15 +214,15 @@ export function InitGet(ii: InitInfo, instance: IPublicClientApplication, debug:
   let user:User = ii.us[l-1];
   if(user.oid === "1") return true;
 
-  // have real user: remove dummy user, target, config, workspace if they exist
+  // have real user: remove any dummy user, target, config, workspace if they exist
   let dummyIndex = ii.us.findIndex((u) => u.oid === "1");
-  ii.us.splice(dummyIndex, 1);
+  if(dummyIndex!==-1) ii.us.splice(dummyIndex, 1);
   dummyIndex = ii.ts.findIndex((u) => u.tid === "1");
-  ii.ts.splice(dummyIndex, 1);
+  if(dummyIndex!==-1) ii.ts.splice(dummyIndex, 1);
   dummyIndex = ii.cs.findIndex((u) => u.id === "1");
-  ii.cs.splice(dummyIndex, 1);
+  if(dummyIndex!==-1) ii.cs.splice(dummyIndex, 1);
   dummyIndex = ii.ws.findIndex((u) => u.id === "1");
-  ii.ws.splice(dummyIndex, 1);
+  if(dummyIndex!==-1) ii.ws.splice(dummyIndex, 1);
 
   // why would instance be null here? investigate!
   if(instance===null) {
@@ -234,6 +231,7 @@ export function InitGet(ii: InitInfo, instance: IPublicClientApplication, debug:
   }
 
   // valid user, query AAD for associated company name and domain
+  if(debug) debugger;
   getTenantInfo(user, instance);
   return true;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mindline/sync",
   "type": "module",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "types": "index.d.ts",
   "exports": "./index.ts",
   "description": "sync is a node.js package encapsulating javscript classes required for configuring Mindline sync service.",