@mindline/sync 1.0.52 → 1.0.54

package/.vs/VSWorkspaceState.json

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

package/index.d.ts

@@ -3,6 +3,14 @@ declare module "@mindline/sync" {
     export function sum(a: number, b: number): number;
     export function helloNpm(): string;
 
+    export class APIResult {
+        result: boolean;
+        status: number;
+        error: string;
+        version: string;
+        array: Array<Object> | null;
+        constructor();
+    }  
     export class graphConfig {
         static environmentTag: string;
         // config API endpoints
@@ -134,6 +142,7 @@ declare module "@mindline/sync" {
         constructor();
     }
     export class InitInfo {
+        version: string;
         tab: number;
         us: User[];
         ts: Tenant[];
@@ -250,13 +259,6 @@ declare module "@mindline/sync" {
         constructor(tid: string, name: string);
         update(total: number, read: number, written: number, deferred: number): void;
     }
-    export class APIResult {
-        result: boolean;
-        status: number;
-        error: string;
-        array: Array<Object> | null;
-        constructor();
-    }  
     //
     // Azure AD Graph API
     //

package/index.ts

@@ -20,6 +20,14 @@ export function helloNpm(): string {
     return "hello NPM";
 }
 // main application exports
+export class APIResult {
+    result: boolean;
+    status: number;
+    error: string;
+    version: string;
+    array: Array<Object> | null;
+    constructor() { this.result = true; this.status = 200; this.error = ""; this.version = version; this.array = null; }
+}
 export class graphConfig {
     static environmentTag: string = "dev";
     // config API endpoints
@@ -262,6 +270,7 @@ function storageAvailable(type) {
     }
 }
 export class InitInfo {
+    version: string;
     tab: number;
     us: User[];
     ts: Tenant[];
@@ -297,6 +306,7 @@ export class InitInfo {
         var workspacesString = JSON.stringify(workspaces);
         try {
             this.tab = 0;
+            this.version = version;
             this.us = deserializeArray(User, usersString);
             this.ts = deserializeArray(Tenant, tenantsString);
             this.cs = deserializeArray(Config, configsString);
@@ -1189,13 +1199,6 @@ export class TenantNode {
         }
     }
 }
-export class APIResult {
-    result: boolean;
-    status: number;
-    error: string;
-    array: Array<Object> | null;
-    constructor() { this.result = true; this.status = 200; this.error = ""; this.array = null; }
-}
 //
 // Azure AD Graph API
 //
@@ -1223,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;
@@ -1273,7 +1300,8 @@ export function requestAdminConsent(user: User, scope: string): void {
     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);
+    url.searchParams.append("redirect_uri", window.location.origin);
+    url.searchParams.append("domain_hint", user.companyDomain);
     window.location.assign(url.href);
 }
 export async function signOut(user: User): Promise<boolean>{
@@ -1428,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
@@ -1572,14 +1601,7 @@ export async function initGet(instance: IPublicClientApplication, authorizedUser
                 result = await workspaceInfoGet(instance, authorizedUser, user, ii, debug);
                 tasks.setTaskEnd("GET workspaces", new Date(), result.result ? "complete" : "failed");
             }
-            // if successful, return true result and the version in the result.error field
-            if (result.result) {
-                result.error = version;
-            }
-            // if failed, output version information to the log
-            else {
-                console.log("@mindline/sync package version: " + version);
-            }
+            console.log("initGet complete. Version: " + version);
             return result;
         }
         else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mindline/sync",
   "type": "module",
-  "version": "1.0.52",
+  "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.",