@mindline/sync 1.0.66 → 1.0.68

package/.vs/VSWorkspaceState.json

@@ -2,5 +2,6 @@
   "ExpandedNodes": [
     ""
   ],
+  "SelectedNode": "\\README.md",
   "PreviewInSolutionExplorer": false
 }

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

@@ -2,6 +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\\README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:README.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}"
+    },
+    {
+      "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}"
@@ -9,10 +17,6 @@
     {
       "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.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}"
     }
   ],
   "DocumentGroupContainers": [
@@ -22,7 +26,7 @@
       "DocumentGroups": [
         {
           "DockedWidth": 179,
-          "SelectedChildIndex": 10,
+          "SelectedChildIndex": -1,
           "Children": [
             {
               "$type": "Bookmark",
@@ -55,43 +59,62 @@
             {
               "$type": "Bookmark",
               "Name": "ST:1:0:{d212f56b-c48a-434c-a121-1c5d80b59b9f}"
+            }
+          ]
+        },
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": 0,
+          "Children": [
+            {
+              "$type": "Document",
+              "DocumentIndex": 0,
+              "Title": "README.md",
+              "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\README.md",
+              "RelativeDocumentMoniker": "README.md",
+              "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\README.md",
+              "RelativeToolTip": "README.md",
+              "ViewState": "AQIAAAAAAAAAAAAAAAAAABoAAAASAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|",
+              "WhenOpened": "2024-01-05T21:52:59.93Z",
+              "EditorCaption": ""
             },
             {
               "$type": "Document",
               "DocumentIndex": 2,
+              "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": "AQIAAMsGAAAAAAAAAAAvwDkHAAABAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
+              "WhenOpened": "2023-12-05T02:10:16.04Z"
+            },
+            {
+              "$type": "Document",
+              "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": "AQIAAP0AAAAAAAAAAAAhwA4BAABQAAAA",
+              "ViewState": "AQIAAAMBAAAAAAAAAEAwwC8BAAAoAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
-              "WhenOpened": "2023-11-25T03:36:49.251Z"
+              "WhenOpened": "2024-01-01T16:19:43.325Z",
+              "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 3,
               "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": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+              "ViewState": "AQIAAB8AAAAAAAAAAAAGwFUAAAAEAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2023-11-25T02:18:34.862Z"
-            },
-            {
-              "$type": "Document",
-              "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": "AQIAAAAAAAAAAAAAAAAAAFAAAAAEAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
-              "WhenOpened": "2023-11-25T04:05:46.842Z",
-              "EditorCaption": ""
             }
           ]
         },

package/hybridspa.ts

@@ -77,18 +77,11 @@ export async function adminDelete(
         result.status = 500;
         return result;
     }
-    // are we performing deletion of a full admin?
+    // define admin endpoint and add workspaceId parameter
     let url: URL | null = null;
-    if (user.oid !== user.mail) {
-        url = new URL(mindlineConfig.adminEndpoint());
-        url.searchParams.append("workspaceId", workspaceId);
-    }
-    // or of an incomplete admin?
-    else if (user.mail !== "") {
-        url = new URL(mindlineConfig.adminIncompleteEndpoint());
-        url.searchParams.append("email", user.mail);
-        url.searchParams.append("workspaceId", workspaceId);
-    }
+    url = new URL(mindlineConfig.adminEndpoint());
+    url.searchParams.append("workspaceId", workspaceId);
+    url.searchParams.append("email", user.mail);
     // create headers
     const headers = await defineHeaders(instance, authorizedUser);
     // make endpoint call
@@ -768,6 +761,48 @@ export async function tenantPut(
     }
     return result;
 }
+//workspacePut
+export async function workspacePut(instance: IPublicClientApplication, authorizedUser: User, workspaceId: string, workspaceName: string): Promise<APIResult> {
+    let result: APIResult = new APIResult();
+    if (workspaceId == "" || workspaceName == "") {
+        result.result = false;
+        result.error = "workspacePut: invalid workspace ID or name";
+        result.status = 500;
+        return result;
+    }
+    // create parameterized workspace endpoint
+    let endpoint: string = mindlineConfig.workspaceEndpoint();
+    let url: URL = new URL(endpoint);
+    url.searchParams.append("workspaceId", workspaceId);
+    url.searchParams.append("workspaceName", workspaceName);
+    // create workspace headers
+    const headers = await defineHeaders(instance, authorizedUser);
+    let options = { method: "PUT", headers: headers };
+    // make config endpoint call
+    try {
+        console.log("Attempting PUT to /workspace: " + url.href);
+        let response = await fetch(url.href, options);
+        if (response.status === 200 && response.statusText === "OK") {
+            console.log(`Successful PUT to ${url.href}`);
+            return result;
+        }
+        else {
+            result.error = await processErrors(response);
+            console.log(`Failed PUT to ${url.href}`);
+            console.log(result.error);
+            result.status = 500;
+            result.result = false;
+            return result;
+        }
+    }
+    catch (error: any) {
+        result.error = error.message;
+        result.status = 500;
+        result.result = false;
+        console.log(error.message);
+    }
+    return result;
+}
 //workspacesGet
 export async function workspacesGet(
     instance: IPublicClientApplication,
@@ -784,7 +819,7 @@ export async function workspacesGet(
         return result;
     }
     // create workspaces endpoint
-    let endpoint: string = mindlineConfig.workspaceEndpoint();
+    let endpoint: string = mindlineConfig.workspacesEndpoint();
     // create workspace endpoint
     let url: URL = new URL(endpoint);
     // create workspace headers

package/index.d.ts

@@ -24,6 +24,7 @@ declare module "@mindline/sync" {
         static tenantEndpoint(): string;
         static tenantsEndpoint(): string;
         static workspaceEndpoint(): string;
+        static workspacesEndpoint(): string;
         // SignalR endpoint
         static signalREndpoint(): string;
     }
@@ -76,6 +77,7 @@ declare module "@mindline/sync" {
         scopes: string[];
         authTS: Date;
         sel: boolean; // selection state
+        loggingIn: boolean;
         constructor();
     }
     // tenant (Azure AD tenant, AD domain, Google workspace)
@@ -103,6 +105,7 @@ declare module "@mindline/sync" {
         workspaceIDs: string;
         sel: boolean; // selection state
         graphSP: string; // graph resource ID (service principal) for this tenant
+        lookupfield: string; // are we validating by TID or by domain? "Domain" | "Tenant ID"
         constructor();
     }
     // config
@@ -139,6 +142,7 @@ declare module "@mindline/sync" {
     export class Workspace {
         id: string;
         name: string;
+        ownerid: string;
         associatedUsers: string[];
         associatedTenants: string[];
         associatedConfigs: string[];
@@ -275,7 +279,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, tasks: TaskArray, debug: boolean): boolean;
+    export function tenantRelationshipsGetById(user: User, 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;
@@ -300,4 +304,5 @@ declare module "@mindline/sync" {
     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;
     export function userRemove(instance: IPublicClientApplication, authorizedUser: User, user: User, workspaceId: string): APIResult;
+    export function workspaceEdit(instance: IPublicClientApplication, authorizedUser: User, workspaceId: string, workspaceName: string): Promise<APIResult>;
 }

package/index.ts

@@ -2,7 +2,7 @@
 import * as signalR from "@microsoft/signalr"
 import { IPublicClientApplication, AuthenticationResult } from "@azure/msal-browser"
 import { deserializeArray } from 'class-transformer';
-import { defineHeaders, adminDelete, adminPost, adminsGet, configDelete, configsGet, configPost, configPut, initPost, readerPost, tenantPut, tenantPost, tenantDelete, tenantsGet, workspacesGet } from './hybridspa';
+import { defineHeaders, adminDelete, adminPost, adminsGet, configDelete, configsGet, configPost, configPut, initPost, readerPost, tenantPut, tenantPost, tenantDelete, tenantsGet, workspacePut, workspacesGet } from './hybridspa';
 import { version } from './package.json';
 import users from "./users.json";
 import tenants from "./tenants.json";
@@ -59,6 +59,9 @@ export class mindlineConfig {
         return `https://${mindlineConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/tenants`;
     };
     static workspaceEndpoint(): string {
+        return `https://${mindlineConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/workspace`;
+    };
+    static workspacesEndpoint(): string {
         return `https://${mindlineConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/workspaces`;
     };
     // SignalR endpoint
@@ -118,6 +121,7 @@ export class User {
     scopes: string[]; // to detect if incremental consent has happened
     authTS: Date; // timestamp user was authenticated
     sel: boolean; // selection state
+    loggingIn: boolean; // set when the user is logging in to support spinner visibility
     constructor() {
         this.oid = "";
         this.name = "";
@@ -134,6 +138,7 @@ export class User {
         this.scopes = new Array();
         this.authTS = new Date(0);
         this.sel = false;
+        this.loggingIn = false;
     }
 }
 export enum TenantType {
@@ -160,6 +165,7 @@ export class Tenant {
     workspaceIDs: string;
     sel: boolean; // selection state
     graphSP: string; // graph resource ID (service principal) for this tenant
+    lookupfield: string; // are we validating by TID or by domain? "Domain" | "Tenant ID"
     constructor() {
         this.tid = "";
         this.name = "";
@@ -171,6 +177,7 @@ export class Tenant {
         this.workspaceIDs = "";
         this.sel = false;
         this.graphSP = "";
+        this.lookupfield = "Domain";
     }
 }
 function getAppId(authority: string): string {
@@ -249,6 +256,7 @@ export class Config {
 export class Workspace {
     id: string;
     name: string;
+    ownerid: string;
     associatedUsers: string[];
     associatedTenants: string[];
     associatedConfigs: string[];
@@ -409,6 +417,7 @@ export class InitInfo {
                 newuser.scopes = user.scopes;
                 newuser.authTS = new Date(user.authTS);
                 newuser.sel = user.sel;
+                newuser.loggingIn = user.loggingIn;
                 return newuser
             });
         }
@@ -427,6 +436,7 @@ export class InitInfo {
                 newtenant.authority = tenant.authority;
                 newtenant.workspaceIDs = tenant.workspaceIDs;
                 newtenant.sel = tenant.sel;
+                newtenant.lookupfield = tenant.lookupfield;
                 return newtenant;
             });
         }
@@ -455,6 +465,7 @@ export class InitInfo {
                 let newworkspace: Workspace = new Workspace();
                 newworkspace.id = workspace.id;
                 newworkspace.name = workspace.name;
+                newworkspace.ownerid = workspace.ownerid;
                 newworkspace.associatedUsers = workspace.associatedUsers;
                 newworkspace.associatedTenants = workspace.associatedTenants;
                 newworkspace.associatedConfigs = workspace.associatedConfigs;
@@ -1508,7 +1519,7 @@ 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, tasks: TaskArray, debug: boolean): Promise<boolean> {
+export async function tenantRelationshipsGetById(user: User, 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
@@ -1537,8 +1548,6 @@ export async function tenantRelationshipsGetById(user: User, ii: InitInfo, insta
         tenantEndpoint += "(tenantId='";
         tenantEndpoint += user.tid;
         tenantEndpoint += "')";
-        // track time of tenant details query
-        tasks.setTaskStart("GET tenant details", new Date());
         console.log("tenantRelationshipsGetById: Attempting GET from /findTenantInformationByTenantId:", tenantEndpoint);
         let response = await fetch(tenantEndpoint, options);
         let data = await response.json();
@@ -1557,7 +1566,6 @@ export async function tenantRelationshipsGetById(user: User, ii: InitInfo, insta
                 debugger;
             }
             console.log("tenantRelationshipsGetById: Successful GET from /findTenantInformationByTenantId: ", data.displayName);
-            tasks.setTaskEnd("GET tenant details", new Date(), "complete");
             return true;  // success, need UX to re-render
         }
         else {
@@ -1566,20 +1574,13 @@ export async function tenantRelationshipsGetById(user: User, ii: InitInfo, insta
     }
     catch (error: any) {
         console.log("tenantRelationshipsGetById: Failed to GET from /findTenantInformationByTenantId: ", error);
-        tasks.setTaskEnd("GET tenant details", new Date(), "failed");
         return false; // failed, no need for UX to re-render
     }
-    tasks.setTaskEnd("GET tenant details", new Date(), "failed");
     return false; // failed, no need for UX to re-render
 }
 //tenantUnauthenticatedLookup (from https://gettenantpartitionweb.azurewebsites.net/js/gettenantpartition.js)
 export async function tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean): Promise<boolean> {
     if (debug) debugger;
-    // since we should mainly be called when a user is performing a lookup, we can afford the performance hit of looking up the tenant name and domain again
-    // do we already have a valid tenant ID? if so, nothing to add
-    //if (tenant.tid !== "") return false;
-    // do we not have a valid domain? if so, nothing to lookup
-    if (tenant.domain == "") return false;
     // prepare the 3 endpoints and corresponding regular expressions
     let endpoints: string[] = [graphConfig.authorityWW, graphConfig.authorityUS, graphConfig.authorityCN];
     let regexes: RegExp[] = [graphConfig.authorityWWRegex, graphConfig.authorityUSRegex, graphConfig.authorityCNRegex];
@@ -1589,7 +1590,12 @@ export async function tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean
         for (let j = 0; j < 3; j++) {
             // create well-known openid endpoint
             var openidEndpoint = endpoints[j];
-            openidEndpoint += tenant.domain;
+            if (tenant.lookupfield == "Domain") {
+                openidEndpoint += tenant.domain;
+            }
+            else if (tenant.lookupfield == "Tenant ID") {
+                openidEndpoint += tenant.tid;
+            }
             openidEndpoint += "/.well-known/openid-configuration";
             console.log("Attempting GET from openid well-known endpoint: ", openidEndpoint);
             response = await fetch(openidEndpoint);
@@ -1778,7 +1784,6 @@ export async function configsRefresh(instance: IPublicClientApplication, authori
     result.status = 500;
     return result;
 }
-// retrieve Workspace(s), User(s), Tenant(s), Config(s) given newly logged in user
 export async function initGet(instance: IPublicClientApplication, authorizedUser: User, user: User, ii: InitInfo, tasks: TaskArray, debug: boolean): Promise<APIResult> {
     console.log(`>>>>>> initGet`);
     let result: APIResult = new APIResult();
@@ -1794,7 +1799,9 @@ export async function initGet(instance: IPublicClientApplication, authorizedUser
         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
-            result.result = await tenantRelationshipsGetById(user, ii, instance, tasks, debug);
+            tasks.setTaskStart("GET tenant details", new Date());
+            result.result = await tenantRelationshipsGetById(user, 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 not-yet-onboarded tenant to back end
             if (result.result) {
                 tasks.setTaskStart("POST config init", new Date());
@@ -1837,7 +1844,11 @@ export async function userAdd(instance: IPublicClientApplication, authorizedUser
 export async function userRemove(instance: IPublicClientApplication, authorizedUser: User, user: User, workspaceId: string): Promise<APIResult> {
     return adminDelete(instance, authorizedUser, user, workspaceId);
 }
-// Mindline Config API internal helper functions
+export async function workspaceEdit(instance: IPublicClientApplication, authorizedUser: User, workspaceId: string, workspaceName: string): Promise<APIResult>
+{
+    return await workspacePut(instance, authorizedUser, workspaceId, workspaceName);
+}
+// retrieve Workspace(s), User(s), Tenant(s), Config(s) given newly logged in user
 function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmins: Array<Object>) {
     returnedAdmins.map((item) => {
         // are we already tracking this user?
@@ -2020,6 +2031,7 @@ async function workspaceInfoGet(instance: IPublicClientApplication, authorizedUs
                 // set id and name based on returned data
                 workspace.id = o.id;
                 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);

package/package.json

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