@mindline/sync 1.0.71 → 1.0.73

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

@@ -2,6 +2,10 @@
   "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\\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}"
+    },
     {
       "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}"
@@ -9,10 +13,6 @@
     {
       "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}"
     }
   ],
   "DocumentGroupContainers": [
@@ -60,46 +60,45 @@
         },
         {
           "DockedWidth": 200,
-          "SelectedChildIndex": 1,
+          "SelectedChildIndex": 0,
           "Children": [
             {
               "$type": "Document",
-              "DocumentIndex": 2,
+              "DocumentIndex": 0,
               "Title": "hybridspa.ts",
               "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\hybridspa.ts",
               "RelativeDocumentMoniker": "hybridspa.ts",
               "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\hybridspa.ts",
               "RelativeToolTip": "hybridspa.ts",
-              "ViewState": "AQIAANwAAAAAAAAAAAAYwOgAAAAjAAAA",
+              "ViewState": "AQIAAAUCAAAAAAAAAAAhwAcCAAAEAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2023-11-25T02:18:34.862Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 0,
+              "DocumentIndex": 1,
               "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": "AQIAABMGAAAAAAAAAAAswCYGAAAFAAAA",
+              "ViewState": "AQIAAAAAAAAAAAAAAAAAAAQAAADwAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2023-12-05T02:10:16.04Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 2,
               "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": "AQIAAAUBAAAAAAAAAAAnwBYBAABBAAAA",
+              "ViewState": "AQIAABMBAAAAAAAAAAAEwCsBAAAEAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
-              "WhenOpened": "2024-01-01T16:19:43.325Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-01-01T16:19:43.325Z"
             }
           ]
         },

package/hybridspa.ts

@@ -111,7 +111,7 @@ export async function adminDelete(
 //adminsGet
 export async function adminsGet(
     instance: IPublicClientApplication,
-    authorizedUser: User,
+    user: User,
     workspaceID: string,
     debug: boolean
 ): Promise<APIResult> {
@@ -129,7 +129,7 @@ export async function adminsGet(
     let url: URL = new URL(endpoint);
     url.searchParams.append("workspaceId", workspaceID);
     // create headers
-    const headers = await defineHeaders(instance, authorizedUser);
+    const headers = await defineHeaders(instance, user);
     // make endpoint call
     let options = { method: "GET", headers: headers };
     try {
@@ -499,7 +499,7 @@ export async function configPut(
 //configsGet
 export async function configsGet(
     instance: IPublicClientApplication,
-    authorizedUser: User,
+    user: User,
     workspaceID: string,
     debug: boolean
 ): Promise<APIResult> {
@@ -517,7 +517,7 @@ export async function configsGet(
     let url: URL = new URL(endpoint);
     url.searchParams.append("workspaceId", workspaceID);
     // create headers
-    const headers = await defineHeaders(instance, authorizedUser);
+    const headers = await defineHeaders(instance, user);
     // make endpoint call
     let options = { method: "GET", headers: headers };
     try {
@@ -560,7 +560,6 @@ export async function configsGet(
 //initPost
 export async function initPost(
     instance: IPublicClientApplication,
-    authorizedUser: User,
     user: User,
     debug: boolean
 ): Promise<APIResult> {
@@ -575,7 +574,7 @@ export async function initPost(
     // create init endpoint
     let endpoint: string = mindlineConfig.initEndpoint();
     // create init headers
-    const headers = await defineHeaders(instance, authorizedUser);
+    const headers = await defineHeaders(instance, user);
     // create init body
     let initBody: string = `
   {
@@ -665,7 +664,7 @@ export async function tenantDelete(
 //tenantsGet
 export async function tenantsGet(
     instance: IPublicClientApplication,
-    authorizedUser: User,
+    user: User,
     workspaceID: string,
     debug: boolean
 ): Promise<APIResult> {
@@ -683,7 +682,7 @@ export async function tenantsGet(
     let url: URL = new URL(endpoint);
     url.searchParams.append("workspaceId", workspaceID);
     // create headers
-    const headers = await defineHeaders(instance, authorizedUser);
+    const headers = await defineHeaders(instance, user);
     // make endpoint call
     let options = { method: "GET", headers: headers };
     try {
@@ -823,7 +822,6 @@ export async function workspacePut(instance: IPublicClientApplication, authorize
 //workspacesGet
 export async function workspacesGet(
     instance: IPublicClientApplication,
-    authorizedUser: User,
     user: User,
     debug: boolean
 ): Promise<APIResult> {
@@ -840,7 +838,7 @@ export async function workspacesGet(
     // create workspace endpoint
     let url: URL = new URL(endpoint);
     // create workspace headers
-    const headers = await defineHeaders(instance, authorizedUser);
+    const headers = await defineHeaders(instance, user);
     // make workspace endpoint call
     let options = { method: "GET", headers: headers };
     try {

package/index.d.ts

@@ -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

@@ -1793,7 +1793,7 @@ 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;
@@ -1805,35 +1805,26 @@ export async function initGet(instance: IPublicClientApplication, authorizedUser
     if (bResult) {
         // success, we now know cloud instance where this tenant is provisioned
         user.authority = tenant.authority;
-        // do we have a logged in user from the same authority as this newly proposed tenant?
-        let loggedInUser: User | undefined = ii.us.find((u: User) => (u.session === "Sign Out" && u.authority === user.authority));
-        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, tenant, ii, instance, debug);
-            tasks.setTaskEnd("GET tenant details", new Date(), "complete");
-            // store tenant name and domain on user, POST user and tenant to back end
-            if (result.result) {
-                loggedInUser.companyName = tenant.name;
-                loggedInUser.companyDomain = tenant.domain;
-                tasks.setTaskStart("POST config init", new Date());
-                result = await initPost(instance, authorizedUser, 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);
-                tasks.setTaskEnd("GET workspaces", new Date(), result.result ? "complete" : "failed");
-            }
-            console.log("initGet complete. Version: " + version);
-            return result;
+        // get tenant name and domain from AAD to pass to Configuration API
+        tasks.setTaskStart("GET tenant details", new Date());
+        result.result = await tenantRelationshipsGetById(user, tenant, ii, instance, debug);
+        tasks.setTaskEnd("GET tenant details", new Date(), "complete");
+        // 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, user, debug);
+            tasks.setTaskEnd("POST config init", new Date(), result.result ? "complete" : "failed");
         }
-        else {
-            result.error = `${user.mail} has insufficient privileges to lookup under authority: ${user.authority}.`;
-            result.result = false;
-            return result;
+        // 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, user, ii, debug);
+            tasks.setTaskEnd("GET workspaces", new Date(), result.result ? "complete" : "failed");
         }
+        console.log("initGet complete. Version: " + version);
+        return result;
     }
     else {
         result.error = `Failed to retrieve authority for user "${user.mail}" TID ${user.tid}.`;
@@ -2014,11 +2005,11 @@ function processReturnedConfigs(workspace: Workspace, ii: InitInfo, returnedConf
     });
     ii.save();
 }
-async function workspaceInfoGet(instance: IPublicClientApplication, authorizedUser: User, user: User, ii: InitInfo, debug: boolean): Promise<APIResult> {
+async function workspaceInfoGet(instance: IPublicClientApplication, user: User, ii: InitInfo, debug: boolean): Promise<APIResult> {
     let result: APIResult = new APIResult();
     if (debug) debugger;
     try {
-        result = await workspacesGet(instance, authorizedUser, user, debug);
+        result = await workspacesGet(instance, user, debug);
         if (result.result) {
             for (let o of result.array!) {
                 // are we already tracking this workspace?
@@ -2071,9 +2062,9 @@ async function workspaceInfoGet(instance: IPublicClientApplication, authorizedUs
                 workspace.name = o.name;
                 workspace.ownerid = o.workspaceOwnerUserId;
                 // parallel GET admins, tenants, configs associated with this workspace
-                let adminsPromise: Promise<APIResult> = adminsGet(instance, authorizedUser, workspace.id, debug);
-                let tenantsPromise: Promise<APIResult> = tenantsGet(instance, authorizedUser, workspace.id, debug);
-                let configsPromise: Promise<APIResult> = configsGet(instance, authorizedUser, workspace.id, debug);
+                let adminsPromise: Promise<APIResult> = adminsGet(instance, user, workspace.id, debug);
+                let tenantsPromise: Promise<APIResult> = tenantsGet(instance, user, workspace.id, debug);
+                let configsPromise: Promise<APIResult> = configsGet(instance, user, workspace.id, debug);
                 // wait for all to finish, return on any failure
                 let [adminsResult, tenantsResult, configsResult] = await Promise.all([adminsPromise, tenantsPromise, configsPromise]);
                 if (!adminsResult.result) return adminsResult;

package/package.json

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