@mindline/sync 1.0.46 → 1.0.49

package/.vs/VSWorkspaceState.json

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

package/hybridspa.ts

@@ -893,7 +893,14 @@ export async function readerPost(
         if (response.status === 200 && response.statusText === "OK") {
             console.log(`Successful POST to /startSync: ${readerEndpoint}`);
             let jsonResponse = await response.json();
-            result.array = JSON.parse(jsonResponse.PayloadStr);
+            if (jsonResponse.PayloadStr != "") {
+                result.array = JSON.parse(jsonResponse.PayloadStr);
+            }
+            else {
+                result.result = false;
+                result.error = "readerPost: blank payload returned, sync may be disabled on back end";
+                result.status = 500;
+            }
             return result;
         } else {
             result.error = await processErrors(response);

package/index.d.ts

@@ -116,7 +116,6 @@ declare module "@mindline/sync" {
     export type TaskType = "initialization" | 
                             "authenticate user" | 
                             "reload React" | 
-                            "PUT tenant" | 
                             "GET tenant details" | 
                             "POST config init" |
                             "GET workspaces" |
@@ -233,6 +232,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 requestAdminConsent(user: User, scope: string): void;
     export function signOut(user: User): boolean;
     export function tenantRelationshipsGetByDomain(loggedInuser: User, tenant: Tenant, instance: IPublicClientApplication, debug: boolean): boolean;
     export function tenantRelationshipsGetById(user: User, ii: InitInfo, instance: IPublicClientApplication, tasks: TaskArray, debug: boolean): boolean;

package/index.ts

@@ -391,7 +391,6 @@ export class InitInfo {
 export type TaskType = "initialization" |
     "authenticate user" |
     "reload React" |
-    "PUT tenant" | 
     "GET tenant details" |
     "POST config init" |
     "GET workspaces" |
@@ -822,7 +821,7 @@ export class BatchArray {
         this.pb_increment = 1;
         this.pb_idle = 0;
         this.pb_idleMax = 0;
-        setIdleText(`No updates seen for ${this.pb_idle} seconds. [max idle: ${this.pb_idleMax}]`);
+        setIdleText(`No updates seen for ${this.pb_idle} seconds. [max idle: ${this.pb_idleMax}/60]`);
         this.pb_timer = setInterval(() => {
             // if signalR has finished the sync, stop the timer
             if (this.milestoneArray.milestones[0].Write != null) {
@@ -833,10 +832,10 @@ export class BatchArray {
                 setIdleText(`Complete. [max idle: ${this.pb_idleMax}]`);
             }
             else {
-                // if we've gone 30 seconds without a signalR message, finish the sync
+                // if we've gone 60 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}]`);
+                setIdleText(`No updates seen for ${this.pb_idle} seconds. [max idle: ${this.pb_idleMax}/60]`);
                 if (this.pb_idle >= 60) {
                     clearInterval(this.pb_timer);
                     this.pb_timer = null;
@@ -916,11 +915,13 @@ export class BatchArray {
                 let bTotalCount = statskeys[j].endsWith("TotalCount");
                 let bCurrentCount = statskeys[j].endsWith("CurrentCount");
                 let bDeferredCount = statskeys[j].endsWith("DeferredCount");
+                let bRescheduledCount = statskeys[j].endsWith("RescheduledCount");
                 if (statskeys[j].startsWith("Reader")) {
                     // parse tid from Reader key
                     let tidRegexp = /Reader\/TID:(.+)\/TotalCount/;
                     if (bCurrentCount) tidRegexp = /Reader\/TID:(.+)\/CurrentCount/;
                     if (bDeferredCount) tidRegexp = /Reader\/TID:(.+)\/DeferredCount/;
+                    if (bRescheduledCount) tidRegexp = /Reader\/TID:(.+)\/RescheduledCount/;
                     let matchTID = statskeys[j].match(tidRegexp);
                     if (matchTID == null) {
                         console.log(`tid not found in ${statskeys[j]}.`);
@@ -945,6 +946,7 @@ export class BatchArray {
                     let tidRegexp = /Writer\/TID:(.+)\/TotalCount/;
                     if (bCurrentCount) tidRegexp = /Writer\/TID:(.+)\/CurrentCount/;
                     if (bDeferredCount) tidRegexp = /Writer\/TID:(.+)\/DeferredCount/;
+                    if (bRescheduledCount) tidRegexp = /Writer\/TID:(.+)\/RescheduledCount/;
                     let matchTID = statskeys[j].match(tidRegexp);
                     if (matchTID == null) {
                         console.log(`tid not found in ${statskeys[j]}.`);
@@ -968,7 +970,7 @@ export class BatchArray {
                         writerNode.written = Math.max(Number(statsvalues[j]), writerNode.written);
                         console.log(`----- ${writerNode.name} Total Written: ${writerNode.written}`);
                     }
-                    else if (bDeferredCount) {
+                    else if (bDeferredCount || bRescheduledCount) {
                         writerNode.deferred = Math.max(Number(statsvalues[j]), writerNode.deferred);
                         console.log(`----- ${writerNode.name} Total Deferred: ${writerNode.deferred}`);
                     }
@@ -1181,6 +1183,9 @@ export function signIn(user: User, tasks: TaskArray): void {
 }
 export function signInIncrementally(user: User, scope: string): void {
     if (user.oid == "1") return;
+    //
+    // for delegated permissions, we can use the Microsoft Identity Web Account Controller Challenge method
+    //
     let tenantURL: string = window.location.href;
     tenantURL += "MicrosoftIdentity/Account/Challenge";
     let url: URL = new URL(tenantURL);
@@ -1190,6 +1195,31 @@ export function signInIncrementally(user: User, scope: string): void {
     url.searchParams.append("loginHint", user.mail);
     window.location.assign(url.href);
 }
+export function requestAdminConsent(user: User, scope: string): void {
+    if (user.oid == "1") return;
+    //
+    // for app permissions (app roles) we must use the /.default scope for admin consent
+    //      https://learn.microsoft.com/EN-US/azure/active-directory/develop/v2-admin-consent#:~:text=In%20order%20to%20request%20app%20permissions%2C%20you%20must%20use%20the%20/.default%20value.
+    //      https://learn.microsoft.com/en-us/answers/questions/431784/how-to-grant-application-permissions-with-dynamic
+    //
+    // this means that, if we want to be granular about SyncReader vs. SyncWriter permissions, we must have separate Applications
+    // for now, we request the /.default scope whenever any of the SyncReader or SyncWriter permissions are requested
+    //
+    // trying to use the Challenge endpoint for app permissions, setting this scope caused the call to quietly fail without error
+    // scope = "63100afe-506e-4bb2-8ff7-d8d5ab373129/.default";
+    //
+    // thereforce, we are assuming that, for app permissions (app roles), the Microsoft Identity Web Challenge endpoint does not work and we need to perform our own redirect to the admin consent endpoint
+    // https://learn.microsoft.com/EN-US/azure/active-directory/develop/scopes-oidc#client-credentials-grant-flow-and-default
+    // https://learn.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-client-creds-grant-flow#request-the-permissions-from-a-directory-admin
+    //
+    let adminConsentURL: string = "https://login.microsoftonline.com/";
+    adminConsentURL += user.tid;
+    adminConsentURL += "/adminconsent";
+    let url: URL = new URL(adminConsentURL);
+    url.searchParams.append("client_id", "63100afe-506e-4bb2-8ff7-d8d5ab373129");
+    url.searchParams.append("redirectUri", window.location.origin);
+    window.location.assign(url.href);
+}
 export async function signOut(user: User): Promise<boolean>{
     if (user.oid == "1") return;
     // set logout_hint in the .NET session for streamlined logout
@@ -1557,7 +1587,7 @@ function processReturnedAdmins(workspace: Workspace, ii: InitInfo, returnedAdmin
         }
         // refresh all the data available from the server
         user.oid = item.userId ? item.userId : item.email;
-        user.name = item.firstName;
+        user.name = item.firstName ?? user.name;
         user.mail = item.email;
         user.tid = item.tenantId;
         // ensure this workspace tracks this user

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mindline/sync",
   "type": "module",
-  "version": "1.0.46",
+  "version": "1.0.49",
   "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,14 +26,6 @@ const data: any[] = [
             },
             {
                 id: 4,
-                task: "PUT tenant",
-                start: "1970-01-01T00:00:00",
-                end: "1970-01-01T00:00:00",
-                expected: "0:01",
-                status: "not started"
-            },
-            {
-                id: 5,
                 task: "GET tenant details",
                 start: "1970-01-01T00:00:00",
                 end: "1970-01-01T00:00:00",
@@ -41,7 +33,7 @@ const data: any[] = [
                 status: "not started"
             },
             {
-                id: 6,
+                id: 5,
                 task: "POST config init",
                 start: "1970-01-01T00:00:00",
                 end: "1970-01-01T00:00:00",
@@ -49,7 +41,7 @@ const data: any[] = [
                 status: "not started"
             },
             {
-                id: 7,
+                id: 6,
                 task: "GET workspaces",
                 start: "1970-01-01T00:00:00",
                 end: "1970-01-01T00:00:00",