@mindline/sync 1.0.81 → 1.0.83

package/.vs/VSWorkspaceState.json

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

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

@@ -2,21 +2,21 @@
   "Version": 1,
   "WorkspaceRootPath": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\",
   "Documents": [
-    {
-      "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\\index.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}",
       "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\\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\\hybridspa.ts||{0F2454B1-A556-402D-A7D0-1FDE7F99DEE0}",
       "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:hybridspa.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}"
     }
   ],
   "DocumentGroupContainers": [
@@ -64,11 +64,11 @@
         },
         {
           "DockedWidth": 200,
-          "SelectedChildIndex": 0,
+          "SelectedChildIndex": 3,
           "Children": [
             {
               "$type": "Document",
-              "DocumentIndex": 0,
+              "DocumentIndex": 2,
               "Title": "package.json",
               "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\package.json",
               "RelativeDocumentMoniker": "package.json",
@@ -76,12 +76,11 @@
               "RelativeToolTip": "package.json",
               "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
-              "WhenOpened": "2024-11-06T06:24:37.385Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-11-06T06:24:37.385Z"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 2,
+              "DocumentIndex": 3,
               "Title": "users.json",
               "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\users.json",
               "RelativeDocumentMoniker": "users.json",
@@ -89,31 +88,30 @@
               "RelativeToolTip": "users.json",
               "ViewState": "AQIAAAAAAAAAAAAAAAAAAAUAAAASAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
-              "WhenOpened": "2024-11-05T22:57:19.003Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-11-05T22:57:19.003Z"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 1,
               "Title": "hybridspa.ts",
               "DocumentMoniker": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\hybridspa.ts",
               "RelativeDocumentMoniker": "hybridspa.ts",
               "ToolTip": "C:\\Users\\ArvindSuthar\\source\\repos\\front\\sync\\hybridspa.ts",
               "RelativeToolTip": "hybridspa.ts",
-              "ViewState": "AQIAAPgAAAAAAAAAAAAAAFECAAAXAAAA",
+              "ViewState": "AQIAACEAAAAAAAAAAAAtwDMAAABOAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2024-11-04T14:16:26.493Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 0,
               "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": "AQIAAFgBAAAAAAAAAAAuwHMBAAAAAAAA",
+              "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003213|",
               "WhenOpened": "2024-05-12T20:20:11.888Z",
               "EditorCaption": ""

package/hybridspa.ts

@@ -17,6 +17,18 @@ import {
 import { deserializeArray } from "class-transformer";
 
 // helper functions
+function getAPIScope(user: User): string {
+    let apiAppID: string = "8d95d21c-c378-4bb0-9f52-88c30d271e7a";
+    let authority: string = user.authority.toLowerCase();
+    if (authority.startsWith("https://login.microsoftonline.com/"))
+        apiAppID = "8d95d21c-c378-4bb0-9f52-88c30d271e7a";
+    else if (authority.startsWith("https://login.microsoftonline.us/"))
+        apiAppID = "48da942e-ea3d-49e4-a054-81649012f8f2";
+    else if (authority.startsWith("https://login.partner.microsoftonline.cn/"))
+        apiAppID = "c91d32e4-dcc5-4d77-826a-16e93ffce666";
+    let apiScope: string = `api://${apiAppID}/Config.Write`;
+    return apiScope;
+}
 // TODO: this is where you want to trigger a re-authentication if token expires
 async function mindlineDefineHeaders(
     instance: IPublicClientApplication,
@@ -27,6 +39,7 @@ async function mindlineDefineHeaders(
     headers.append("accept", "*/*");
     // authorization header - if needed, retrieve and cache access token
     if (user.mindlineAccessToken == null || user.mindlineAccessToken === "") {
+        const apiScope: string = getAPIScope(user);
         try {
             let accounts: AccountInfo[] = instance.getAllAccounts();
             let homeAccountId = user.oid + "." + user.tid;
@@ -37,7 +50,7 @@ async function mindlineDefineHeaders(
                 }
             }
             let response: AuthenticationResult = await instance.acquireTokenSilent({
-                scopes: ["api://8d95d21c-c378-4bb0-9f52-88c30d271e7a/Config.Write"],
+                scopes: [apiScope],
                 account: account
             });
             user.mindlineAccessToken = response.accessToken; // cache access token
@@ -56,7 +69,7 @@ async function mindlineDefineHeaders(
                     }
                 }
                 instance.acquireTokenRedirect({
-                    scopes: ["api://8d95d21c-c378-4bb0-9f52-88c30d271e7a/Config.Write"],
+                    scopes: [apiScope],
                     account: account
                 });
             }
@@ -75,8 +88,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 = "";

package/index.ts

@@ -1525,7 +1525,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 +1543,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 +1561,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 +1660,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) {

package/package.json

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