@sparkle-learning/core 0.0.52 → 0.0.54

package/dist/collection/services/signalR.service.js

@@ -1,17 +1,18 @@
 import * as signalR from '@microsoft/signalr';
 import { EnvironmentConfigService } from '.';
 import signalRStore from '../stores/signalR.store';
+import { TokenService } from './token.service';
 export class SignalRService {
   constructor() {
-    console.log("Starting signalR");
+    console.log('Starting signalR');
     //TODO: update courseClassId
     var defaultCourseClassId = 1;
     var sparkleConfig = EnvironmentConfigService.getInstance().get('sparkle');
     this.connection = new signalR.HubConnectionBuilder()
-      .withUrl(`${sparkleConfig.apiUrl}hubs/sparkle?url=${window.location.href}${defaultCourseClassId > 0 ? "&courseClassId=" + defaultCourseClassId : ""}`, {
+      .withUrl(`${sparkleConfig.apiUrl}hubs/sparkle?url=${window.location.href}${defaultCourseClassId > 0 ? '&courseClassId=' + defaultCourseClassId : ''}`, {
       accessTokenFactory: () => this.getToken(),
       skipNegotiation: true,
-      transport: signalR.HttpTransportType.WebSockets
+      transport: signalR.HttpTransportType.WebSockets,
     })
       .configureLogging(signalR.LogLevel.Debug)
       //.withAutomaticReconnect()
@@ -26,15 +27,14 @@ export class SignalRService {
           // If we've been reconnecting for more than 60 seconds so far, stop reconnecting.
           return null;
         }
-      }
+      },
     })
       .build();
-    this.connection.on("SendMessage", (user, data) => {
+    this.connection.on('SendMessage', (user, data) => {
       let payload = JSON.parse(data);
-      console.log("Server said ", user, payload);
-    });
-    this.connection.onclose(error => {
+      console.log('Server said ', user, payload);
     });
+    this.connection.onclose(error => { });
     this.connection.onreconnecting(error => {
       console.assert(this.connection.state === signalR.HubConnectionState.Reconnecting);
     });
@@ -49,36 +49,34 @@ export class SignalRService {
     return SignalRService.instance;
   }
   async start() {
-    console.log("start");
+    console.log('start');
     try {
       signalRStore.state.connecting = true;
       signalRStore.state.connected = !signalRStore.state.connecting;
       await this.connection.start();
       console.log(this.connection);
       signalRStore.state.connecting = false;
-      signalRStore.state.connected = !signalRStore.state.connecting;
+      signalRStore.state.connected = this.connection.state === signalR.HubConnectionState.Connected;
       console.assert(this.connection.state === signalR.HubConnectionState.Connected);
-      console.log("SignalR Connected.");
+      console.log('SignalR Connected.');
     }
     catch (err) {
       console.assert(this.connection.state === signalR.HubConnectionState.Disconnected);
       console.log(err);
     }
   }
-  ;
   async callSignalR(hub, data) {
-    console.log('signalR invoke', hub, this.connection.connectionState);
-    if (!this.getToken()) {
-      console.log("Cannot connect to signalR. Not logged in");
+    let token = await this.getToken();
+    if (!token) {
+      console.log('Cannot connect to signalR. Not logged in');
       return;
     }
     this.connection.invoke(hub, JSON.stringify(data));
-    console.log('After signalR invoke', hub, this.connection.connectionState);
   }
   getToken() {
-    var sparkleConfig = EnvironmentConfigService.getInstance().get('sparkle');
-    if (!!sparkleConfig && !!sparkleConfig.auth && !!sparkleConfig.auth.getToken()) {
-      return sparkle.auth.getToken();
+    var token = TokenService.getInstance().getTokenSync();
+    if (token) {
+      return token;
     }
     return null;
   }

package/dist/collection/services/token.service.js

@@ -0,0 +1,68 @@
+import AppConsts from '../appconst';
+import { AuthStore } from '../stores';
+import { get, remove, set } from './core/localstorage.service';
+export class TokenService {
+  static getInstance() {
+    if (!TokenService.instance) {
+      TokenService.instance = new TokenService();
+    }
+    return TokenService.instance;
+  }
+  async getToken() {
+    let authUser = await get(AppConsts.AUTH_USER_LOCALSTORAGE);
+    if (authUser && authUser.JWToken) {
+      if (new Date(authUser.ExpiresOn).getTime() > new Date().getTime()) {
+        return authUser.JWToken;
+      }
+    }
+    return null;
+  }
+  async getAuthUser() {
+    let authUser = await get(AppConsts.AUTH_USER_LOCALSTORAGE);
+    if (authUser && authUser.JWToken) {
+      if (new Date(authUser.ExpiresOn).getTime() > new Date().getTime()) {
+        return authUser;
+      }
+    }
+    return null;
+  }
+  getAuthUserSync() {
+    let authUser = JSON.parse(localStorage.getItem(AppConsts.AUTH_USER_LOCALSTORAGE));
+    if (authUser && authUser.JWToken) {
+      if (new Date(authUser.ExpiresOn).getTime() > new Date().getTime()) {
+        return authUser;
+      }
+    }
+    return null;
+  }
+  getTokenSync() {
+    let authUser = JSON.parse(localStorage.getItem(AppConsts.AUTH_USER_LOCALSTORAGE));
+    if (authUser && authUser.JWToken) {
+      if (new Date(authUser.ExpiresOn).getTime() > new Date().getTime()) {
+        return authUser.JWToken;
+      }
+    }
+    return null;
+  }
+  async getTokenExpiry() {
+    let authUser = await get(AppConsts.AUTH_USER_LOCALSTORAGE);
+    if (!authUser) {
+      return 0;
+    }
+    let timeDiff = 0;
+    if (authUser.ExpiresOn) {
+      timeDiff = new Date(authUser.ExpiresOn).getTime() - new Date().getTime();
+    }
+    return Math.max(0, timeDiff);
+  }
+  async saveAuthUser(authUser) {
+    AuthStore.state.authUser = Object.assign({}, authUser);
+    AuthStore.state.isAuthenticated = true;
+    await set(AppConsts.AUTH_USER_LOCALSTORAGE, authUser);
+  }
+  async removeAuthUser() {
+    AuthStore.state.authUser = null;
+    AuthStore.state.isAuthenticated = false;
+    await remove(AppConsts.AUTH_USER_LOCALSTORAGE);
+  }
+}

package/dist/collection/util.js

@@ -20,7 +20,7 @@ export function GetGoalAppData(title, description, category, percentage, goalTex
     Description: description,
     Category: category,
     Percentage: percentage,
-    GoalText: goalText
+    GoalText: goalText,
   };
 }
 export function MyMoodTemplate(feeling, intensity, location) {
@@ -41,12 +41,15 @@ export function MyGoalTemplate(goalName, text, progress) {
 export function MyGoalTemplateJSON(goalName, goalUpdateText, progress) {
   return JSON.stringify({ GoalTitle: goalName, GoalText: goalUpdateText, GoalProgress: progress });
 }
+export function FeedPostJSON(postText) {
+  return JSON.stringify({ PostText: postText });
+}
 export class SparkleGlobal {
 }
 SparkleGlobal.MY_GOALS_APP_ID = 1;
 SparkleGlobal.MY_HEALTH_APP_ID = 2;
 SparkleGlobal.MY_MOOD_APP_ID = 3;
-SparkleGlobal.LOCALSTORAGE_CLASSROOM_MODE = "SPARKLE_CLASSROOM_MODE";
+SparkleGlobal.LOCALSTORAGE_CLASSROOM_MODE = 'SPARKLE_CLASSROOM_MODE';
 export function date(date) {
   return format(new Date(date), 'DD MMM YYYY');
 }

package/dist/esm/{PrivateRoute-c5441f35.js → PrivateRoute-c6e80d5d.js}

@@ -1,6 +1,7 @@
 import { c as getAssetPath, h } from './index-c04b9ed5.js';
-import { s as set, r as remove, g as get } from './localstorage.service-4bf408c8.js';
-import { H as HttpService } from './httpService-7b75b095.js';
+import { r as remove, g as get } from './localstorage.service-4bf408c8.js';
+import { H as HttpService } from './httpService-db476835.js';
+import { T as TokenService, A as AppConsts } from './token.service-20f1a256.js';
 import { A as AuthStore } from './auth.store-dba2c2da.js';
 
 //import * as abpTypings from '../lib/abp';
@@ -119,19 +120,6 @@ async function initSetupConfig(config) {
   await setupConfig(config);
 }
 
-const AppConsts = {
-  AUTH_USER_LOCALSTORAGE: "CurrentUser",
-  userManagement: {
-    defaultAdminUserName: 'admin',
-  },
-  localization: {
-    defaultLocalizationSourceName: 'Test',
-  },
-  authorization: {
-    encrptedAuthTokenName: 'enc_auth_token',
-  }
-};
-
 class AuthService {
   constructor() { }
   static getInstance() {
@@ -148,7 +136,7 @@ class AuthService {
     let result;
     try {
       result = await HttpService.http.post('api/Account/Authenticate', authenticationInput, {
-        headers: headers
+        headers: headers,
       });
       if (result) {
         const authData = result.Data;
@@ -162,15 +150,17 @@ class AuthService {
           IssuedOn: authData.IssuedOn,
           ExpiresOn: authData.ExpiresOn,
           RefreshToken: authData.RefreshToken,
-          PhotoUrl: "",
-          IsFacilitator: authData.Roles.indexOf("Facilitator") > 0
+          PhotoUrl: '',
+          IsFacilitator: authData.Roles.indexOf('Facilitator') > 0,
         };
-        const expireDate = authenticationInput.RememberClient ? new Date(authUser.ExpiresOn) : undefined;
-        sparkle.auth.setToken(authUser.JWToken, expireDate);
-        //TODO: change authUser.JWToken to encrypted
-        sparkle.utils.setCookieValue(AppConsts.authorization.encrptedAuthTokenName, authUser.JWToken, expireDate, sparkle.appPath);
-        await set(AppConsts.AUTH_USER_LOCALSTORAGE, authUser);
-        AuthStore.state.authUser = Object.assign({}, authUser);
+        //const expireDate = authenticationInput.RememberClient ? new Date(authUser.ExpiresOn) : undefined;
+        // let authObj: EnvironmentAuthConfig = {
+        //   token: authUser.JWToken,
+        //   expiryDate: expireDate,
+        // };
+        // EnvironmentConfigService.getInstance().setupAuth(authObj);
+        //sparkle.utils.setCookieValue(AppConsts.authorization.encrptedAuthTokenName, authUser.JWToken, expireDate, sparkle.appPath);
+        await TokenService.getInstance().saveAuthUser(authUser);
         AuthStore.state.loading = false;
         return authUser;
       }
@@ -182,10 +172,8 @@ class AuthService {
   }
   async signOut() {
     await remove(AppConsts.AUTH_USER_LOCALSTORAGE);
+    await TokenService.getInstance().removeAuthUser();
     sessionStorage.clear();
-    sparkle.auth.clearToken();
-    AuthStore.state.authUser = null;
-    AuthStore.state.isAuthenticated = false;
   }
   async getLocalAuthUser() {
     return get(AppConsts.AUTH_USER_LOCALSTORAGE);
@@ -212,9 +200,9 @@ const Route = (_a) => {
   const Component = component;
   return (h("stencil-route", Object.assign({}, props, { routeRender: (props) => {
       if (!AuthStore.state.isAuthenticated)
-        return (h("stencil-router-redirect", { url: "/login" }));
+        return h("stencil-router-redirect", { url: "/login" });
       if (permission && !isGranted(permission)) {
-        return (h("stencil-router-redirect", { url: "/unauthorized" }));
+        return h("stencil-router-redirect", { url: "/unauthorized" });
       }
       return Component ? h(Component, Object.assign({}, props, props.componentProps)) : render(props);
     } })));

package/dist/esm/{feed.service-8fbe4ce3.js → appdata.service-d1058e00.js}

@@ -1,13 +1,13 @@
-import { H as HttpService } from './httpService-7b75b095.js';
+import { H as HttpService } from './httpService-db476835.js';
 import { d as createStore } from './auth.store-dba2c2da.js';
-import { S as SparkleGlobal } from './util-6ef753e9.js';
+import { S as SparkleGlobal } from './util-57cc8006.js';
 
-const { state: state$1, onChange } = createStore({
+const { state, onChange } = createStore({
   goals: [],
   goalsLoading: false,
   goalLoading: false
 });
-const goalStore = { state: state$1, onChange };
+const goalStore = { state, onChange };
 
 class AppDataService {
   constructor() { }
@@ -67,54 +67,4 @@ class AppDataService {
   }
 }
 
-const { state, reset } = createStore({
-  posts: [],
-  postsLoading: false,
-  createPostLoading: false,
-  postIdLoading: null
-});
-const feedStore = { state, reset };
-
-class FeedService {
-  constructor() { }
-  static getInstance() {
-    if (!FeedService.instance) {
-      FeedService.instance = new FeedService();
-    }
-    return FeedService.instance;
-  }
-  async getAllPosts() {
-    feedStore.state.postsLoading = true;
-    let result = await HttpService.http.get(`api/v1/Feed/GetAll`);
-    if (result) {
-      feedStore.state.posts = result.Data;
-      feedStore.state.postsLoading = false;
-    }
-    return result;
-  }
-  async createPost(payload) {
-    feedStore.state.createPostLoading = true;
-    let result = await HttpService.http.post(`api/v1/Feed/PostFeed`, payload);
-    if (result) {
-      feedStore.state.posts = [result.Data, ...feedStore.state.posts];
-      feedStore.state.createPostLoading = false;
-    }
-    return result;
-  }
-  async createPostComment(payload) {
-    feedStore.state.postIdLoading = payload.PostId;
-    let result = await HttpService.http.post(`api/v1/Feed/Comment`, payload);
-    if (result) {
-      feedStore.state.posts = feedStore.state.posts.map((item) => {
-        if (item.Id == result.Data.ClassFeedPostId) {
-          return Object.assign(Object.assign({}, item), { Comments: [...item.Comments, result.Data] });
-        }
-        return item;
-      });
-      feedStore.state.postIdLoading = null;
-    }
-    return result;
-  }
-}
-
-export { AppDataService as A, FeedService as F, feedStore as f, goalStore as g };
+export { AppDataService as A, goalStore as g };

package/dist/esm/{assets.service-66e848b8.js → assets.service-def1d63c.js}

@@ -1,4 +1,4 @@
-import { E as EnvironmentConfigService } from './environment-config.service-2b5d692b.js';
+import { E as EnvironmentConfigService } from './environment-config.service-b191f276.js';
 
 class AssetsService {
   constructor() {

package/dist/esm/{environment-config.service-2b5d692b.js → environment-config.service-b191f276.js}

@@ -15,7 +15,6 @@ class EnvironmentConfigService {
     }
     const win = window;
     const Sparkle = win.Sparkle;
-    console.log('getting info');
     this.m = new Map(Object.entries(Sparkle.config));
   }
   get(key, fallback) {

package/dist/esm/{facilitator.service-b0292f7f.js → facilitator.service-53e05a01.js}

@@ -1,4 +1,4 @@
-import { H as HttpService } from './httpService-7b75b095.js';
+import { H as HttpService } from './httpService-db476835.js';
 import { d as createStore } from './auth.store-dba2c2da.js';
 
 const { state, onChange } = createStore({

package/dist/esm/feed.service-8385ad7a.js

@@ -0,0 +1,54 @@
+import { H as HttpService } from './httpService-db476835.js';
+import { d as createStore } from './auth.store-dba2c2da.js';
+
+const { state, reset } = createStore({
+  posts: [],
+  postsLoading: false,
+  createPostLoading: false,
+  postIdLoading: null
+});
+const feedStore = { state, reset };
+
+class FeedService {
+  constructor() { }
+  static getInstance() {
+    if (!FeedService.instance) {
+      FeedService.instance = new FeedService();
+    }
+    return FeedService.instance;
+  }
+  async getAllPosts() {
+    feedStore.state.postsLoading = true;
+    let result = await HttpService.http.get(`api/v1/Feed/GetAll`);
+    if (result) {
+      feedStore.state.posts = result.Data;
+      feedStore.state.postsLoading = false;
+    }
+    return result;
+  }
+  async createPost(payload) {
+    feedStore.state.createPostLoading = true;
+    let result = await HttpService.http.post(`api/v1/Feed/PostFeed`, payload);
+    if (result) {
+      feedStore.state.posts = [result.Data, ...feedStore.state.posts];
+      feedStore.state.createPostLoading = false;
+    }
+    return result;
+  }
+  async createPostComment(payload) {
+    feedStore.state.postIdLoading = payload.PostId;
+    let result = await HttpService.http.post(`api/v1/Feed/Comment`, payload);
+    if (result) {
+      feedStore.state.posts = feedStore.state.posts.map((item) => {
+        if (item.Id == result.Data.ClassFeedPostId) {
+          return Object.assign(Object.assign({}, item), { Comments: [...item.Comments, result.Data] });
+        }
+        return item;
+      });
+      feedStore.state.postIdLoading = null;
+    }
+    return result;
+  }
+}
+
+export { FeedService as F, feedStore as f };