@mindline/sync 1.0.72 → 1.0.74

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

@@ -10,6 +10,14 @@
       "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\\package.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:package.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\resources.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:resources.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+    },
     {
       "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}"
@@ -59,21 +67,47 @@
           ]
         },
         {
-          "DockedWidth": 200,
-          "SelectedChildIndex": 1,
+          "DockedWidth": 186,
+          "SelectedChildIndex": 3,
           "Children": [
             {
               "$type": "Document",
               "DocumentIndex": 2,
+              "Title": "package.json",
+              "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\package.json",
+              "RelativeDocumentMoniker": "package.json",
+              "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\package.json",
+              "RelativeToolTip": "package.json",
+              "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
+              "WhenOpened": "2024-03-30T18:10:14.136Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 4,
               "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": "AQIAAGQBAAAAAAAAAIAmwAcCAAAEAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2023-11-25T02:18:34.862Z"
             },
+            {
+              "$type": "Document",
+              "DocumentIndex": 3,
+              "Title": "resources.json",
+              "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\resources.json",
+              "RelativeDocumentMoniker": "resources.json",
+              "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\resources.json",
+              "RelativeToolTip": "resources.json",
+              "ViewState": "AQIAAAgAAAAAAAAAAAAUwDkAAAABAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
+              "WhenOpened": "2024-03-30T16:56:29.032Z",
+              "EditorCaption": ""
+            },
             {
               "$type": "Document",
               "DocumentIndex": 0,
@@ -82,11 +116,17 @@
               "RelativeDocumentMoniker": "index.ts",
               "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.ts",
               "RelativeToolTip": "index.ts",
-              "ViewState": "AQIAAPwGAAAAAAAAAAAcwCwHAAAFAAAA",
+              "ViewState": "AQIAAOsBAAAAAAAAAAAAANEEAAAuAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2023-12-05T02:10:16.04Z",
               "EditorCaption": ""
-            },
+            }
+          ]
+        },
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": 0,
+          "Children": [
             {
               "$type": "Document",
               "DocumentIndex": 1,
@@ -95,7 +135,7 @@
               "RelativeDocumentMoniker": "index.d.ts",
               "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.d.ts",
               "RelativeToolTip": "index.d.ts",
-              "ViewState": "AQIAABMBAAAAAAAAAAAEwCsBAAAEAAAA",
+              "ViewState": "AQIAAPsAAAAAAAAAAAAAABcBAAAIAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2024-01-01T16:19:43.325Z",
               "EditorCaption": ""

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

@@ -265,6 +265,20 @@ declare module "@mindline/sync" {
         constructor(tid: string, name: string);
         update(total: number, read: number, written: number, deferred: number): void;
     }
+    export class ResourceArray {
+        resourceNodes: ResourceNode[];
+        constructor(bClearLocalStorage: boolean);
+        // get initial data from localStorage or file
+        init(bClearLocalStorage: boolean): void;
+    }
+    export class ResourceNode {
+        type: string;
+        resource: string;
+        cost: number;
+        expanded: boolean;
+        resources: ResourceNode[];
+        constructor(type: string, resource: string, cost: number);
+    }
     //
     // Azure AD Graph API
     //

package/index.ts

@@ -10,6 +10,7 @@ import configs from "./configs.json";
 import workspaces from "./workspaces.json";
 import tasksData from "./tasks";
 import syncmilestones from './syncmilestones';
+import resources from './resources';
 import { log } from "console";
 const FILTER_FIELD = "workspaceIDs";
 // called by unit tests
@@ -1228,6 +1229,53 @@ export class TenantNode {
         }
     }
 }
+export class ResourceArray {
+    resourceNodes: ResourceNode[];
+    constructor(bClearLocalStorage: boolean) {
+        this.resourceNodes = new Array<ResourceNode>();
+        this.init(bClearLocalStorage);
+    }
+    // get initial data from localStorage or file
+    init(bClearLocalStorage: boolean): void {
+        console.log(`Calling ResourceArray::init(bClearLocalStorage: ${bClearLocalStorage ? "true" : "false"})`);
+        // if we have a non-empty string value stored, read it from localStorage
+        if (storageAvailable("localStorage")) {
+            let result = localStorage.getItem("RBAC");
+            if (result != null && typeof result === "string" && result !== "") {
+                if (bClearLocalStorage) {
+                    localStorage.removeItem("RBAC");
+                }
+                else {
+                    let resourceArrayString: string = result;
+                    let raFromLocalStorage: ResourceArray = JSON.parse(resourceArrayString);
+                    this.resourceNodes = raFromLocalStorage.resourceNodes;
+                    return;
+                }
+            }
+        }
+        // if storage unavailable or we were just asked to clear, read defaults to enable usable UI
+        var resourcesString = JSON.stringify(resources);
+        try {
+            this.resourceNodes = deserializeArray(ResourceNode, resourcesString);
+        } catch (e) {
+            debugger;
+        }
+    }
+}
+export class ResourceNode {
+    type: string;
+    resource: string;
+    cost: number;
+    expanded: boolean;
+    resources: ResourceNode[];
+    constructor(type: string, resource: string, cost: number) {
+        this.type = type;
+        this.resource = resource;
+        this.cost = cost;
+        this.expanded = false;
+        this.resources = new Array<ResourceNode>();
+    }
+}
 // ======================= Azure AD Graph API ===============================
 export async function groupsGet(instance: IPublicClientApplication, user: User | undefined, groupSearchString: string): Promise<{ groups: Group[], error: string }> {
     // need a logged in user to get graph users
@@ -1805,35 +1853,26 @@ export async function initGet(instance: IPublicClientApplication, user: User, ii
     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) {
-                user.companyName = tenant.name;
-                user.companyDomain = tenant.domain;
-                tasks.setTaskStart("POST config init", new Date());
-                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, loggedInUser, 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 +2053,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 +2110,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.72",
+  "version": "1.0.74",
   "types": "index.d.ts",
   "exports": "./index.ts",
   "description": "sync is a node.js package encapsulating javscript classes required for configuring Mindline sync service.",

package/resources.json

@@ -0,0 +1,58 @@
+[
+  {
+    "type": "mg",
+    "resource": "Tenant Root Group",
+    "cost": 0,
+    "expanded": true,
+    "resources": [
+      {
+        "type": "sub",
+        "resource": "Applications",
+        "cost": 16677.52,
+        "expanded": true,
+        "resources": [
+          {
+            "type": "rg",
+            "resource": "ssfdev",
+            "cost": 7500.08,
+            "expanded": true,
+            "resources": [
+              {
+                "type": "resources",
+                "resource": "SSFServices",
+                "cost": 0,
+                "expanded": false,
+                "resources": [
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "sub",
+        "resource": "Infrastructure",
+        "cost": 8737.58,
+        "expanded": true,
+        "resources": [
+          {
+            "type": "rg",
+            "resource": "SFFA_Prod_Mgmt_Shared_Resources_RG",
+            "cost": 7500.08,
+            "expanded": true,
+            "resources": [
+              {
+                "type": "resources",
+                "resource": "SSFA-Prod-UTIL-01",
+                "cost": 0,
+                "expanded": false,
+                "resources": [
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+]