@mindline/sync 1.0.19 → 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

@@ -1,8 +1,5 @@
-// Select DOM elements to work with
-const welcomeDiv = document.getElementById("welcomeMessage");
-const cardDiv = document.getElementById("card-div");
-const profileButton = document.getElementById("seeProfile");
-const profileDiv = document.getElementById("profile-div");
+import { IPublicClientApplication, AuthenticationResult } from '@azure/msal-browser';
+import { User } from '@mindline/sync';
 
 // Add here the endpoints for MS Graph API services you would like to use.
 const graphConfig = {
@@ -16,55 +13,21 @@ function updateUI(data, endpoint) {
   console.log("Graph API responded at: " + new Date().toString());
 
   if (endpoint === graphConfig.graphMeEndpoint) {
-    profileDiv.innerHTML = "";
-    const title = document.createElement("p");
-    title.innerHTML = "<strong>Title: </strong>" + data.jobTitle;
     console.log(data.jobTitle);
-    const email = document.createElement("p");
-    email.innerHTML = "<strong>Mail: </strong>" + data.mail;
     console.log(data.mail);
-    const phone = document.createElement("p");
-    phone.innerHTML = "<strong>Phone: </strong>" + data.businessPhones[0];
     console.log(data.businessPhones[0]);
-    const address = document.createElement("p");
-    address.innerHTML = "<strong>Location: </strong>" + data.officeLocation;
     console.log(data.officeLocation);
-    profileDiv.appendChild(title);
-    profileDiv.appendChild(email);
-    profileDiv.appendChild(phone);
-    profileDiv.appendChild(address);
   } else if (endpoint === graphConfig.graphMailEndpoint) {
     if (data.value.length < 1) {
       alert("Your mailbox is empty!");
     } else {
       console.log("Displaying Emails for the signed in user.");
-      const tabList = document.getElementById("list-tab");
-      tabList.innerHTML = ""; // clear tabList at each readMail call
-      const tabContent = document.getElementById("nav-tabContent");
-
       data.value.map((d, i) => {
         // Keeping it simple
         if (i < 10) {
-          const listItem = document.createElement("a");
-          listItem.setAttribute(
-            "class",
-            "list-group-item list-group-item-action"
-          );
-          listItem.setAttribute("id", "list" + i + "list");
-          listItem.setAttribute("data-toggle", "list");
-          listItem.setAttribute("href", "#list" + i);
-          listItem.setAttribute("role", "tab");
-          listItem.setAttribute("aria-controls", i);
-          listItem.innerHTML = d.subject;
-          tabList.appendChild(listItem);
-          const contentItem = document.createElement("div");
-          contentItem.setAttribute("class", "tab-pane fade");
-          contentItem.setAttribute("id", "list" + i);
-          contentItem.setAttribute("role", "tabpanel");
-          contentItem.setAttribute("aria-labelledby", "list" + i + "list");
-          contentItem.innerHTML =
-            "<strong> from: " + d.from.emailAddress.address + "</strong>";
-          tabContent.appendChild(contentItem);
+            console.log(data.officeLocation);
+            console.log(d.subject);
+            console.log(d.from.emailAddress.address);
         }
       });
     }
@@ -95,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,
   });
@@ -111,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);
     })
@@ -122,13 +85,16 @@ function seeProfile(spaCode) {
 }
 
 //Get Tenant Info
-async function getTenantInfo(user: User, instance: IPublicClientApplication) {
-  var authResult = await instance
+export function getTenantInfo(user: User, instance: IPublicClientApplication) {
+  debugger;
+
+  let authResult: AuthenticationResult;
+  instance
     .acquireTokenByCode({ code: user.spacode })
+    .then((result) => (authResult = result))
     .catch((e: any) => {
       console.log(e);
     });
-
   const headers = new Headers();
   const bearer = `Bearer ${authResult.accessToken}`;
   headers.append("Authorization", bearer);
@@ -147,13 +113,17 @@ async 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,3 +1,5 @@
+import { IPublicClientApplication } from "@azure/msal-browser/dist";
+
 declare module "@mindline/sync" {
   export function sum(a: number, b: number): number;
   export function helloNpm(): string;
@@ -18,12 +20,11 @@ declare module "@mindline/sync" {
   }
 
   // target (Azure AD tenant, AD domain, Google workspace)
-  enum TargetType { AAD = 1, AD, Google }
   export class Target {
     tid: string;        // from AAD ID token
     name: string;       // findTenantInformationByTenantId
     domain: string;     // findTenantInformationByTenantId
-    type: TargetType;   // always AAD for now
+    type: string;       // always AAD=1 for now
     authority: string;  // from AAD ID auth response
     readServicePrincipal: string; // from AAD consent
     writeServicePrincipal: string; // from AAD consent
@@ -33,7 +34,7 @@ declare module "@mindline/sync" {
   // config
   export class TargetConfigInfo {
     tid: string;            // target identifier
-    sourceGroups: string[]; // source groups - we can confiure multiple source groups for reading (*may* slow things down, but less work for admin)
+    sourceGroups: string[]; // source groups - we can configure multiple source groups for reading (*may* slow things down, but less work for admin)
     targetGroup: string;    // target group - we only write users to a single target group (complex to fiugure out which users get written to which groups)
   }
   export class Config {

package/index.test.ts

@@ -1,16 +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 = false;
-  InitGet(ii, null)
-    .then((response) => bResult = response)
-    .catch((e: any) => {
-      console.log(e);
-    });
+  let bResult:boolean = InitGet(ii, stubbedPublicClientApplication);
   expect(bResult);
 });

package/index.ts

@@ -1,17 +1,36 @@
 //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 {
-  constructor(){
+class User {
+  oid: string;
+  name: string;
+  mail: string;
+  authority: string;
+  tid: string;
+  companyName: string;
+  companyDomain: string;
+  associatedWorkspaces: string[];
+  workspaceIDs: string;
+  session: string;
+  spacode: string;
+  constructor() {
     this.oid = "";
     this.name = "";
     this.mail = "";
@@ -19,14 +38,22 @@ export class User {
     this.tid = "";
     this.companyName = "";
     this.companyDomain = "";
-    this.associatedWorkspaces = {};
+    this.associatedWorkspaces = new Array();
     this.workspaceIDs = "";
     this.session = "";
     this.spacode = "";
   }
 }
 
-export class Target {
+class Target {
+  tid: string;
+  name: string;
+  domain: string;
+  type: string;
+  authority: string;
+  readServicePrincipal: string;
+  writeServicePrincipal: string;
+  workspaceIDs: string;
   constructor(){
     this.tid = "";
     this.name = "";
@@ -39,35 +66,57 @@ export class Target {
   }
 }
 
-export class Config {
+class TargetConfigInfo {
+  tid: string;
+  sourceGroups: string[];
+  targetGroup: string;
+}
+
+class Config {
+  id: string;
+  name: string;
+  description: string;
+  targetConfigs: TargetConfigInfo[];
+  enabled: boolean;
+  workspaceIDs: string;
   constructor(){
     this.id = "";
     this.name = "";
     this.description = "";
-    this.targetConfigs = {};
+    this.targetConfigs = new Array();
     this.enabled = false;
     this.workspaceIDs = "";
   }
 }
 
-export class Workspace {
+class Workspace {
+  id: string;
+  name: string;
+  associatedUsers: string[];
+  associatedTargets: string[];
+  associatedConfigs: string[];
   constructor(){
     this.id = "";
     this.name = "";
-    this.associatedUsers = {};
-    this.associatedTargets = {};
-    this.associatedConfigs = {};
+    this.associatedUsers = new Array();
+    this.associatedTargets = new Array();
+    this.associatedConfigs = new Array();
   }
 }
 
 export class InitInfo {
-  constructor() {
-    this.us = {};
-    this.ts = {};
-    this.cs = {};
-    this.ws = {};
+  us: User[];
+  ts: Target[];
+  cs: Config[];
+  ws: Workspace[];
+  constructor(){
+    debugger;
+    this.us = new Array();
+    this.ts = new Array();
+    this.cs = new Array();
+    this.ws = new Array();
   }
-  initWorkspaceIDs() {
+  tagWithWorkspaces(): boolean {
     // for each Workspace tag associated User, Target, Config with Workspace.id
     for (let workspace of this.ws) {
       // find matching Users to tag with this workspace
@@ -118,15 +167,8 @@ export class InitInfo {
   }
 }
 
-import { deserializeArray } from 'class-transformer';
-import { IPublicClientApplication } from '@azure/msal-browser';
-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);
@@ -137,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;
@@ -163,8 +205,10 @@ 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 async function InitGet(ii, instance)
+export function InitGet(ii: InitInfo, instance: IPublicClientApplication): boolean
 {
+  debugger;
+
   // if empty user array, retrieve dummy data from JSON to populate UI
   let l = ii.us.length;
   if(l === 0) return DummyInit(ii);
@@ -176,11 +220,11 @@ export async function InitGet(ii, instance)
   // have real user: remove dummy user, target, config, workspace if they exist
   let dummyIndex = ii.us.findIndex((u) => u.oid === "1");
   ii.us.splice(dummyIndex, 1);
-  dummyIndex = ii.ts.findIndex((u) => u.oid === "1");
+  dummyIndex = ii.ts.findIndex((u) => u.tid === "1");
   ii.ts.splice(dummyIndex, 1);
-  dummyIndex = ii.cs.findIndex((u) => u.oid === "1");
+  dummyIndex = ii.cs.findIndex((u) => u.id === "1");
   ii.cs.splice(dummyIndex, 1);
-  dummyIndex = ii.ws.findIndex((u) => u.oid === "1");
+  dummyIndex = ii.ws.findIndex((u) => u.id === "1");
   ii.ws.splice(dummyIndex, 1);
 
   // why would instance be null here? investigate!
@@ -191,30 +235,30 @@ export async function InitGet(ii, instance)
 
   // 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,9 +1,10 @@
 {
   "name": "@mindline/sync",
   "type": "module",
-  "version": "1.0.19",
+  "version": "1.0.21",
+  "types": "index.d.ts",
+  "exports": "./index.ts",
   "description": "sync is a node.js package encapsulating javscript classes required for configuring Mindline sync service.",
-  "exports": "./index.js",
   "scripts": {
     "test": "vitest",
     "coverage": "vitest run --coverage"
@@ -18,6 +19,5 @@
     "@azure/msal-browser": "^2.37.0",
     "class-transformer": "^0.5.1",
     "reflect-metadata": "^0.1.13"
-  },
-  "typings": "sync.d.ts"
+  }
 }