@mindline/sync 1.0.82 → 1.0.84

package/.vs/VSWorkspaceState.json

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

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

@@ -11,12 +11,8 @@
       "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:index.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\package.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:package.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\users.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
-      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:users.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.d.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:index.d.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}"
     }
   ],
   "DocumentGroupContainers": [
@@ -64,33 +60,40 @@
         },
         {
           "DockedWidth": 200,
-          "SelectedChildIndex": 2,
+          "SelectedChildIndex": 1,
           "Children": [
             {
               "$type": "Document",
               "DocumentIndex": 2,
-              "Title": "package.json",
-              "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\package.json",
-              "RelativeDocumentMoniker": "package.json",
-              "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\package.json",
-              "RelativeToolTip": "package.json",
-              "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
-              "WhenOpened": "2024-11-06T06:24:37.385Z",
+              "Title": "index.d.ts",
+              "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.d.ts",
+              "RelativeDocumentMoniker": "index.d.ts",
+              "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.d.ts",
+              "RelativeToolTip": "index.d.ts",
+              "ViewState": "AQIAAAAAAAAAAAAAAAAAABoAAAAoAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
+              "WhenOpened": "2025-01-29T23:22:53.18Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "users.json",
-              "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\users.json",
-              "RelativeDocumentMoniker": "users.json",
-              "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\users.json",
-              "RelativeToolTip": "users.json",
-              "ViewState": "AQIAAAAAAAAAAAAAAAAAAAUAAAASAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
-              "WhenOpened": "2024-11-05T22:57:19.003Z"
-            },
+              "DocumentIndex": 1,
+              "Title": "index.ts",
+              "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.ts",
+              "RelativeDocumentMoniker": "index.ts",
+              "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.ts",
+              "RelativeToolTip": "index.ts",
+              "ViewState": "AQIAACgAAAAAAAAAAADwvzMAAAAEAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
+              "WhenOpened": "2025-01-29T14:51:05.763Z",
+              "EditorCaption": ""
+            }
+          ]
+        },
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": 0,
+          "Children": [
             {
               "$type": "Document",
               "DocumentIndex": 0,
@@ -99,23 +102,10 @@
               "RelativeDocumentMoniker": "hybridspa.ts",
               "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\hybridspa.ts",
               "RelativeToolTip": "hybridspa.ts",
-              "ViewState": "AQIAABwAAAAAAAAAAAAAABwAAAAUAAAA",
+              "ViewState": "AQIAAH4BAAAAAAAAAADwv5UBAAAiAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2024-11-04T14:16:26.493Z",
               "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "index.ts",
-              "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.ts",
-              "RelativeDocumentMoniker": "index.ts",
-              "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\index.ts",
-              "RelativeToolTip": "index.ts",
-              "ViewState": "AQIAAPQGAAAAAAAAAAAswNQHAAAdAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
-              "WhenOpened": "2024-05-12T20:20:11.888Z",
-              "EditorCaption": ""
             }
           ]
         },

package/hybridspa.ts

@@ -37,10 +37,28 @@ async function mindlineDefineHeaders(
     const headers = new Headers();
     headers.append("Content-Type", "application/json");
     headers.append("accept", "*/*");
-    // authorization header - if needed, retrieve and cache access token
-    if (user.mindlineAccessToken == null || user.mindlineAccessToken === "") {
-        const apiScope: string = getAPIScope(user);
+    // always call acquireTokenSilent, handling expired tokens on exception
+    const apiScope: string = getAPIScope(user);
+    try {
+        let accounts: AccountInfo[] = instance.getAllAccounts();
+        let homeAccountId = user.oid + "." + user.tid;
+        let account: AccountInfo = null;
+        for (let i: number = 0; i < accounts.length; i++) {
+            if (accounts[i].homeAccountId == homeAccountId) {
+                account = accounts[i];
+            }
+        }
+        let response: AuthenticationResult = await instance.acquireTokenSilent({
+            scopes: [apiScope],
+            account: account
+        });
+        user.mindlineAccessToken = response.accessToken; // cache access token
+        console.log("Front end mindline token acquired silently: " + user.mindlineAccessToken.slice(0, 20));
+    }
+    catch (error: any) {
         try {
+            console.log("Front end mindline token silent acquisition failure, triggering redirect: " + error);
+            // fallback to redirect if silent acquisition fails
             let accounts: AccountInfo[] = instance.getAllAccounts();
             let homeAccountId = user.oid + "." + user.tid;
             let account: AccountInfo = null;
@@ -49,33 +67,14 @@ async function mindlineDefineHeaders(
                     account = accounts[i];
                 }
             }
-            let response: AuthenticationResult = await instance.acquireTokenSilent({
+            // assumption: this redirect will trigger login flow callbacks in program.cs
+            instance.acquireTokenRedirect({
                 scopes: [apiScope],
                 account: account
             });
-            user.mindlineAccessToken = response.accessToken; // cache access token
-            console.log("Front end token acquired silently: " + user.mindlineAccessToken.slice(0, 20));
         }
         catch (error: any) {
-            try {
-                console.log("Front end token silent acquisition failure: " + error);
-                // fallback to redirect if silent acquisition fails
-                let accounts: AccountInfo[] = instance.getAllAccounts();
-                let homeAccountId = user.oid + "." + user.tid;
-                let account: AccountInfo = null;
-                for (let i: number = 0; i < accounts.length; i++) {
-                    if (accounts[i].homeAccountId == homeAccountId) {
-                        account = accounts[i];
-                    }
-                }
-                instance.acquireTokenRedirect({
-                    scopes: [apiScope],
-                    account: account
-                });
-            }
-            catch (error: any) {
-                console.log("Front end token popup acquisition failure: " + error);
-            }
+            console.log("Front end mindline token redirect acquisition failure: " + error);
         }
     }
     headers.append("Authorization", `Bearer ${user.mindlineAccessToken}`);
@@ -88,8 +87,9 @@ export async function processErrors(response: Response): Promise<string> {
         if (errorString != "") return errorString;
     }
     let data = await response.json();
+    // process errors from Mindline Config API
     if (data.error !== undefined) {
-        errorString = `Error: ${data.error.code} Message: ${data.error.message}`;
+        errorString = `Error: ${data.error} Message: ${data.message}`;
     } else if (data.errors !== undefined) {
         let errorArray = Object.keys(data.errors);
         let errorlist: string = "";
@@ -387,6 +387,55 @@ export async function configDelete(
     }
     return result;
 }
+//configPatch
+export async function configPatch(
+    instance: IPublicClientApplication,
+    authorizedUser: User,
+    configurationId: string,
+    enabled: boolean,
+    debug: boolean
+): Promise<APIResult> {
+    let result: APIResult = new APIResult();
+    if (configurationId === "") {
+        result.result = false;
+        result.error = "configPatch: invalid config ID";
+        result.status = 500;
+        return result;
+    }
+    // create parametrized config endpoint
+    let endpoint: string = mindlineConfig.configEnabledEndpoint();
+    let url: URL = new URL(endpoint);
+    url.searchParams.append("configurationId", configurationId);
+    url.searchParams.append("isEnabled", enabled.toString());
+    // create config headers
+    const headers = await mindlineDefineHeaders(instance, authorizedUser);
+    let options = { method: "PATCH", headers: headers };
+    // make config endpoint call
+    try {
+        if (debug) debugger;
+        console.log("Attempting PATCH to /config: " + url.href);
+        let response = await fetch(url.href, options);
+        if (response.status === 200 && response.statusText === "OK") {
+            console.log(`Successful PATCH to ${url.href}: ${enabled.toString()}`);
+            return result;
+        }
+        else {
+            result.error = await processErrors(response);
+            console.log(`Failed PATCH to ${url.href}: ${enabled.toString()}`);
+            console.log(result.error);
+            result.status = 500;
+            result.result = false;
+            return result;
+        }
+    }
+    catch (error: any) {
+        result.error = error.message;
+        result.status = 500;
+        result.result = false;
+        console.log(error.message);
+    }
+    return result;
+}
 //configPost
 export async function configPost(
     instance: IPublicClientApplication,
@@ -489,7 +538,6 @@ export async function configPut(
     {
       "name": "${config.name}",
       "description": "${config.description}",
-      "isEnabled": ${config.isEnabled},
       "tenants": [`;
     config.tenants.map((tci: TenantConfigInfo) => {
         // if last character is } we need a comma first

package/index.d.ts

@@ -22,6 +22,8 @@ declare module "@mindline/sync" {
         static adminEndpoint(): string;
         static adminIncompleteEndpoint(): string;
         static adminsEndpoint(): string;
+        static configConsentEndpoint(): string;
+        static configEnabledEndpoint(): string;
         static configEndpoint(): string;
         static configsEndpoint(): string;
         static initEndpoint(): string;
@@ -319,15 +321,8 @@ declare module "@mindline/sync" {
     // ======================= Mindline Config API ===============================
     export function configConsentForRead(instance: IPublicClientApplication, authorizedUser: User, configId: string, tid: string, consent: boolean): Promise<APIResult>;
     export function configConsentForWrite(instance: IPublicClientApplication, authorizedUser: User, configId: string, tid: string, consent: boolean): Promise<APIResult>;
-    export function configEdit(
-        instance: IPublicClientApplication,
-        authorizedUser: User,
-        config: Config,
-        setConfigId: (id: string) => void,
-        setSelectedConfigs: (selectedConfigs: { [id: string]: boolean | number[] }) => void,
-        workspace: Workspace,
-        ii: InitInfo,
-        debug: boolean): APIResult;
+    export function configEdit(instance: IPublicClientApplication, authorizedUser: User, config: Config, setConfigId: (id: string) => void, setSelectedConfigs: (selectedConfigs: { [id: string]: boolean | number[] }) => void, workspace: Workspace, ii: InitInfo, debug: boolean): APIResult;
+    export function configEnable(instance: IPublicClientApplication, authorizedUser: User, configurationId: string, enabled: boolean, debug: boolean): APIResult;
     export function configRemove(instance: IPublicClientApplication, authorizedUser: User, config: Config, workspaceId: string, debug: boolean): APIResult;
     export function configsRefresh(instance: IPublicClientApplication, authorizedUser: User, workspaceId: string, ii: InitInfo, debug: boolean): APIResult;
     export function initGet(instance: IPublicClientApplication, user: User, ii: InitInfo, tasks: TaskArray, debug: boolean): APIResult;

package/index.ts

@@ -3,7 +3,7 @@ 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, configPost, configPut, initPost, readerPost, tenantPost, tenantDelete, tenantsGet, workspacePut, workspacesGet } from './hybridspa';
+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 users from "./users.json";
 import tenants from "./tenants.json";
@@ -51,6 +51,9 @@ export class mindlineConfig {
     static configConsentEndpoint(): string {
         return `https://${mindlineConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/configuration/consent`;
     };
+    static configEnabledEndpoint(): string {
+        return `https://${mindlineConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/configuration/status`;
+    };
     static configEndpoint(): string {
         return `https://${mindlineConfig.environmentTag}-configurationapi-westus.azurewebsites.net/api/v1/configuration`;
     };
@@ -1358,6 +1361,10 @@ export class ActorNode {
     }
 }
 // ======================= Azure AD Graph API ===============================
+// helper functions
+function getGraphAPIScope(user: User): string {
+    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
 async function graphDefineHeaders(
     instance: IPublicClientApplication,
@@ -1366,7 +1373,8 @@ async function graphDefineHeaders(
     const headers = new Headers();
     headers.append("Content-Type", "application/json");
     headers.append("accept", "*/*");
-    // authorization header - if needed, retrieve and cache access token
+    const graphAPIScope: string = getGraphAPIScope(user);
+    // only call acquireTokenByCode if we have never redeemed the code
     if (user.graphAccessToken == null || user.graphAccessToken === "") {
         try {
             let response: AuthenticationResult = await instance.acquireTokenByCode({
@@ -1379,6 +1387,47 @@ async function graphDefineHeaders(
             console.log("Front end token failure: " + error);
         }
     }
+    // otherwise, call acquireTokenSilent and deal with token expiration on exception
+    else {
+        try {
+            let accounts: AccountInfo[] = instance.getAllAccounts();
+            let homeAccountId = user.oid + "." + user.tid;
+            let account: AccountInfo = null;
+            for (let i: number = 0; i < accounts.length; i++) {
+                if (accounts[i].homeAccountId == homeAccountId) {
+                    account = accounts[i];
+                }
+            }
+            let response: AuthenticationResult = await instance.acquireTokenSilent({
+                scopes: [graphAPIScope],
+                account: account
+            });
+            user.graphAccessToken = response.accessToken; // cache access token
+            console.log("Front end token graph acquired silently: " + user.graphAccessToken.slice(0, 20));
+        }
+        catch (error: any) {
+            try {
+                console.log("Front end graph token silent acquisition failure: " + error);
+                // fallback to redirect if silent acquisition fails
+                let accounts: AccountInfo[] = instance.getAllAccounts();
+                let homeAccountId = user.oid + "." + user.tid;
+                let account: AccountInfo = null;
+                for (let i: number = 0; i < accounts.length; i++) {
+                    if (accounts[i].homeAccountId == homeAccountId) {
+                        account = accounts[i];
+                    }
+                }
+                // assumption: this redirect will trigger login flow callbacks in program.cs
+                instance.acquireTokenRedirect({
+                    scopes: [graphAPIScope],
+                    account: account
+                });
+            }
+            catch (error: any) {
+                console.log("Front end graph token redirect acquisition failure: " + error);
+            }
+        }
+    }
     headers.append("Authorization", `Bearer ${user.graphAccessToken}`);
     return headers;
 }
@@ -1525,7 +1574,7 @@ export async function signIn(user: User, tasks: TaskArray): Promise<boolean> {
             return false;
         }
     }
-    // SignIn by an admin consents the app, Challenge adds incremental permissions dynamically, but requires a consented app - TEST THIS
+    // SignIn by an admin consents the app, Challenge adds incremental permissions dynamically, but requires a consented app - TODO: TEST FRESH CONSENT EXPERIENCE
     let signinURL: string = window.location.href;
     switch (user.authority) {
         case graphConfig.authorityWW:
@@ -1543,11 +1592,17 @@ export async function signIn(user: User, tasks: TaskArray): Promise<boolean> {
     }
     let url: URL = new URL(signinURL);
     url.searchParams.append("redirectUri", window.location.origin);
-    url.searchParams.append("domainHint", "organizations");
-    // "1" is the OID that is set by default when reading the user objects from the JSON initialization file.
-    // This means this user has not been created by the admin. If it had been, oid and mail would be the same and not == "1".
     if (user.oid !== "1") {
         url.searchParams.append("loginHint", user.mail);
+        const regex = /@([a-zA-Z0-9.-]+\.[a-zA-Z]{2,})$/;
+        const regexMatch = user.mail.match(regex);
+        let domain: string = regexMatch ? regexMatch[1] : "organizations";
+        url.searchParams.append("domainHint", domain);
+    }
+    else {
+        // "1" is the dummy OID set when initializing the application from JSON. No need to provide any specific hint.
+        // This means that a user has not yet been specified by the admin. If it had been, oid would not be "1".
+        url.searchParams.append("domainHint", "organizations");
     }
     tasks.setTaskStart("initialization", new Date());
     tasks.setTaskStart("authenticate user", new Date());
@@ -1555,6 +1610,7 @@ export async function signIn(user: User, tasks: TaskArray): Promise<boolean> {
     return true;
 }
 export function signInIncrementally(user: User, scope: string): void {
+    debugger;
     if (user.oid == "1") return;
     // for dynamic delegated permissions, we can use the Microsoft Identity Web Account Controller Challenge method
     let challengeURL: string = window.location.href;
@@ -1653,7 +1709,8 @@ export async function tenantRelationshipsGetByDomain(loggedInUser: User, tenant:
         tenantEndpoint += "')";
         console.log("tenantRelationshipsGetByDomain: Attempting GET from /findTenantInformationByDomainName:", tenantEndpoint);
         let response = await fetch(tenantEndpoint, options);
-        if (response.status == 200 && response.statusText == "OK") {
+        // status IS 200, but statusText no longer returns "OK" 1/26/2025
+        if (response.status == 200) { // && response.statusText == "OK") {
             let data = await response.json();
             if (data) {
                 if (data.error != null) {
@@ -1913,6 +1970,17 @@ export async function configEdit(
     ii.save();
     return result;
 }
+export async function configEnable(
+    instance: IPublicClientApplication,
+    authorizedUser: User,
+    configurationId: string,
+    enabled: boolean,
+    debug: boolean
+): Promise<APIResult> {
+    let result: APIResult = new APIResult();
+    result = await configPatch(instance, authorizedUser, configurationId, enabled, debug);
+    return result;
+}
 export async function configRemove(instance: IPublicClientApplication, authorizedUser: User, config: Config, workspaceId: string, debug: boolean): Promise<APIResult> {
     return configDelete(instance, authorizedUser, config, workspaceId, debug);
 }

package/package.json

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