@mindline/sync 1.0.20 → 1.0.21

package/README.md

@@ -10,6 +10,10 @@ https://nodejs.org/en/download
 npm install class-transformer --save
 npm install reflect-metadata --save
 ```
+## install @azure/msal-browser
+``` js
+npm install @azure/msal-browser --save
+```
 # 2.	Latest releases
 # 3.	API references
 # 4. Unit Test

package/hybridspa.ts

@@ -58,13 +58,13 @@ function callMSGraph(endpoint, token, callback) {
 }
 
 ///get Token
-function getTokenByCode(spaCode) {
+function getTokenByCode(spaCode: string, instance: IPublicClientApplication) {
   var code = spaCode;
   const scopes = ["user.read"];
 
   console.log("MSAL: acquireTokenByCode hybrid parameters present");
 
-  var authResult = msalInstance.acquireTokenByCode({
+  var authResult = instance.acquireTokenByCode({
     code,
     scopes,
   });
@@ -74,8 +74,8 @@ function getTokenByCode(spaCode) {
 }
 
 //See Profile
-function seeProfile(spaCode) {
-  getTokenByCode(spaCode)
+function seeProfile(spaCode: string,  instance: IPublicClientApplication) {
+  getTokenByCode(spaCode, instance)
     .then((response) => {
       callMSGraph(graphConfig.graphMeEndpoint, response.accessToken, updateUI);
     })
@@ -95,7 +95,6 @@ export function getTenantInfo(user: User, instance: IPublicClientApplication) {
     .catch((e: any) => {
       console.log(e);
     });
-
   const headers = new Headers();
   const bearer = `Bearer ${authResult.accessToken}`;
   headers.append("Authorization", bearer);
@@ -114,13 +113,17 @@ export function getTenantInfo(user: User, instance: IPublicClientApplication) {
     "request made to Graph API tenant endpoint at: " + new Date().toString()
   );
 
+  let r = null;
   fetch(tenantEndpoint, options)
     .then((response) => response.json())
     .then((response) => {
+      r = response;
       console.log("Successfully Fetched Data from Graph API:", response);
     })
     .catch((error) => console.log(error));
 
-  user.companyName = response.displayName;
-  user.companyDomain = response.defaultDomainName;
+  if(r!==null) {
+    user.companyName = r.displayName;
+    user.companyDomain = r.defaultDomainName;
+  }
 }

package/{sync.d.ts → index.d.ts}

@@ -1,4 +1,4 @@
-import { IPublicClientApplication } from "@azure/msal-browser";
+import { IPublicClientApplication } from "@azure/msal-browser/dist";
 
 declare module "@mindline/sync" {
   export function sum(a: number, b: number): number;

package/index.test.ts

@@ -1,11 +1,12 @@
-import {sum, User, InitInfo, InitGet } from "index";
+import {sum, InitInfo, InitGet} from "./index";
 import {test, expect} from "vitest";
+import {stubbedPublicClientApplication} from "@azure/msal-browser/dist";
 
 test("adds 1 + 2 to equal 3", () => {
   expect(sum(1, 2)).toBe(3);
 });
 test("loads config based on a user and expects function to return true", () => {
   let ii = new InitInfo();
-  let bResult:boolean = InitGet(ii, null);
+  let bResult:boolean = InitGet(ii, stubbedPublicClientApplication);
   expect(bResult);
 });

package/index.ts

@@ -1,16 +1,24 @@
 //index.js
 
+import { deserializeArray } from 'class-transformer';
+import { IPublicClientApplication } from '@azure/msal-browser';
+import { getTenantInfo } from './hybridspa';
+import users from "./users.json";
+import targets from "./targets.json";
+import configs from "./configs.json";
+import workspaces from "./workspaces.json";
+
+const FILTER_FIELD = "workspaceIDs";
+
 // called by unit tests
-export function sum(a, b) {
+export function sum(a: number, b: number): number {
   return a + b;
 }
-export function helloNpm() {
+export function helloNpm() : string {
   return "hello NPM";
 }
 
-const FILTER_FIELD = "workspaceIDs";
-
-export class User {
+class User {
   oid: string;
   name: string;
   mail: string;
@@ -37,7 +45,7 @@ export class User {
   }
 }
 
-export class Target {
+class Target {
   tid: string;
   name: string;
   domain: string;
@@ -58,13 +66,13 @@ export class Target {
   }
 }
 
-export class TargetConfigInfo {
+class TargetConfigInfo {
   tid: string;
   sourceGroups: string[];
   targetGroup: string;
 }
 
-export class Config {
+class Config {
   id: string;
   name: string;
   description: string;
@@ -81,7 +89,7 @@ export class Config {
   }
 }
 
-export class Workspace {
+class Workspace {
   id: string;
   name: string;
   associatedUsers: string[];
@@ -102,6 +110,7 @@ export class InitInfo {
   cs: Config[];
   ws: Workspace[];
   constructor(){
+    debugger;
     this.us = new Array();
     this.ts = new Array();
     this.cs = new Array();
@@ -158,16 +167,8 @@ export class InitInfo {
   }
 }
 
-import { deserializeArray } from 'class-transformer';
-import { IPublicClientApplication } from '@azure/msal-browser';
-import { getTenantInfo } from './hybridspa';
-import users from "./users.json";
-import targets from "./targets.json";
-import configs from "./configs.json";
-import workspaces from "./workspaces.json";
-
 // get hardcoded data from JSON
-function DummyInit(ii)
+function DummyInit(ii: InitInfo)
 {
   var usersString = JSON.stringify(users);
   var targetsString = JSON.stringify(targets);
@@ -178,7 +179,7 @@ function DummyInit(ii)
     ii.ts = deserializeArray(Target, targetsString);
     ii.cs = deserializeArray(Config, configsString);
     ii.ws = deserializeArray(Workspace, workspacesString);
-    if(!ii.initWorkspaceIDs()) return false;
+    if(!ii.tagWithWorkspaces()) return false;
   } catch (e) {
     debugger;
     return false;
@@ -204,7 +205,7 @@ function DummyInit(ii)
     //      TODO: Mindline: retrieve associated admins, targets for each workspace
     //      ii.us / ii.ts / ii.cs: query components of each associated workspaces
     //      Returns: users, targets, configs for each workspace
-export function InitGet(ii: InitInfo, instance: IPublicClientApplication)
+export function InitGet(ii: InitInfo, instance: IPublicClientApplication): boolean
 {
   debugger;
 
@@ -234,30 +235,30 @@ export function InitGet(ii: InitInfo, instance: IPublicClientApplication)
 
   // valid user, query AAD for associated company name and domain
   getTenantInfo(user, instance);
-  return;
+  return true;
 }
 
-export function AddTarget()
+function AddTarget(): boolean
 {
   return true;
 }
 
-export function CompleteTarget()
+function CompleteTarget(): boolean
 {
   return true;
 }
 
-export function AddUser()
+function AddUser(): boolean
 {
   return true;
 }
 
-export function CompleteUser()
+function CompleteUser(): boolean
 {
   return true;
 }
 
-export function CreateConfig()
+function CreateConfig(): boolean
 {
   return true;
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@mindline/sync",
   "type": "module",
-  "version": "1.0.20",
-  "description": "sync is a node.js package encapsulating javscript classes required for configuring Mindline sync service.",
+  "version": "1.0.21",
+  "types": "index.d.ts",
   "exports": "./index.ts",
-  "main": "./index.ts",
+  "description": "sync is a node.js package encapsulating javscript classes required for configuring Mindline sync service.",
   "scripts": {
     "test": "vitest",
     "coverage": "vitest run --coverage"
@@ -19,6 +19,5 @@
     "@azure/msal-browser": "^2.37.0",
     "class-transformer": "^0.5.1",
     "reflect-metadata": "^0.1.13"
-  },
-  "typings": "sync.d.ts"
+  }
 }