@mindline/sync 1.0.40 → 1.0.42

package/.vs/VSWorkspaceState.json

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

package/index.d.ts

@@ -26,6 +26,7 @@ declare module "@mindline/sync" {
         loginHint: string;
         scopes: string[];
         authTS: Date;
+        claimsprincipal: string; // claims principal cached at login to allow clearing cache at logout
         constructor();
     }
     // tenant (Azure AD tenant, AD domain, Google workspace)
@@ -104,7 +105,7 @@ declare module "@mindline/sync" {
     export type TaskType = "initialization" | 
                             "authenticate user" | 
                             "reload React" | 
-                            "PUT access token" | 
+                            "PUT tenant" | 
                             "GET tenant details" | 
                             "POST config init" |
                             "GET workspaces" |
@@ -203,6 +204,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;
@@ -220,7 +222,7 @@ declare module "@mindline/sync" {
     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 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 tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean): Promise<boolean>;

package/index.ts

@@ -732,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);
@@ -803,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");
@@ -823,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/;
@@ -878,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;
@@ -889,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;
@@ -898,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;
+                setConfigSyncResult("nothing to sync");
+                console.log(`Setting config sync result: "nothing to sync"`);
             }
-            // 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"`);
+            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
@@ -986,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);
     }
@@ -1047,11 +1074,11 @@ export async function groupsGet(instance: IPublicClientApplication, user: User |
     }
 }
 export function signIn(user: User, tasks: TaskArray): void {
+    // SignIn by an admin consents the full set of permissions, unlike Challenge which requires a consented app
     let tenantURL: string = window.location.href;
-    tenantURL += "MicrosoftIdentity/Account/Challenge";
+    tenantURL += "MicrosoftIdentity/Account/SignIn";
     let url: URL = new URL(tenantURL);
     url.searchParams.append("redirectUri", window.location.origin);
-    url.searchParams.append("scope", "openid offline_access Directory.AccessAsUser.All CrossTenantInformation.ReadBasic.All");
     url.searchParams.append("domainHint", "organizations");
     if (user.oid !== "1") {
         url.searchParams.append("loginHint", user.mail);
@@ -1072,18 +1099,31 @@ export function signInIncrementally(user: User, scope: string): void {
     url.searchParams.append("loginHint", user.mail);
     window.location.assign(url.href);
 }
-export function signOut(user: User): void {
+export async function signOut(user: User): Promise<boolean>{
     if (user.oid == "1") return;
-    // these lines provide more callbacks during logout
-    //let tenantURL: string = window.location.href;
-    //tenantURL += "MicrosoftIdentity/Account/SignOut";
-    // this line takes advantage of our saved loginHint to logout right away, but requires additional  cleanup logic
-    // https://aaddevsup.azurewebsites.net/2022/03/how-to-logout-of-an-oauth2-application-without-getting-prompted-to-select-a-user/
-    let tenantURL: string = "https://login.microsoftonline.com/common/oauth2/logout";
-    let url: URL = new URL(tenantURL);
-    url.searchParams.append("post_logout_redirect_uri", window.location.origin);
-    url.searchParams.append("logout_hint", user.loginHint);
-    window.location.assign(url.href);
+    // set logout_hint in the .NET session for streamlined logout
+    let userEndpoint: string = window.location.href;
+    userEndpoint += "user";
+    let url = new URL(userEndpoint);
+    url.searchParams.append("oid", user.oid);
+    url.searchParams.append("tid", user.tid);
+    url.searchParams.append("loginHint", user.loginHint);
+    url.searchParams.append("verb", "LOGOUT");
+    let options = { method: "PATCH" };
+    let userLogoutResponse: Response = await fetch(url.href, options);
+    if (userLogoutResponse.status == 200 && userLogoutResponse.statusText == "OK") {
+        console.log(`Successfully set admin ${user.mail} logout_hint`);
+    }
+    else {
+        console.log(`Failed to set admin ${user.mail} logout_hint`);
+        return;
+    }
+    // start the logout process triggering callbacks during logout
+    //      OnRedirectToIdentityProviderForSignOut - this is where we set the logout_hint for user we are trying to logout
+    //      OnSignedOutCallbackRedirect - called when the call sucessfully completes
+    let signoutURL: string = window.location.href;
+    signoutURL += "MicrosoftIdentity/Account/SignOut";
+    window.location.assign(signoutURL);
 }
 //tenantRelationshipsGetByDomain - query AAD for associated company name and id
 export async function tenantRelationshipsGetByDomain(loggedInUser: User, tenant: Tenant, instance: IPublicClientApplication, debug: boolean): Promise<boolean> {

package/package.json

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

package/tasks.ts

@@ -26,7 +26,7 @@ const data: any[] = [
             },
             {
                 id: 4,
-                task: "PUT access token",
+                task: "PUT tenant",
                 start: "1970-01-01T00:00:00",
                 end: "1970-01-01T00:00:00",
                 expected: "0:01",