@mindline/sync 1.0.53 → 1.0.54

package/.vs/VSWorkspaceState.json

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

package/index.ts

@@ -1226,19 +1226,43 @@ export async function groupsGet(instance: IPublicClientApplication, user: User |
         return { groups: [], error: `Exception: ${error}` };
     }
 }
-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/SignIn";
-    let url: URL = new URL(tenantURL);
-    url.searchParams.append("redirectUri", window.location.origin);
-    url.searchParams.append("domainHint", "organizations");
-    if (user.oid !== "1") {
-        url.searchParams.append("loginHint", user.mail);
+export async function signIn(user: User, tasks: TaskArray): void {
+    switch (user.authority) {
+        case graphConfig.authorityWW:
+        case "":
+            // SignIn by an admin consents more permissions than Challenge which requires a consented app
+            let tenantURL: string = window.location.href;
+            tenantURL += "MicrosoftIdentity/Account/SignIn";
+            let url: URL = new URL(tenantURL);
+            url.searchParams.append("redirectUri", window.location.origin);
+            url.searchParams.append("domainHint", "organizations");
+            if (user.oid !== "1") {
+                url.searchParams.append("loginHint", user.mail);
+            }
+            tasks.setTaskStart("initialization", new Date());
+            tasks.setTaskStart("authenticate user", new Date());
+            window.location.assign(url.href);
+            break;
+        case graphConfig.authorityUS:
+            // retrieve controller protected by USGov authorization
+            let usURL: string = window.location.href;
+            usURL += "USGov";
+            let urlUS: URL = new URL(usURL);
+            urlUS.searchParams.append("redirectUri", window.location.origin);
+            urlUS.searchParams.append("domainHint", user.companyDomain);
+            if (user.oid !== "1") {
+                urlUS.searchParams.append("loginHint", user.mail);
+            }
+            tasks.setTaskStart("initialization", new Date());
+            tasks.setTaskStart("authenticate user", new Date());
+            window.location.assign(urlUS.href);
+            break;
+        case graphConfig.authorityCN:
+            // unsupported
+            break;
+        default:
+            debugger;
     }
-    tasks.setTaskStart("initialization", new Date());
-    tasks.setTaskStart("authenticate user", new Date());
-    window.location.assign(url.href);
 }
 export function signInIncrementally(user: User, scope: string): void {
     if (user.oid == "1") return;
@@ -1432,8 +1456,9 @@ export async function tenantRelationshipsGetById(user: User, ii: InitInfo, insta
 //tenantUnauthenticatedLookup (from https://gettenantpartitionweb.azurewebsites.net/js/gettenantpartition.js)
 export async function tenantUnauthenticatedLookup(tenant: Tenant, debug: boolean): Promise<boolean> {
     if (debug) debugger;
+    // since we should mainly be called when a user is performing a lookup, we can afford the performance hit of looking up the tenant name and domain again
     // do we already have a valid tenant ID? if so, nothing to add
-    if (tenant.tid !== "") return false;
+    //if (tenant.tid !== "") return false;
     // do we not have a valid domain? if so, nothing to lookup
     if (tenant.domain == "") return false;
     // prepare the 3 endpoints and corresponding regular expressions

package/package.json

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