@mindline/sync 1.0.39 → 1.0.41

package/.vs/VSWorkspaceState.json

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

package/hybridspa.ts

@@ -51,7 +51,8 @@ export const graphConfig = {
     authorityCNRegex: /^(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$/,
 };
 // helper functions
-async function defineHeaders(
+// TODO: this is where you want to trigger a re-authentication if token expires
+export async function defineHeaders(
     instance: IPublicClientApplication,
     user: User
 ): Promise<Headers> {
@@ -758,16 +759,8 @@ export async function tenantPut(
     let tenantEndpoint: string = graphConfig.tenantEndpoint;
     // create tenant headers
     const headers = await defineHeaders(instance, authorizedUser);
-    // be sure we send null and not "null" in body
-    let readAccessToken: string = tenant.readServicePrincipal
-        ? `"${tenant.readServicePrincipal}"`
-        : "null";
-    let writeAccessToken: string = tenant.writeServicePrincipal
-        ? `"${tenant.writeServicePrincipal}"`
-        : "null";
     // create tenant body
-    let tenantBody: string = `
-  {"tenantId": "${tenant.tid}", "readServicePrincipal": ${readAccessToken}, "writeServicePrincipal": ${writeAccessToken}}`;
+    let tenantBody: string = `{"tenantId": "${tenant.tid}"}`;
     let options = { method: "PUT", headers: headers, body: tenantBody };
     // make tenant endpoint call
     try {

package/index.d.ts

@@ -50,8 +50,6 @@ declare module "@mindline/sync" {
         permissionType: TenantPermissionTypeStrings; // read/write/notassigned
         onboarded: string;  // have we onboarded this tenant? "true" or "false"
         authority: string;  // from AAD ID auth response
-        readServicePrincipal: string; // from AAD consent
-        writeServicePrincipal: string; // from AAD consent
         workspaceIDs: string;
         constructor();
     }
@@ -205,6 +203,7 @@ declare module "@mindline/sync" {
         read: number;
         written: number;
         deferred: number;
+        nothingtosync: boolean;
         targets: TenantNode[];
         constructor(tid: string, name: string);
         update(total: number, read: number, written: number, deferred: number): void;
@@ -219,15 +218,14 @@ declare module "@mindline/sync" {
     //
     // Azure AD Graph API
     //
-    export function groupGet(tenant: Tenant, groupid: string): Promise<{group: string, error: string}>;
-    export function groupsGet(tenant: Tenant, groupSearchString: string): Promise<{groups: Group[], error: string}>;
+    export function groupsGet(instance: IPublicClientApplication, user: User | undefined, groupSearchString: string): Promise<{groups: Group[], error: string}>;
     export function signIn(user: User, tasks: TaskArray): void;
     export function signInIncrementally(user: User, scope: string): void;
     export function signOut(user: User): void;
     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 tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean): Promise<boolean>;
-    export function usersGet(tenant: Tenant): { users: string[], error: string };
+    export function usersGet(instance: IPublicClientApplication, user: User | undefined): { users: string[], error: string };
     //
     // Mindline Config API
     //

package/index.ts

@@ -2,7 +2,7 @@
 import * as signalR from "@microsoft/signalr"
 import { IPublicClientApplication, AuthenticationResult } from "@azure/msal-browser"
 import { deserializeArray, instanceToPlain, ClassTransformOptions } from 'class-transformer';
-import { adminDelete, adminPost, adminsGet, configDelete, configsGet, configPost, configPut, graphConfig, initPost, readerPost, tenantPut, tenantPost, tenantDelete, tenantsGet, workspacesGet } from './hybridspa';
+import { defineHeaders, adminDelete, adminPost, adminsGet, configDelete, configsGet, configPost, configPut, graphConfig, initPost, readerPost, tenantPut, tenantPost, tenantDelete, tenantsGet, workspacesGet } from './hybridspa';
 import { version } from './package.json';
 import users from "./users.json";
 import tenants from "./tenants.json";
@@ -79,8 +79,6 @@ export class Tenant {
     permissionType: TenantPermissionTypeStrings;
     onboarded: string;
     authority: string;
-    readServicePrincipal: string;
-    writeServicePrincipal: string;
     workspaceIDs: string;
     constructor() {
         this.tid = "";
@@ -90,8 +88,6 @@ export class Tenant {
         this.permissionType = "notassigned";
         this.onboarded = "false";
         this.authority = "";
-        this.readServicePrincipal = "";
-        this.writeServicePrincipal = "";
         this.workspaceIDs = "";
     }
 }
@@ -736,22 +732,32 @@ export class BatchArray {
         this.pb_idleMax = 0;
         setIdleText(`No updates seen for ${this.pb_idle} seconds. [max idle: ${this.pb_idleMax}]`);
         this.pb_timer = setInterval(() => {
-            // if we go 20 seconds without a signalR message, finish the sync
-            this.pb_idle = this.pb_idle + 1;
-            this.pb_idleMax = Math.max(this.pb_idle, this.pb_idleMax);
-            setIdleText(`No updates seen for ${this.pb_idle} seconds. [max idle: ${this.pb_idleMax}]`);
-            if (this.pb_idle >= 20) {
+            // if signalR has finished the sync, stop the timer
+            if (this.milestoneArray.milestones[0].Write != null) {
                 clearInterval(this.pb_timer);
                 this.pb_timer = null;
-                if (this.milestoneArray.milestones[0].Write == null) {
-                    this.milestoneArray.write(setMilestones);
-                }
-                setConfigSyncResult(`finished sync, no updates for ${this.pb_idle} seconds`);
-            }
-            // if we get to 100, stop the timer, let SignalR or countdown timer finish sync
-            if (this.pb_progress < 100) {
-                this.pb_progress = Math.min(100, this.pb_progress + this.pb_increment);
+                this.pb_progress = 100;
                 setSyncProgress(this.pb_progress);
+                setIdleText(`Complete. [max idle: ${this.pb_idleMax}]`);
+            }
+            else {
+                // if we've gone 30 seconds without a signalR message, finish the sync
+                this.pb_idle = this.pb_idle + 1;
+                this.pb_idleMax = Math.max(this.pb_idle, this.pb_idleMax);
+                setIdleText(`No updates seen for ${this.pb_idle} seconds. [max idle: ${this.pb_idleMax}]`);
+                if (this.pb_idle >= 60) {
+                    clearInterval(this.pb_timer);
+                    this.pb_timer = null;
+                    if (this.milestoneArray.milestones[0].Write == null) {
+                        this.milestoneArray.write(setMilestones);
+                        setConfigSyncResult(`finished sync, no updates for ${this.pb_idle} seconds`);
+                    }
+                }
+                // if we get to 100, the progress bar stops but SignalR or countdown timer completes the sync
+                if (this.pb_progress < 100) {
+                    this.pb_progress = Math.min(100, this.pb_progress + this.pb_increment);
+                    setSyncProgress(this.pb_progress);
+                }
             }
         }, 1000);
         this.milestoneArray.start(setMilestones);
@@ -807,10 +813,13 @@ export class BatchArray {
                 return;
             }
             tenantNode.batchId = matchingPair.BatchId;
-            // process stats for this SignalR message batch
+            // process stats for this SignalR message (one batch per tenant node)
             let statsarray = item.Stats; // get the array of statistics
             let statskeys = Object.keys(statsarray); // get the keys of the array
             let statsvalues = Object.values(statsarray); // get the values of the array
+            // does this tenantnode/batch have nothing to sync?
+            let bTotalCountZero: boolean = false;
+            let bCurrentCountZero: boolean = false;
             for (let j = 0; j < statskeys.length; j++) {
                 let bTotalCount = statskeys[j].endsWith("TotalCount");
                 let bCurrentCount = statskeys[j].endsWith("CurrentCount");
@@ -827,15 +836,18 @@ export class BatchArray {
                         return;
                     }
                     if (bTotalCount) {
+                        bTotalCountZero = Number(statsvalues[j]) == 0;
                         tenantNode.total = Math.max(Number(statsvalues[j]), tenantNode.total);
                         console.log(`----- ${tenantNode.name} TID: ${tenantNode.tid} batchId: ${tenantNode.batchId}`);
                         console.log(`----- ${tenantNode.name} Total To Read: ${tenantNode.total}`);
                     }
                     else {
+                        bCurrentCountZero = Number(statsvalues[j]) == 0;
                         tenantNode.read = Math.max(Number(statsvalues[j]), tenantNode.read);
                         console.log(`----- ${tenantNode.name} Currently Read: ${tenantNode.read}`);
                     }
                 }
+                tenantNode.nothingtosync = bTotalCountZero && bCurrentCountZero;
                 if (statskeys[j].startsWith("Writer")) {
                     // parse tid from Writer key
                     let tidRegexp = /Writer\/TID:(.+)\/TotalCount/;
@@ -882,6 +894,7 @@ export class BatchArray {
             let bReadingComplete: boolean = true;
             let bWritingComplete: boolean = true;
             let bWritingStarted: boolean = false;
+            let bNothingToSync: boolean = true;
             let readerTotal: number = 0;
             let readerCurrent: number = 0;
             let writerTotal: number = 0;
@@ -893,6 +906,7 @@ export class BatchArray {
                     writerTotal += Math.max(writerNode.total, sourceTenantNode.total);
                     writerCurrent += writerNode.written;
                 });
+                bNothingToSync &&= sourceTenantNode.nothingtosync;
                 bReadingComplete &&= (sourceTenantNode.status == "complete" || sourceTenantNode.status == "failed");
                 readerTotal += sourceTenantNode.total;
                 readerCurrent += sourceTenantNode.read;
@@ -902,37 +916,44 @@ export class BatchArray {
             setReadersCurrent(readerCurrent);
             setWritersTotal(Math.max(writerTotal, readerTotal));
             setWritersCurrent(writerCurrent);
-            // because it is an important milestone, we always check if we have *just* completed reading
-            if (bReadingComplete && this.milestoneArray.milestones[0].Read == null) {
-                this.milestoneArray.read(setMilestones);
-                setConfigSyncResult("reading complete");
-                console.log(`Setting config sync result: "reading complete"`);
-                // trigger refresh delta tokens
-                setRefreshDeltaTrigger(true);
-                // change to % per second to complete in 7x as long as it took to get here
-                let readTS = Date.now();
-                let secsElapsed = (readTS - this.pb_startTS) / 1000;
-                let expectedPercentDone = 7;
-                let expectedPercentPerSecond = secsElapsed / expectedPercentDone;
-                this.pb_increment = expectedPercentPerSecond;
-                console.log(`Setting increment: ${this.pb_increment}% per second`);
-            }
-            // with that out of the way, is writing complete?
-            if (bWritingComplete) {
+            // check to see if there was nothing to sync
+            if (bNothingToSync) {
                 this.milestoneArray.write(setMilestones);
-                setConfigSyncResult("sync complete");
-                console.log(`Setting config sync result: "complete"`);
-                this.pb_progress = 99;
-            }
-            // if not, has writing even started?
-            else if (bWritingStarted) {
-                setConfigSyncResult("writing in progress");
-                console.log(`Setting config sync result: "writing in progress"`);
+                setConfigSyncResult("nothing to sync");
+                console.log(`Setting config sync result: "nothing to sync"`);
             }
-            // else, we must be reading (unless we already completed reading)
-            else if (this.milestoneArray.milestones[0].Read == null){
-                setConfigSyncResult("reading in progress");
-                console.log(`Setting config sync result: "reading in progress"`);
+            else {
+                // because it is an important milestone, we always check if we have *just* completed reading
+                if (bReadingComplete && this.milestoneArray.milestones[0].Read == null) {
+                    this.milestoneArray.read(setMilestones);
+                    setConfigSyncResult("reading complete");
+                    console.log(`Setting config sync result: "reading complete"`);
+                    // trigger refresh delta tokens
+                    setRefreshDeltaTrigger(true);
+                    // change to % per second to complete in 7x as long as it took to get here
+                    let readTS = Date.now();
+                    let secsElapsed = (readTS - this.pb_startTS) / 1000;
+                    let expectedPercentDone = 7;
+                    let expectedPercentPerSecond = secsElapsed / expectedPercentDone;
+                    this.pb_increment = expectedPercentPerSecond;
+                    console.log(`Setting increment: ${this.pb_increment}% per second`);
+                }
+                // with that out of the way, is writing complete?
+                if (bWritingComplete) {
+                    this.milestoneArray.write(setMilestones);
+                    setConfigSyncResult("sync complete");
+                    console.log(`Setting config sync result: "complete"`);
+                }
+                // if not, has writing even started?
+                else if (bWritingStarted) {
+                    setConfigSyncResult("writing in progress");
+                    console.log(`Setting config sync result: "writing in progress"`);
+                }
+                // else, we must be reading (unless we already completed reading)
+                else if (this.milestoneArray.milestones[0].Read == null) {
+                    setConfigSyncResult("reading in progress");
+                    console.log(`Setting config sync result: "reading in progress"`);
+                }
             }
         }
         // start SignalR connection based on each batchId
@@ -990,12 +1011,14 @@ export class TenantNode {
     read: number;
     written: number;
     deferred: number;
+    nothingtosync: boolean;
     targets: TenantNode[];
     constructor(tid: string, name: string, batchId: string) {
         this.expanded = false;
         this.name = name;
         this.tid = tid;
         this.batchId = batchId;
+        this.nothingtosync = false;
         this.targets = new Array<TenantNode>();
         this.update(0, 0, 0, 0);
     }
@@ -1026,48 +1049,14 @@ export class APIResult {
 //
 // Azure AD Graph API
 //
-//groupGet - GET /groups/{id}
-export async function groupGet(tenant: Tenant, groupid: string): Promise<{ group: string, error: string }> {
-    // need a read or write access token to get graph users
-    let accessToken: string = "";
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.read])
-        accessToken = tenant.readServicePrincipal;
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.write])
-        accessToken = tenant.writeServicePrincipal;
-    if (accessToken === "") return { group: "", error: "no access token specified" };
-    // prepare Authorization headers as part of options
-    const headers = new Headers();
-    const bearer = `Bearer ${accessToken}`;
-    headers.append("Authorization", bearer);
-    let options = { method: "GET", headers: headers };
-    // make /groups endpoint call
-    try {
-        let groupsEndpoint = `${graphConfig.graphGroupsEndpoint}/${groupid}`;
-        let response = await fetch(groupsEndpoint, options);
-        let data = await response.json();
-        if (typeof data.error !== "undefined") {
-            return { group: "", error: `${data.error.code}: ${data.error.message}` };
-        }
-        return { group: data.value, error: `` };
-    }
-    catch (error: any) {
-        console.log(error);
-        return { group: "", error: `Exception: ${error}` };
-    }
-}
 //groupsGet - GET /groups
-export async function groupsGet(tenant: Tenant, groupSearchString: string): Promise<{ groups: Group[], error: string }> {
-    // need a read or write access token to get graph users
-    let accessToken: string = "";
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.read])
-        accessToken = tenant.readServicePrincipal;
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.write])
-        accessToken = tenant.writeServicePrincipal;
-    if (accessToken === "") return { groups: [], error: "no access token specified" };
-    // prepare Authorization headers as part of options
-    const headers = new Headers();
-    const bearer = `Bearer ${accessToken}`;
-    headers.append("Authorization", bearer);
+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
+    if (user == null || user.spacode == "") {
+        return { groups: [], error: `500: invalid user passed to groupsGet` };
+    }
+    // create headers
+    const headers = await defineHeaders(instance, user);
     let options = { method: "GET", headers: headers };
     // make /groups endpoint call
     try {
@@ -1081,7 +1070,7 @@ export async function groupsGet(tenant: Tenant, groupSearchString: string): Prom
     }
     catch (error: any) {
         console.log(error);
-        return { group: "", error: `Exception: ${error}` };
+        return { groups: [], error: `Exception: ${error}` };
     }
 }
 export function signIn(user: User, tasks: TaskArray): void {
@@ -1295,18 +1284,13 @@ export async function tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean
     return false; // failed, no need for UX to re-render
 }
 //usersGet - GET from AAD Users endpoint
-export async function usersGet(tenant: Tenant): Promise<{ users: string[], error: string }> {
-    // need a read or write access token to get graph users
-    let accessToken: string = "";
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.read])
-        accessToken = tenant.readServicePrincipal;
-    if (tenant.permissionType === TenantPermissionType[TenantPermissionType.write])
-        accessToken = tenant.writeServicePrincipal;
-    if (accessToken === "") return { users: [], error: "no access token specified" };
-    // prepare Authorization headers as part of options
-    const headers = new Headers();
-    const bearer = `Bearer ${accessToken}`;
-    headers.append("Authorization", bearer);
+export async function usersGet(instance: IPublicClientApplication, user: User | undefined): Promise<{ users: string[], error: string }> {
+    // need a logged in user to get graph users
+    if (user == null || user.spacode == "") {
+        return { users: [], error: `500: invalid user passed to groupsGet` };
+    }
+    // create headers
+    const headers = await defineHeaders(instance, user);
     let options = { method: "GET", headers: headers };
     // make /users endpoint call
     try {
@@ -1315,7 +1299,7 @@ export async function usersGet(tenant: Tenant): Promise<{ users: string[], error
         if (typeof data.error !== "undefined") {
             return { users: [], error: `${data.error.code}: ${data.error.message}` };
         }
-        let users = new Array<User>();
+        let users = new Array<string>();
         for (let user of data.value) {
             users.push(user.mail);
         }
@@ -1496,8 +1480,6 @@ function processReturnedTenants(workspace: Workspace, ii: InitInfo, returnedTena
         const regexMatch = item.authority.match(regex);
         tenant.authority = regexMatch ? regexMatch[1] : item.authority;
 
-        tenant.readServicePrincipal = item.readServicePrincipal;
-        tenant.writeServicePrincipal = item.writeServicePrincipal;
         // ensure this workspace tracks this tenant
         let idx = workspace.associatedTenants.findIndex((t) => t === item.tenantId);
         if (idx == -1) workspace.associatedTenants.push(item.tenantId);

package/package.json

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

package/tenants.json

@@ -6,8 +6,6 @@
     "tenantType": "",
     "permissionType": "",
     "onboarded": false,
-    "authority": "",
-    "readServicePrincipal": "",
-    "writeServicePrincipal": ""
+    "authority": ""
   }
 ]

package/tenants2.json

@@ -4,53 +4,41 @@
     "name": "Mindline1",
     "domain": "mindline1.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "df9c2e0a-f6fe-43bb-a155-d51f66dffe0e",
     "name": "Mindline2",
     "domain": "mindline2.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "1",
     "name": "WhoIam",
     "domain": "whoiam.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "2",
     "name": "Grit Software",
     "domain": "gritsoftware.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "3",
     "name": "Google",
     "domain": "google.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   },
   {
     "tid": "4",
     "name": "Trackman Golf",
     "domain": "trackman.onmicrosoft.com",
     "tenantType": "aad",
-    "authority": "https://login.microsoftonline.com/common/",
-    "readServicePrincipal": "TODO",
-    "writeServicePrincipal": "TODO"
+    "authority": "https://login.microsoftonline.com/common/"
   }
 ]