@mindline/sync 1.0.25 → 1.0.26

package/hybridspa.ts

@@ -1,5 +1,8 @@
-import { IPublicClientApplication, AuthenticationResult } from '@azure/msal-browser';
-import { User } from '@mindline/sync';
+import {
+  IPublicClientApplication,
+  AuthenticationResult,
+} from "@azure/msal-browser";
+import { User } from "@mindline/sync";
 
 // Add here the endpoints for MS Graph API services you would like to use.
 const graphConfig = {
@@ -25,9 +28,9 @@ function updateUI(data, endpoint) {
       data.value.map((d, i) => {
         // Keeping it simple
         if (i < 10) {
-            console.log(data.officeLocation);
-            console.log(d.subject);
-            console.log(d.from.emailAddress.address);
+          console.log(data.officeLocation);
+          console.log(d.subject);
+          console.log(d.from.emailAddress.address);
         }
       });
     }
@@ -74,7 +77,7 @@ function getTokenByCode(spaCode: string, instance: IPublicClientApplication) {
 }
 
 //See Profile
-function seeProfile(spaCode: string,  instance: IPublicClientApplication) {
+function seeProfile(spaCode: string, instance: IPublicClientApplication) {
   getTokenByCode(spaCode, instance)
     .then((response) => {
       callMSGraph(graphConfig.graphMeEndpoint, response.accessToken, updateUI);
@@ -85,39 +88,49 @@ function seeProfile(spaCode: string,  instance: IPublicClientApplication) {
 }
 
 //Get Tenant Info
-export function getTenantInfo(user: User, instance: IPublicClientApplication) {
+export async function getTenantInfo(user: User, instance: IPublicClientApplication) {
   debugger;
 
-  instance
-    .acquireTokenByCode({ code: user.spacode })
-    .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);
-    });
-}
+  // do we already have it?
+  if(user.companyName != "" && user.companyDomain != "") return;
+
+  // create tenant info endpoint
+  var tenantEndpoint = graphConfig.graphTenantEndpoint;
+  tenantEndpoint += "(tenantId='";
+  tenantEndpoint += user.tid;
+  tenantEndpoint += "')";
+  console.log("Time: " + new Date().toString());
+  console.log("Tenant Info Endpoint: " + tenantEndpoint);
+
+  // if needed, retrieve and cache access token
+  if (user.accessToken === "") {
+    try {
+      let response = await instance.acquireTokenByCode({ code: user.spacode });
+      user.accessToken = response.accessToken;
+    }
+    catch(error: any) {
+      console.log(error);
+    }
+  }
+  
+  // prepare Authorization headers as part of options
+  const headers = new Headers();
+  const bearer = `Bearer ${user.accessToken}`;
+  headers.append("Authorization", bearer);
+  const options = { method: "GET", headers: headers };
+  
+  // make tenant endpoint call
+  try {
+    let response = await fetch(tenantEndpoint, options);
+    let data = await response.json();
+    if(data.displayName !== undefined)
+    {
+      user.companyName = data.displayName;
+      user.companyDomain = data.defaultDomainName;
+    }
+    console.log("Fetched Data from Graph API:", data);
+  }
+  catch(error: any) {
+    console.log(error);
+  }
+}

package/index.d.ts

@@ -17,6 +17,7 @@ declare module "@mindline/sync" {
     workspaceIDs: string;
     session: string;
     spacode: string;
+    accessToken: string;
   }
 
   // target (Azure AD tenant, AD domain, Google workspace)

package/index.test.ts

@@ -7,6 +7,6 @@ test("adds 1 + 2 to equal 3", () => {
 });
 test("loads config based on a user and expects function to return true", () => {
   let ii = new InitInfo();
-  let bResult:boolean = InitGet(ii, stubbedPublicClientApplication);
+  let bResult:boolean = InitGet(ii, stubbedPublicClientApplication, true);
   expect(bResult);
 });

package/index.ts

@@ -30,6 +30,7 @@ class User {
   workspaceIDs: string;
   session: string;
   spacode: string;
+  accessToken: string;
   constructor() {
     this.oid = "";
     this.name = "";
@@ -42,6 +43,7 @@ class User {
     this.workspaceIDs = "";
     this.session = "";
     this.spacode = "";
+    this.accessToken = "";
   }
 }
 
@@ -214,7 +216,7 @@ 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 any dummy user, target, config, workspace if they exist
+  // we have a real user: remove existing dummy user, target, config, workspace
   let dummyIndex = ii.us.findIndex((u) => u.oid === "1");
   if(dummyIndex!==-1) ii.us.splice(dummyIndex, 1);
   dummyIndex = ii.ts.findIndex((u) => u.tid === "1");

package/package.json

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