@mindline/sync 1.0.89 → 1.0.91

package/{index.ts → src/index.ts}

@@ -3,17 +3,14 @@ import * as signalR from "@microsoft/signalr"
 import { AccountInfo } from "@azure/msal-common";
 import { IPublicClientApplication, AuthenticationResult } from "@azure/msal-browser"
 import { deserializeArray } from 'class-transformer';
-import { processErrors, adminDelete, adminPost, adminsGet, configConsentReadPut, configConsentWritePut, configDelete, configsGet, configPatch, configPost, configPut, initPost, readerPost, tenantPost, tenantDelete, tenantsGet, workspacePut, workspacesGet } from './hybridspa';
-import { version } from './package.json';
+import { version } from '../package.json';
 import users from "./users.json";
 import tenants from "./tenants.json";
 import configs from "./configs.json";
 import workspaces from "./workspaces.json";
-import tasksData from "./tasks";
-import syncmilestones from './syncmilestones';
-import resources from './resources';
-import actors from './actors';
-import { log } from "console";
+import syncmilestones from './syncmilestones.json';
+import resources from './resources.json';
+import actors from './actors.json';
 
 const FILTER_FIELD = "workspaceIDs";
 // called by unit tests
@@ -103,16 +100,16 @@ export class graphConfig {
     static authorityCNRegex: RegExp = /^(https:\/\/login\.partner\.microsoftonline\.cn\/)([\dA-Fa-f]{8}-[\dA-Fa-f]{4}-[\dA-Fa-f]{4}-[\dA-Fa-f]{4}-[\dA-Fa-f]{12})\/oauth2\/authorize$/;
 };
 export class Group {
-    id: string;
-    displayName: string;
-    description: string;
+    id: string = "";
+    displayName: string = "";
+    description: string = "";
 }
 export class UserScope {
-    group: string;
-    value: string;
-    consented: boolean;
-    removable: boolean;
-    expanded: string;
+    group: string = "";
+    value: string = "";
+    consented: boolean = false;
+    removable: boolean = false;
+    expanded: string = "";
     static compareByValue(a: UserScope, b: UserScope): number {
         return a.value.localeCompare(b.value);
     }
@@ -267,6 +264,7 @@ export class Config {
     constructor() {
         this.id = "";
         this.name = "";
+        this.workspaceId = "";
         this.description = "";
         this.tenants = new Array();
         this.isEnabled = false;
@@ -285,6 +283,7 @@ export class Workspace {
     constructor() {
         this.id = "";
         this.name = "";
+        this.ownerid = "";
         this.associatedUsers = new Array();
         this.associatedTenants = new Array();
         this.associatedConfigs = new Array();
@@ -292,10 +291,10 @@ export class Workspace {
     }
 }
 // check for localStorage availability
-function storageAvailable(type) {
+function storageAvailable() {
     let storage;
     try {
-        storage = window[type];
+        storage = window.localStorage;
         const x = "__storage_test__";
         storage.setItem(x, x);
         storage.removeItem(x);
@@ -319,22 +318,22 @@ function storageAvailable(type) {
     }
 }
 export class InitInfo {
-    version: string;
-    tab: number;
-    us: User[];
-    ts: Tenant[];
-    cs: Config[];
-    ws: Workspace[];
-    configlevelconsent_configid: string;
-    configlevelconsent_access: TenantConfigType;
-    constructor(bClearLocalStorage: boolean) {
+    version: string = "";
+    tab: number = 0;
+    us: User[] = [];
+    ts: Tenant[] = [];
+    cs: Config[] = [];
+    ws: Workspace[] = [];
+    configlevelconsent_configid: string = "";
+    configlevelconsent_access: TenantConfigType = TenantConfigType.sourcetarget;
+    constructor(bClearLocalStorage: boolean = false) {
         this.init(bClearLocalStorage);
     }
     // get initial data from localStorage or file
     init(bClearLocalStorage: boolean): void {
         console.log(`Calling InitInfo::init(bClearLocalStorage: ${bClearLocalStorage ? "true" : "false"})`);
         // if we have a non-zero value stored, read it from localStorage
-        if (storageAvailable("localStorage")) {
+        if (storageAvailable()) {
             let result = localStorage.getItem("InitInfo");
             if (result != null && typeof result === "string" && result !== "") {
                 let initInfoString: string = result;
@@ -503,6 +502,59 @@ export class InitInfo {
         }
     }
 }
+const tasksData: any[] = [
+    {
+        id: 1,
+        task: "initialization",
+        start: "1970-01-01T00:00:00",
+        end: "1970-01-01T00:00:00",
+        expected: "0:22",
+        status: "not started",
+        expanded: true,
+        subtasks: [
+            {
+                id: 2,
+                task: "authenticate user",
+                start: "1970-01-01T00:00:00",
+                end: "1970-01-01T00:00:00",
+                expected: "0:01",
+                status: "not started"
+            },
+            {
+                id: 3,
+                task: "reload React",
+                start: "1970-01-01T00:00:00",
+                end: "1970-01-01T00:00:00",
+                expected: "0:07",
+                status: "not started"
+            },
+            {
+                id: 4,
+                task: "GET tenant details",
+                start: "1970-01-01T00:00:00",
+                end: "1970-01-01T00:00:00",
+                expected: "0:01",
+                status: "not started"
+            },
+            {
+                id: 5,
+                task: "POST config init",
+                start: "1970-01-01T00:00:00",
+                end: "1970-01-01T00:00:00",
+                expected: "0:10",
+                status: "not started"
+            },
+            {
+                id: 6,
+                task: "GET workspaces",
+                start: "1970-01-01T00:00:00",
+                end: "1970-01-01T00:00:00",
+                expected: "0:04",
+                status: "not started"
+            }
+        ]
+    }
+];
 export type TaskType = "initialization" |
     "authenticate user" |
     "reload React" |
@@ -522,10 +574,10 @@ export class TaskArray {
         this.tasks.length = 0;
         // then clear localStorage if we have been asked to
         if (bClearLocalStorage) {
-            if (storageAvailable("localStorage")) localStorage.removeItem("Tasks");
+            if (storageAvailable()) localStorage.removeItem("Tasks");
         }
         // then try localStorage
-        if (storageAvailable("localStorage")) {
+        if (storageAvailable()) {
             let result = localStorage.getItem("Tasks");
             if (result != null && typeof result === "string" && result !== "") {
                 // properly create Tasks and Dates from retrieved string
@@ -606,23 +658,23 @@ export class TaskArray {
     }
     #save(): void {
         let taskArrayString: string = JSON.stringify(this);
-        if (storageAvailable("localStorage")) {
+        if (storageAvailable()) {
             localStorage.setItem("Tasks", taskArrayString);
         }
     }
 }
 export class Task {
-    id: number;
-    task: string;
-    start: Date;
-    startDisplay: string;
-    end: Date;
-    endDisplay: string;
-    elapsedDisplay: string;
-    expected: number;
-    status: string;
-    expanded: boolean;
-    subtasks: Task[];
+    id: number = 0;
+    task: string = "";
+    start: Date = new Date();
+    startDisplay: string = "";
+    end: Date = new Date();
+    endDisplay: string = "";
+    elapsedDisplay: string = "";
+    expected: number = 0;
+    status: string = "";
+    expanded: boolean = false;
+    subtasks: Task[] = [];
     setEnd(endDate: Date): void {
         this.end = endDate;
         this.endDisplay = `${this.end.getMinutes().toString().padStart(2, "0")}:${this.end.getSeconds().toString().padStart(2, "0")}`;
@@ -640,9 +692,9 @@ export class Task {
 }
 // class corresponding to an execution of a Config - a *TenantNode* for each source tenant, each with a *TenantNode* array of target tenants
 export class Milestone {
-    Run: number;
-    Start: Date;
-    startDisplay: string;
+    Run: number = 0;
+    Start: Date = new Date();
+    startDisplay: string = "";
     POST: Date;
     postDisplay: string;
     Read: Date;
@@ -654,13 +706,13 @@ export class Milestone {
     constructor(run: number) {
         this.Run = run;
         this.start("");
-        this.POST = null;
+        this.POST = new Date();
         this.postDisplay = "";
-        this.Read = null;
+        this.Read = new Date();
         this.readDisplay = "";
-        this.Write = null;
+        this.Write = new Date();
         this.writeDisplay = "";
-        this.Duration = null;
+        this.Duration = new Date();
         this.durationDisplay = "";
     }
     start(start: string): void {
@@ -683,13 +735,13 @@ export class Milestone {
     }
 }
 export class MilestoneArray {
-    milestones: Milestone[];
+    milestones: Milestone[] = [];
     constructor(bClearLocalStorage: boolean) {
         this.init(bClearLocalStorage);
     }
     init(bClearLocalStorage: boolean): void {
         // read from localstorage by default
-        if (storageAvailable("localStorage")) {
+        if (storageAvailable()) {
             let result = localStorage.getItem("syncmilestones");
             if (result != null && typeof result === "string" && result !== "") {
                 let milestonesString: string = result;
@@ -710,7 +762,7 @@ export class MilestoneArray {
     }
     save(): void {
         let milestonesString: string = JSON.stringify(this.milestones);
-        if (storageAvailable("localStorage")) {
+        if (storageAvailable()) {
             localStorage.setItem("syncmilestones", milestonesString);
         }
     }
@@ -743,9 +795,8 @@ export class MilestoneArray {
     unstart(setMilestones: (milestones: Milestone[]) => void): void {
         // we should always have a milestone array and a first milestone
         if (this.milestones == null || this.milestones.length < 1) { debugger; return; }
-        let currentRun: number = Number(this.milestones[0].Run);
         // remove first milestone from front of array
-        let removedMilestone: Milestone = this.milestones.shift();
+        let removedMilestone: Milestone | undefined = this.milestones.shift();
         // re-define milestone array to trigger render
         this.milestones = this.milestones.map((ms: Milestone) => {
             let newms = new Milestone(ms.Run);
@@ -762,7 +813,7 @@ export class MilestoneArray {
             return newms;
         });
         setMilestones(this.milestones);
-        console.log(`Unstart removed first milestone: ${removedMilestone.Run}:${removedMilestone.Start}`);
+        console.log(`Unstart removed first milestone: ${removedMilestone!.Run}:${removedMilestone!.Start}`);
     }
     post(setMilestones: (milestones: Milestone[]) => void): void {
         // update the post value of the first milestone
@@ -782,8 +833,8 @@ export class MilestoneArray {
         this.milestones[0].write("");
         // while we have >10 complete milestones, remove the last
         while (this.milestones.length > 10) {
-            let removed: Milestone = this.milestones.pop();
-            console.log(`Removed milestone #${removed.Run}: ${removed.Start}`);
+            let removed: Milestone | undefined = this.milestones.pop();
+            console.log(`Removed milestone #${removed!.Run}: ${removed!.Start}`);
         }
         // save to localstorage
         this.save();
@@ -809,7 +860,7 @@ export class MilestoneArray {
             this.milestones = new Array();
         }
         else {
-            this.milestones = milestones.map((milestone: Object) => {
+            this.milestones = milestones.map((milestone: any) => {
                 let ms: Milestone = new Milestone(Number(milestone.Run));
                 ms.start(milestone.Start);
                 ms.post(milestone.POST);
@@ -828,7 +879,7 @@ export class BatchArray {
     pb_idle: number;
     pb_idleMax: number;
     pb_total: number;
-    pb_timer: NodeJS.Timer;
+    pb_timer: NodeJS.Timeout | null;
     milestoneArray: MilestoneArray;
     constructor(
         config: Config | null,
@@ -857,8 +908,8 @@ export class BatchArray {
         );
         // clear localStorage if we have been asked to
         if (bClearLocalStorage) {
-            if (storageAvailable("localStorage")) {
-                localStorage.removeItem(config.name);
+            if (storageAvailable()) {
+                localStorage.removeItem(config!.name);
                 this.milestoneArray.init(bClearLocalStorage);
             }
         }
@@ -937,7 +988,7 @@ export class BatchArray {
         this.pb_timer = setInterval(() => {
             // if signalR has finished the sync, stop the timer
             if (this.milestoneArray.milestones[0].Write != null) {
-                clearInterval(this.pb_timer);
+                clearInterval(this.pb_timer!);
                 this.pb_timer = null;
                 this.pb_progress = 100;
                 setSyncProgress(this.pb_progress);
@@ -970,7 +1021,7 @@ export class BatchArray {
         setSyncProgress(this.pb_progress);
         setConfigSyncResult("sync failed to execute");
         this.pb_increment = 0;
-        clearInterval(this.pb_timer);
+        clearInterval(this.pb_timer!);
         this.pb_timer = null;
         this.pb_idle = 0;
         this.pb_idleMax = 0;
@@ -990,25 +1041,26 @@ export class BatchArray {
         setConfigSyncResult: (result: string) => void,
         bClearLocalStorage: boolean
     ): void {
+        bClearLocalStorage = bClearLocalStorage;
         // we have just completed a successful POST to startSync
         this.milestoneArray.post(setMilestones);
         setConfigSyncResult("started sync, waiting for updates...");
         // re-initialize batch array with Configuration updated by the succcessful POST to startSync
         this.init(config, syncPortalGlobalState, false);
         // define newMessage handler that can access *this*
-        let handler = (message) => {
+        let handler = (message: string) => {
             console.log(message);
             let item = JSON.parse(message);
             // reset the countdown timer every time we get a message
             this.pb_idle = 0;
             // find the associated tenant for this SignalR message
-            let matchingPair: Object = batchIdArray.find((o: Object) => o.BatchId == item.TargetID);
+            let matchingPair: any | undefined = batchIdArray.find((o: any) => o.BatchId == item.TargetID);
             if (matchingPair == null) {
                 console.log(`Batch ${item.TargetID} not found in batchIdArray.`);
                 debugger;
                 return;
             }
-            let tenantNode: TenantNode = this.tenantNodes.find((t: TenantNode) => t.tid === matchingPair.SourceId);
+            let tenantNode: TenantNode | undefined = this.tenantNodes.find((t: TenantNode) => t.tid === matchingPair.SourceId);
             if (tenantNode == null) { // null OR undefined
                 console.log(`Tenant ${matchingPair.SourceId} not found in BatchArray.`);
                 debugger;
@@ -1058,14 +1110,14 @@ export class BatchArray {
                     if (bCurrentCount) tidRegexp = /Writer\/TID:(.+)\/CurrentCount/;
                     if (bDeferredCount) tidRegexp = /Writer\/TID:(.+)\/DeferredCount/;
                     if (bRescheduledCount) tidRegexp = /Writer\/TID:(.+)\/RescheduledCount/;
-                    let matchTID = statskeys[j].match(tidRegexp);
+                    let matchTID: RegExpMatchArray | null = statskeys[j].match(tidRegexp);
                     if (matchTID == null) {
                         console.log(`tid not found in ${statskeys[j]}.`);
                         debugger;
                         return;
                     }
                     // this Writer node should exist precisely under the Reader for this SignalR message
-                    let writerNode: TenantNode = tenantNode.targets.find((t: TenantNode) => t.tid === matchTID[1]);
+                    let writerNode: TenantNode | undefined = tenantNode.targets.find((t: TenantNode) => t.tid === matchTID[1]);
                     if (writerNode == null) {
                         console.log(`Writer ${tenantNode.name} not found under Reader ${tenantNode.name}.`);
                         debugger;
@@ -1162,7 +1214,7 @@ export class BatchArray {
             }
         }
         // start SignalR connection based on each batchId
-        batchIdArray.map((batchPair: Object) => {
+        batchIdArray.map((batchPair: any) => {
             const endpoint: string = mindlineConfig.signalREndpoint();
             let endpointUrl: URL = new URL(endpoint);
             endpointUrl.searchParams.append("statsId", batchPair.BatchId);
@@ -1204,20 +1256,20 @@ export class BatchArray {
             return result;
         }
         // execute post to reader endpoint
-        result = await readerPost(instance, authorizedUser, config);
+        result = await readerPost(instance, authorizedUser!, config!);
         return result;
     }
 }
 export class TenantNode {
     expanded: boolean;
-    status: string;
+    status: string = "";
     name: string;
     tid: string;
     batchId: string;
-    total: number;
-    read: number;
-    written: number;
-    deferred: number;
+    total: number = 0;
+    read: number = 0;
+    written: number = 0;
+    deferred: number =0 ;
     nothingtosync: boolean;
     targets: TenantNode[];
     constructor(tid: string, name: string, batchId: string) {
@@ -1258,7 +1310,7 @@ export class ResourceArray {
     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")) {
+        if (storageAvailable()) {
             let result = localStorage.getItem("ResourceArray");
             if (result != null && typeof result === "string" && result !== "") {
                 if (bClearLocalStorage) {
@@ -1290,7 +1342,7 @@ export class ResourceArray {
     // save resource data to localstorage
     save(): void {
         // if we have localStorage, save resources
-        if (storageAvailable("localStorage")) {
+        if (storageAvailable()) {
             let raString: string = JSON.stringify(this);
             localStorage.setItem("ResourceArray", raString);
         }
@@ -1320,7 +1372,7 @@ export class ActorArray {
     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")) {
+        if (storageAvailable()) {
             let result = localStorage.getItem("RBACActors");
             if (result != null && typeof result === "string" && result !== "") {
                 if (bClearLocalStorage) {
@@ -1353,7 +1405,7 @@ export class ActorNode {
     actors: ActorNode[];
     constructor(type: string, actor: string, resource: string, role: string, updatedby: string, updatedon: string) {
         this.type = type;
-        this.actor = resource;
+        this.actor = actor;
         this.resource = resource;
         this.role = role;
         this.updatedby = updatedby;
@@ -1364,6 +1416,7 @@ export class ActorNode {
 // ======================= Azure AD Graph API ===============================
 // helper functions
 function getGraphAPIScope(user: User): string {
+    user = user;
     return "Group.Read.All User.Read.All openid profile offline_access User.Read Contacts.Read CrossTenantInformation.ReadBasic.All";
 }
 // TODO: this is where you want to trigger a re-authentication if token expires
@@ -1393,7 +1446,7 @@ async function graphDefineHeaders(
         try {
             let accounts: AccountInfo[] = instance.getAllAccounts();
             let homeAccountId = user.oid + "." + user.tid;
-            let account: AccountInfo = null;
+            let account: AccountInfo | undefined | null = null;
             for (let i: number = 0; i < accounts.length; i++) {
                 if (accounts[i].homeAccountId == homeAccountId) {
                     account = accounts[i];
@@ -1401,7 +1454,7 @@ async function graphDefineHeaders(
             }
             let response: AuthenticationResult = await instance.acquireTokenSilent({
                 scopes: [graphAPIScope],
-                account: account
+                account: account!
             });
             user.graphAccessToken = response.accessToken; // cache access token
             console.log("Front end token graph acquired silently: " + user.graphAccessToken.slice(0, 20));
@@ -1412,7 +1465,7 @@ async function graphDefineHeaders(
                 // fallback to redirect if silent acquisition fails
                 let accounts: AccountInfo[] = instance.getAllAccounts();
                 let homeAccountId = user.oid + "." + user.tid;
-                let account: AccountInfo = null;
+                let account: AccountInfo | null = null;
                 for (let i: number = 0; i < accounts.length; i++) {
                     if (accounts[i].homeAccountId == homeAccountId) {
                         account = accounts[i];
@@ -1421,7 +1474,7 @@ async function graphDefineHeaders(
                 // assumption: this redirect will trigger login flow callbacks in program.cs
                 instance.acquireTokenRedirect({
                     scopes: [graphAPIScope],
-                    account: account
+                    account: account!
                 });
             }
             catch (error: any) {
@@ -1456,7 +1509,7 @@ export async function groupsGet(instance: IPublicClientApplication, user: User |
         return { groups: [], error: `Exception: ${error}` };
     }
 }
-export async function oauth2PermissionGrantsGet(options: RequestInit, user: User, spid: string, oid: string): Promise<{ grants: string, id: string, error: string }> {
+export async function oauth2PermissionGrantsGet(options: RequestInit, user: User, spid: string, oid: string): Promise<{ grants: string|null, id: string|null, error: string }> {
     try {
         // make /oauth2PermissionGrants endpoint call
         let spurl: string = getGraphEndpoint(user.authority) + graphConfig.graphOauth2PermissionGrantsPredicate;
@@ -1492,6 +1545,7 @@ export async function oauth2PermissionGrantsSet(instance: IPublicClientApplicati
         const headers = await graphDefineHeaders(instance, loggedInUser);
         let options: RequestInit = { method: "PATCH", headers: headers, body: scopesBody };
         let response = await fetch(grantsurl, options);
+        let data = await response.json();
         if (response.status == 204 && response.statusText == "No Content") {
             return true;
         }
@@ -1740,6 +1794,7 @@ export async function tenantRelationshipsGetByDomain(loggedInUser: User, tenant:
 }
 //tenantRelationshipsGetById - query AAD for associated company name and domain
 export async function tenantRelationshipsGetById(loggedInUser: User, tenant: Tenant, ii: InitInfo, instance: IPublicClientApplication, debug: boolean): Promise<boolean> {
+    ii = ii;
     console.log("**** tenantRelationshipsGetById");
     if (debug) debugger;
     // if needed, retrieve and cache access token
@@ -1846,7 +1901,7 @@ export async function tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean
     }
     return false; // failed, no need for UX to re-render
 }
-export async function userDelegatedScopesGet(instance: IPublicClientApplication, loggedInUser: User, tenant: Tenant): Promise<{ scopes: string, id: string, error: string }> {
+export async function userDelegatedScopesGet(instance: IPublicClientApplication, loggedInUser: User, tenant: Tenant): Promise<{ scopes: string|null, id: string|null, error: string }> {
     // need a logged in user and valid tenant to query graph
     if (loggedInUser == null || loggedInUser.spacode == "" || tenant == null) {
         debugger;
@@ -1893,9 +1948,9 @@ export async function userDelegatedScopesRemove(instance: IPublicClientApplicati
         return false;
     }
     // remove passed scope (case sensitive)
-    scopes = scopes.replace(scope, "");
+    scopes = scopes!.replace(scope, "");
     // set updated oauth2permissions
-    let removed: boolean = await oauth2PermissionGrantsSet(instance, loggedInUser, id, scopes);
+    let removed: boolean = await oauth2PermissionGrantsSet(instance, loggedInUser, id!, scopes);
     if (!removed) {
         debugger;
         console.log(`userDelegatedScopesRemove: cannot set oauth2PermissionGrants for ${loggedInUser.mail}: ${error}`);
@@ -1995,7 +2050,7 @@ export async function configsRefresh(instance: IPublicClientApplication, authori
     let result: APIResult = new APIResult();
     if (debug) debugger;
     try {
-        let workspace: Workspace = ii.ws.find((w) => w.id === workspaceId);
+        let workspace: Workspace | undefined = ii.ws.find((w) => w.id === workspaceId);
         if (workspace != null) {
             // clear Config associations as we are about to reset
             workspace.associatedConfigs.length = 0;
@@ -2082,9 +2137,9 @@ export async function workspaceEdit(instance: IPublicClientApplication, authoriz
 }
 // retrieve Workspace(s), User(s), Tenant(s), Config(s) given newly logged in user
 function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmins: Array<Object>, adminSelectedId: string) {
-    returnedAdmins.map((item) => {
+    returnedAdmins.map((item: any) => {
         // are we already tracking this user?
-        let user: User | null = null;
+        let user: User | null | undefined = null;
         let usIndex = ii.us.findIndex((u) => (u.oid === item.userId || u.oid === item.email));
         if (usIndex === -1) {
             // start tracking
@@ -2109,12 +2164,12 @@ function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmin
             user = ii.us.at(usIndex);
         }
         // restore selection
-        user.sel = (adminSelectedId === item.userId);
+        user!.sel = (adminSelectedId === item.userId);
         // refresh all the data available from the server
-        user.oid = item.userId ? item.userId : item.email;
-        user.name = item.firstName ?? user.name;
-        user.mail = item.email;
-        user.tid = item.tenantId;
+        user!.oid = item.userId ? item.userId : item.email;
+        user!.name = item.firstName ?? user!.name;
+        user!.mail = item.email;
+        user!.tid = item.tenantId;
         // *try* to set authority/companyName/companyDomain from tenant returned in previous call processReturnedTenants (it may not be there)
         // ASSUMPTION: in terms of setting authority, user either comes from
         //      1. .NET session, in which case user has an authority from the token
@@ -2122,22 +2177,22 @@ function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmin
         //          a. associated tenant with authority exists for this user (i.e. workspace owner has called POST init/configuration and created Admin and Tenant at same time)
         //          b. user has never logged in (i.e. workspace owner has invited an incomplete admin to the workspace and there is no corresponding tenant)
         //              i. this means that we *may* not have an authority stored for this user
-        let tenant: Tenant | undefined = ii.ts.find((t) => (t.tid === user.tid));
+        let tenant: Tenant | undefined = ii.ts.find((t) => (t.tid === user!.tid));
         if (tenant != undefined) {
-            user.authority = tenant.authority;
-            user.companyName = tenant.name;
-            user.companyDomain = tenant.domain;
+            user!.authority = tenant.authority;
+            user!.companyName = tenant.name;
+            user!.companyDomain = tenant.domain;
         }
         // ensure this workspace tracks this user
-        let idx = workspace.associatedUsers.findIndex((u) => u === user.oid);
-        if (idx == -1) workspace.associatedUsers.push(user.oid);
+        let idx = workspace.associatedUsers.findIndex((u) => u === user!.oid);
+        if (idx == -1) workspace.associatedUsers.push(user!.oid);
     });
     ii.save();
 }
 function processReturnedTenants(workspace: Workspace, ii: InitInfo, returnedTenants: Array<Object>, tenantSelectedId: string) {
-    returnedTenants.map((item) => {
+    returnedTenants.map((item: any) => {
         // are we already tracking this tenant?
-        let tenant: Tenant | null = null;
+        let tenant: Tenant | null | undefined = null;
         let tsIndex = ii.ts.findIndex((t) => t.tid === item.tenantId);
         if (tsIndex === -1) {
             // start tracking
@@ -2161,17 +2216,17 @@ function processReturnedTenants(workspace: Workspace, ii: InitInfo, returnedTena
             tenant = ii.ts.at(tsIndex);
         }
         // restore selection
-        tenant.sel = (tenantSelectedId === item.tenantId);
+        tenant!.sel = (tenantSelectedId === item.tenantId);
         // refresh all the data available from the server
-        tenant.tid = item.tenantId;
-        tenant.name = item.name;
-        tenant.domain = item.domain;
-        tenant.tenantType = item.type.toLowerCase(); // should now be strings
+        tenant!.tid = item.tenantId;
+        tenant!.name = item.name;
+        tenant!.domain = item.domain;
+        tenant!.tenantType = item.type.toLowerCase(); // should now be strings
 
         // canonicalize authority when getting it from config backend
         const regex = /^(https:\/\/login.microsoftonline.(?:us|com)\/)organizations\/v2.0$/;
         const regexMatch = item.authority.match(regex);
-        tenant.authority = regexMatch ? regexMatch[1] : item.authority;
+        tenant!.authority = regexMatch ? regexMatch[1] : item.authority;
 
         // ensure this workspace tracks this tenant
         let idx = workspace.associatedTenants.findIndex((t) => t === item.tenantId);
@@ -2181,9 +2236,9 @@ function processReturnedTenants(workspace: Workspace, ii: InitInfo, returnedTena
 }
 function processReturnedConfigs(workspace: Workspace, ii: InitInfo, returnedConfigs: Array<Object>, configSelectedId: string) {
     // process returned configs
-    returnedConfigs.map((item) => {
+    returnedConfigs.map((item: any) => {
         // are we already tracking this config?
-        let config: Config | null = null;
+        let config: Config | null | undefined = null;
         let csIndex = ii.cs.findIndex((c) => c.id === item.id);
         if (csIndex === -1) {
             // start tracking
@@ -2207,7 +2262,7 @@ function processReturnedConfigs(workspace: Workspace, ii: InitInfo, returnedConf
             config = ii.cs.at(csIndex);
         }
         // restore selection
-        config.sel = (configSelectedId === item.id);
+        config!.sel = (configSelectedId === item.id);
         // refresh all the data available from the server
         config!.id = item.id;
         config!.workspaceId = item.workspaceId;
@@ -2216,7 +2271,7 @@ function processReturnedConfigs(workspace: Workspace, ii: InitInfo, returnedConf
         config!.isEnabled = item.isEnabled;
         // create TenantConfigInfo array
         config!.tenants.length = 0;
-        item.tenants.map((tci) => {
+        item.tenants.map((tci: any) => {
             let tenantConfigInfo = new TenantConfigInfo();
             tenantConfigInfo.tid = tci.tenantId;
             tenantConfigInfo.sourceGroupId = tci.sourceGroupId ?? "";
@@ -2243,9 +2298,9 @@ async function workspaceInfoGet(instance: IPublicClientApplication, user: User,
     try {
         result = await workspacesGet(instance, user, debug);
         if (result.result) {
-            for (let o of result.array!) {
+            for (let o of result.array! as Workspace[]) {
                 // are we already tracking this workspace?
-                let workspace: Workspace = null;
+                let workspace: Workspace | null | undefined = null;
                 let wsIndex = ii.ws.findIndex((w) => w.id === o.id);
                 if (wsIndex === -1) {
                     // start tracking
@@ -2265,47 +2320,47 @@ async function workspaceInfoGet(instance: IPublicClientApplication, user: User,
                 }
                 // preserve selected admin, tenant, and config
                 let adminSelectedId: string = "";
-                for (let oid of workspace.associatedUsers) {
+                for (let oid of workspace!.associatedUsers) {
                     let user = ii.us.find((u: User) => u.oid === oid);
                     if (user != null && user.sel) {
                         adminSelectedId = user.oid;
                     }
                 }
                 let tenantSelectedId: string = "";
-                for (let tid of workspace.associatedTenants) {
+                for (let tid of workspace!.associatedTenants) {
                     let tenant = ii.ts.find((t: Tenant) => t.tid === tid);
                     if (tenant != null && tenant.sel) {
                         tenantSelectedId = tenant.tid;
                     }
                 }
                 let configSelectedId: string = "";
-                for (let cid of workspace.associatedConfigs) {
+                for (let cid of workspace!.associatedConfigs) {
                     let config = ii.cs.find((c: Config) => c.id === cid);
                     if (config != null && config.sel) {
                         configSelectedId = config.id;
                     }
                 }
                 // clear associations as we are about to reset
-                workspace.associatedUsers.length = 0;
-                workspace.associatedTenants.length = 0;
-                workspace.associatedConfigs.length = 0;
+                workspace!.associatedUsers.length = 0;
+                workspace!.associatedTenants.length = 0;
+                workspace!.associatedConfigs.length = 0;
                 // set id and name based on returned data
-                workspace.id = o.id;
-                workspace.name = o.name;
-                workspace.ownerid = o.workspaceOwnerUserId;
+                workspace!.id = o.id;
+                workspace!.name = o.name;
+                workspace!.ownerid = o.ownerid;
                 // parallel GET admins, tenants, configs associated with this workspace
-                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);
+                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;
                 if (!tenantsResult.result) return tenantsResult;
                 if (!configsResult.result) return configsResult;
                 // process returned workspace components (tenants first as they have the authorities that admins depend on)
-                processReturnedTenants(workspace, ii, tenantsResult.array!, tenantSelectedId);
-                processReturnedAdmins(workspace, ii, adminsResult.array!, adminSelectedId);
-                processReturnedConfigs(workspace, ii, configsResult.array!, configSelectedId);
+                processReturnedTenants(workspace!, ii, tenantsResult.array!, tenantSelectedId);
+                processReturnedAdmins(workspace!, ii, adminsResult.array!, adminSelectedId);
+                processReturnedConfigs(workspace!, ii, configsResult.array!, configSelectedId);
                 // tag components with workspaceIDs
                 ii.tagWithWorkspaces();
             }
@@ -2330,7 +2385,7 @@ export async function getPowerBIAccessToken(
     try {
         let accounts: AccountInfo[] = instance.getAllAccounts();
         let homeAccountId = user.oid + "." + user.tid;
-        let account: AccountInfo = null;
+        let account: AccountInfo | null = null;
         for (let i: number = 0; i < accounts.length; i++) {
             if (accounts[i].homeAccountId == homeAccountId) {
                 account = accounts[i];
@@ -2342,7 +2397,7 @@ export async function getPowerBIAccessToken(
                      "https://analysis.windows.net/powerbi/api/Report.ReadWrite.All",
                      "https://analysis.windows.net/powerbi/api/Workspace.ReadWrite.All"
             ],
-            account: account
+            account: account!
         });
         accesstoken = response.accessToken; // cache access token
         console.log("PowerBI token acquired silently: " + accesstoken.slice(0, 20));
@@ -2366,7 +2421,7 @@ async function azureDefineHeaders(
         try {
             let accounts: AccountInfo[] = instance.getAllAccounts();
             let homeAccountId = user.oid + "." + user.tid;
-            let account: AccountInfo = null;
+            let account: AccountInfo | null = null;
             for (let i: number = 0; i < accounts.length; i++) {
                 if (accounts[i].homeAccountId == homeAccountId) {
                     account = accounts[i];
@@ -2374,7 +2429,7 @@ async function azureDefineHeaders(
             }
             let response: AuthenticationResult = await instance.acquireTokenSilent({
                 scopes: ["https://management.azure.com/user_impersonation"],
-                account: account
+                account: account!
             });
             user.azureAccessToken = response.accessToken; // cache access token
             console.log("Front end token acquired silently: " + user.azureAccessToken.slice(0, 20));
@@ -2385,7 +2440,7 @@ async function azureDefineHeaders(
                 // fallback to redirect if silent acquisition fails
                 let accounts: AccountInfo[] = instance.getAllAccounts();
                 let homeAccountId = user.oid + "." + user.tid;
-                let account: AccountInfo = null;
+                let account: AccountInfo | null = null;
                 for (let i: number = 0; i < accounts.length; i++) {
                     if (accounts[i].homeAccountId == homeAccountId) {
                         account = accounts[i];
@@ -2393,7 +2448,7 @@ async function azureDefineHeaders(
                 }
                 instance.acquireTokenRedirect({
                     scopes: ["https://management.azure.com/user_impersonation"],
-                    account: account
+                    account: account!
                 });
             }
             catch (error: any) {
@@ -2420,7 +2475,8 @@ export async function canListRootAssignments(instance: IPublicClientApplication,
         listrootassignmentsEndpoint += "'";
         let response = await fetch(listrootassignmentsEndpoint, options);
         if (response.status == 200) {
-            let data = await response.json();
+            let data: any = await response.json();
+            data = data;
             debugger;
             console.log("Successful call to Azure Resource Graph list root assignments");
         }
@@ -2479,19 +2535,20 @@ async function readResources(instance: IPublicClientApplication, user: User): Pr
         let response = await fetch(listrootassignmentsEndpoint, options);
         if (response.status == 200) {
             let data = await response.json();
+            data = data;
             debugger;
             console.log("Successful call to Azure Resource Graph list root assignments");
         }
         else {
             console.log(await processErrors(response));
-            return false;
+            return resources;
         }
     }
     catch (error: any) {
         console.log(error);
-        return false;
+        return resources;
     }
-    return true;
+    return resources;
 }
 
 //hybridspa.ts - calls to Mindline Config API
@@ -2514,7 +2571,6 @@ async function mindlineDefineHeaders(
     instance: IPublicClientApplication,
     user: User
 ): Promise<Headers> {
-    debugger;
     const headers = new Headers();
     headers.append("Content-Type", "application/json");
     headers.append("accept", "*/*");
@@ -2523,7 +2579,7 @@ async function mindlineDefineHeaders(
     try {
         let accounts: AccountInfo[] = instance.getAllAccounts();
         let homeAccountId = user.oid + "." + user.tid;
-        let account: AccountInfo = null;
+        let account: AccountInfo | null = null;
         for (let i: number = 0; i < accounts.length; i++) {
             if (accounts[i].homeAccountId == homeAccountId) {
                 account = accounts[i];
@@ -2531,7 +2587,7 @@ async function mindlineDefineHeaders(
         }
         let response: AuthenticationResult = await instance.acquireTokenSilent({
             scopes: [apiScope],
-            account: account
+            account: account!
         });
         user.mindlineAccessToken = response.accessToken; // cache access token
         console.log("Front end mindline token acquired silently: " + user.mindlineAccessToken.slice(0, 20));
@@ -2542,7 +2598,7 @@ async function mindlineDefineHeaders(
             // fallback to redirect if silent acquisition fails
             let accounts: AccountInfo[] = instance.getAllAccounts();
             let homeAccountId = user.oid + "." + user.tid;
-            let account: AccountInfo = null;
+            let account: AccountInfo | null = null;
             for (let i: number = 0; i < accounts.length; i++) {
                 if (accounts[i].homeAccountId == homeAccountId) {
                     account = accounts[i];
@@ -2551,7 +2607,7 @@ async function mindlineDefineHeaders(
             // assumption: this redirect will trigger login flow callbacks in program.cs
             instance.acquireTokenRedirect({
                 scopes: [apiScope],
-                account: account
+                account: account!
             });
         }
         catch (error: any) {
@@ -2664,7 +2720,7 @@ export async function adminsGet(
             if (returnedArray != null) {
                 result.array = returnedArray;
                 let initialValue: string = "";
-                console.log(`Successful GET from /admins: ${result.array.reduce((acc, curr) => acc + curr.email + " ", initialValue)}`);
+                console.log(`Successful GET from /admins: ${result.array.reduce((acc, curr: any) => acc + curr.email + " ", initialValue)}`);
                 return result;
             }
             else {
@@ -2830,6 +2886,7 @@ export async function configDelete(
     workspaceId: string,
     debug: boolean
 ): Promise<APIResult> {
+    debug = debug;
     let result: APIResult = new APIResult();
     if (config.id === "" || workspaceId == "") {
         result.result = false;
@@ -3100,7 +3157,7 @@ export async function configsGet(
             if (returnedArray != null) {
                 result.array = returnedArray;
                 let initialValue: string = "";
-                console.log(`Successful GET from /configurations: ${result.array.reduce((acc, curr) => acc + curr.name + " ", initialValue)}`);
+                console.log(`Successful GET from /configurations: ${result.array.reduce((acc, curr: any) => acc + curr.name + " ", initialValue)}`);
                 return result;
             }
             else {
@@ -3192,6 +3249,7 @@ export async function tenantDelete(
     workspaceId: string,
     debug: boolean
 ): Promise<APIResult> {
+    debug = debug;
     let result: APIResult = new APIResult();
     // we expect valid tid amd workspaceId
     if (tenant.tid === "" || workspaceId === "") {
@@ -3265,7 +3323,7 @@ export async function tenantsGet(
             if (returnedArray != null) {
                 result.array = returnedArray;
                 let initialValue: string = "";
-                console.log(`Successful GET from /tenants: ${result.array.reduce((acc, curr) => acc + curr.domain + " ", initialValue)}`);
+                console.log(`Successful GET from /tenants: ${result.array.reduce((acc, curr: any) => acc + curr.domain + " ", initialValue)}`);
                 return result;
             }
             else {
@@ -3421,7 +3479,7 @@ export async function workspacesGet(
             if (returnedArray != null) {
                 result.array = returnedArray;
                 let initialValue: string = "";
-                console.log(`Successful GET from /workspaces: ${result.array.reduce((acc, curr) => acc + curr.name + " ", initialValue)}`);
+                console.log(`Successful GET from /workspaces: ${result.array.reduce((acc, curr: any) => acc + curr.name + " ", initialValue)}`);
                 return result;
             }
             else {