@mindline/sync 1.0.70 → 1.0.72

package/.vs/sync/v17/DocumentLayout.json

@@ -2,14 +2,14 @@
   "Version": 1,
   "WorkspaceRootPath": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\",
   "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.d.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:index.d.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}"
-    },
     {
       "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}",
       "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:index.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}"
     },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.d.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:index.d.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}"
+    },
     {
       "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\hybridspa.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}",
       "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:hybridspa.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}"
@@ -60,7 +60,7 @@
         },
         {
           "DockedWidth": 200,
-          "SelectedChildIndex": 2,
+          "SelectedChildIndex": 1,
           "Children": [
             {
               "$type": "Document",
@@ -70,33 +70,32 @@
               "RelativeDocumentMoniker": "hybridspa.ts",
               "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\hybridspa.ts",
               "RelativeToolTip": "hybridspa.ts",
-              "ViewState": "AQIAAOcAAAAAAAAAAAAwwBEBAAAHAAAA",
+              "ViewState": "AQIAANwAAAAAAAAAAAAYwOgAAAAjAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
-              "WhenOpened": "2023-11-25T02:18:34.862Z",
-              "EditorCaption": ""
+              "WhenOpened": "2023-11-25T02:18:34.862Z"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 0,
               "Title": "index.ts",
               "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.ts",
               "RelativeDocumentMoniker": "index.ts",
               "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.ts",
               "RelativeToolTip": "index.ts",
-              "ViewState": "AQIAANgAAAAAAAAAAAAwwO4AAAANAAAA",
+              "ViewState": "AQIAAPwGAAAAAAAAAAAcwCwHAAAFAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2023-12-05T02:10:16.04Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 0,
+              "DocumentIndex": 1,
               "Title": "index.d.ts",
               "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.d.ts",
               "RelativeDocumentMoniker": "index.d.ts",
               "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.d.ts",
               "RelativeToolTip": "index.d.ts",
-              "ViewState": "AQIAAGkAAAAAAAAAAAAwwH8AAAAIAAAA",
+              "ViewState": "AQIAABMBAAAAAAAAAAAEwCsBAAAEAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2024-01-01T16:19:43.325Z",
               "EditorCaption": ""

package/index.d.ts

@@ -276,7 +276,7 @@ declare module "@mindline/sync" {
     export function signInIncrementally(user: User, scope: string): void;
     export function signOut(user: User): boolean;
     export function tenantRelationshipsGetByDomain(loggedInuser: User, tenant: Tenant, instance: IPublicClientApplication, debug: boolean): boolean;
-    export function tenantRelationshipsGetById(user: User, ii: InitInfo, instance: IPublicClientApplication, debug: boolean): boolean;
+    export function tenantRelationshipsGetById(loggedInUser: User, tenant: Tenant, ii: InitInfo, instance: IPublicClientApplication, debug: boolean): boolean;
     export function tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean): boolean;
     export function userDelegatedScopesGet(instance: IPublicClientApplication, loggedInUser: User, tenant: Tenant): { scopes: string, id: string, error: string };
     export function userDelegatedScopesRemove(instance: IPublicClientApplication, loggedInUser: User, tenant: Tenant, scope: string): boolean;
@@ -297,7 +297,7 @@ declare module "@mindline/sync" {
         debug: boolean): APIResult;
     export function configRemove(instance: IPublicClientApplication, authorizedUser: User, config: Config, workspaceId: string, debug: boolean): APIResult;
     export function configsRefresh(instance: IPublicClientApplication, authorizedUser: User, workspaceId: string, ii: InitInfo, debug: boolean): APIResult;
-    export function initGet(instance: IPublicClientApplication, authorizedUser: User, user: User, ii: InitInfo, tasks: TaskArray, debug: boolean): APIResult;
+    export function initGet(instance: IPublicClientApplication, user: User, ii: InitInfo, tasks: TaskArray, debug: boolean): APIResult;
     export function tenantAdd(instance: IPublicClientApplication, authorizedUser: User, tenant: Tenant, workspaceId: string): APIResult;
     export function tenantRemove(instance: IPublicClientApplication, authorizedUser: User, tenant: Tenant, workspaceId: string, debug: boolean): APIResult;
     export function userAdd(instance: IPublicClientApplication, authorizedUser: User, user: User, workspaceId: string): APIResult;

package/index.ts

@@ -1526,17 +1526,15 @@ export async function tenantRelationshipsGetByDomain(loggedInUser: User, tenant:
     return false; // failed, no need for UX to re-render
 }
 //tenantRelationshipsGetById - query AAD for associated company name and domain
-export async function tenantRelationshipsGetById(user: User, ii: InitInfo, instance: IPublicClientApplication, debug: boolean): Promise<boolean> {
+export async function tenantRelationshipsGetById(loggedInUser: User, tenant: Tenant, ii: InitInfo, instance: IPublicClientApplication, debug: boolean): Promise<boolean> {
     console.log("**** tenantRelationshipsGetById");
     if (debug) debugger;
-    // since we should mainly be called when a user has newly logged in, we can afford the performance hit of looking up the tenant name and domain again
-    // if (user.companyName != "") return false;
     // if needed, retrieve and cache access token
-    if (user.accessToken === "") {
+    if (loggedInUser.accessToken === "") {
         try {
-            let response: AuthenticationResult = await instance.acquireTokenByCode({ code: user.spacode });
-            user.accessToken = response.accessToken; // cache access token
-            console.log("tenantRelationshipsGetById: Front end token acquired: " + user.accessToken.slice(0, 20));
+            let response: AuthenticationResult = await instance.acquireTokenByCode({ code: loggedInUser.spacode });
+            loggedInUser.accessToken = response.accessToken; // cache access token
+            console.log("tenantRelationshipsGetById: Front end token acquired: " + loggedInUser.accessToken.slice(0, 20));
         }
         catch (error: any) {
             console.log("tenantRelationshipsGetById: Front end token failure: " + error);
@@ -1545,25 +1543,21 @@ export async function tenantRelationshipsGetById(user: User, ii: InitInfo, insta
     }
     // prepare Authorization headers as part of options
     const headers = new Headers();
-    const bearer = `Bearer ${user.accessToken}`;
+    const bearer = `Bearer ${loggedInUser.accessToken}`;
     headers.append("Authorization", bearer);
     let options = { method: "GET", headers: headers };
     // make tenant endpoint call
     try {
         // create tenant info endpoint
-        var tenantEndpoint = getGraphEndpoint(user.authority) + graphConfig.graphTenantByIdPredicate;
+        var tenantEndpoint = getGraphEndpoint(loggedInUser.authority) + graphConfig.graphTenantByIdPredicate;
         tenantEndpoint += "(tenantId='";
-        tenantEndpoint += user.tid;
+        tenantEndpoint += tenant.tid;
         tenantEndpoint += "')";
         console.log("tenantRelationshipsGetById: Attempting GET from /findTenantInformationByTenantId:", tenantEndpoint);
         let response = await fetch(tenantEndpoint, options);
         let data = await response.json();
         if (data && typeof data.displayName !== undefined && data.displayName !== "") {
-            // set domain information on user
-            user.companyName = data.displayName;
-            user.companyDomain = data.defaultDomainName;
             // set domain information on tenant
-            let tenant: Tenant | undefined = ii.ts.find((t) => t.tid === user.tid);
             if (tenant !== undefined) {
                 tenant.name = data.displayName;
                 tenant.domain = data.defaultDomainName;
@@ -1799,12 +1793,13 @@ export async function configsRefresh(instance: IPublicClientApplication, authori
     result.status = 500;
     return result;
 }
-export async function initGet(instance: IPublicClientApplication, authorizedUser: User, user: User, ii: InitInfo, tasks: TaskArray, debug: boolean): Promise<APIResult> {
+export async function initGet(instance: IPublicClientApplication, user: User, ii: InitInfo, tasks: TaskArray, debug: boolean): Promise<APIResult> {
     console.log(`>>>>>> initGet`);
     let result: APIResult = new APIResult();
     if (debug) debugger;
     // lookup authority for this user (the lookup call does it based on domain, but TID works as well to find authority)
     let tenant: Tenant = new Tenant();
+    tenant.tid = user.tid;
     tenant.domain = user.tid;
     let bResult: boolean = await tenantUnauthenticatedLookup(tenant, debug);
     if (bResult) {
@@ -1815,18 +1810,20 @@ export async function initGet(instance: IPublicClientApplication, authorizedUser
         if (loggedInUser != null) {
             // get tenant name and domain from AAD to pass to Configuration API
             tasks.setTaskStart("GET tenant details", new Date());
-            result.result = await tenantRelationshipsGetById(user, ii, instance, debug);
+            result.result = await tenantRelationshipsGetById(user, tenant, ii, instance, debug);
             tasks.setTaskEnd("GET tenant details", new Date(), "complete");
-            // if this is the first time, we have just gotten tenant info, then we must POST user and tenant to back end
+            // store tenant name and domain on user, POST user and tenant to back end
             if (result.result) {
+                user.companyName = tenant.name;
+                user.companyDomain = tenant.domain;
                 tasks.setTaskStart("POST config init", new Date());
-                result = await initPost(instance, authorizedUser, user, debug);
+                result = await initPost(instance, loggedInUser, user, debug);
                 tasks.setTaskEnd("POST config init", new Date(), result.result ? "complete" : "failed");
             }
             // simlarly, if we just did our first post, then query config backend for workspace(s) associated with this user
             if (result.result) {
                 tasks.setTaskStart("GET workspaces", new Date());
-                result = await workspaceInfoGet(instance, authorizedUser, user, ii, debug);
+                result = await workspaceInfoGet(instance, loggedInUser, user, ii, debug);
                 tasks.setTaskEnd("GET workspaces", new Date(), result.result ? "complete" : "failed");
             }
             console.log("initGet complete. Version: " + version);

package/package.json

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