@sparkle-learning/core 0.0.53 → 0.0.54

package/dist/cjs/{PrivateRoute-074c584e.js → PrivateRoute-e2047db2.js}

@@ -2,7 +2,8 @@
 
 const index = require('./index-51e8292e.js');
 const localstorage_service = require('./localstorage.service-6346a41d.js');
-const httpService = require('./httpService-7211d93b.js');
+const httpService = require('./httpService-d8a5b474.js');
+const token_service = require('./token.service-bfb0089b.js');
 const auth_store = require('./auth.store-1e630a7d.js');
 
 //import * as abpTypings from '../lib/abp';
@@ -121,19 +122,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() {
@@ -150,7 +138,7 @@ class AuthService {
     let result;
     try {
       result = await httpService.HttpService.http.post('api/Account/Authenticate', authenticationInput, {
-        headers: headers
+        headers: headers,
       });
       if (result) {
         const authData = result.Data;
@@ -164,15 +152,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 localstorage_service.set(AppConsts.AUTH_USER_LOCALSTORAGE, authUser);
-        auth_store.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 token_service.TokenService.getInstance().saveAuthUser(authUser);
         auth_store.AuthStore.state.loading = false;
         return authUser;
       }
@@ -183,14 +173,12 @@ class AuthService {
     }
   }
   async signOut() {
-    await localstorage_service.remove(AppConsts.AUTH_USER_LOCALSTORAGE);
+    await localstorage_service.remove(token_service.AppConsts.AUTH_USER_LOCALSTORAGE);
+    await token_service.TokenService.getInstance().removeAuthUser();
     sessionStorage.clear();
-    sparkle.auth.clearToken();
-    auth_store.AuthStore.state.authUser = null;
-    auth_store.AuthStore.state.isAuthenticated = false;
   }
   async getLocalAuthUser() {
-    return localstorage_service.get(AppConsts.AUTH_USER_LOCALSTORAGE);
+    return localstorage_service.get(token_service.AppConsts.AUTH_USER_LOCALSTORAGE);
   }
 }
 
@@ -214,9 +202,9 @@ const Route = (_a) => {
   const Component = component;
   return (index.h("stencil-route", Object.assign({}, props, { routeRender: (props) => {
       if (!auth_store.AuthStore.state.isAuthenticated)
-        return (index.h("stencil-router-redirect", { url: "/login" }));
+        return index.h("stencil-router-redirect", { url: "/login" });
       if (permission && !isGranted(permission)) {
-        return (index.h("stencil-router-redirect", { url: "/unauthorized" }));
+        return index.h("stencil-router-redirect", { url: "/unauthorized" });
       }
       return Component ? index.h(Component, Object.assign({}, props, props.componentProps)) : render(props);
     } })));

package/dist/cjs/{feed.service-b4f09441.js → appdata.service-d28cf2d6.js}

@@ -1,15 +1,15 @@
 'use strict';
 
-const httpService = require('./httpService-7211d93b.js');
+const httpService = require('./httpService-d8a5b474.js');
 const auth_store = require('./auth.store-1e630a7d.js');
-const util = require('./util-d383acb8.js');
+const util = require('./util-47e320b2.js');
 
-const { state: state$1, onChange } = auth_store.createStore({
+const { state, onChange } = auth_store.createStore({
   goals: [],
   goalsLoading: false,
   goalLoading: false
 });
-const goalStore = { state: state$1, onChange };
+const goalStore = { state, onChange };
 
 class AppDataService {
   constructor() { }
@@ -69,57 +69,5 @@ class AppDataService {
   }
 }
 
-const { state, reset } = auth_store.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.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.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.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;
-  }
-}
-
 exports.AppDataService = AppDataService;
-exports.FeedService = FeedService;
-exports.feedStore = feedStore;
 exports.goalStore = goalStore;

package/dist/cjs/{assets.service-0c759d51.js → assets.service-bfa75092.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const environmentConfig_service = require('./environment-config.service-0e02b049.js');
+const environmentConfig_service = require('./environment-config.service-c8ff1f3d.js');
 
 class AssetsService {
   constructor() {

package/dist/cjs/{environment-config.service-0e02b049.js → environment-config.service-c8ff1f3d.js}

@@ -17,7 +17,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/cjs/{facilitator.service-9e990274.js → facilitator.service-0b9f6ac7.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-const httpService = require('./httpService-7211d93b.js');
+const httpService = require('./httpService-d8a5b474.js');
 const auth_store = require('./auth.store-1e630a7d.js');
 
 const { state, onChange } = auth_store.createStore({

package/dist/cjs/feed.service-6df9382f.js

@@ -0,0 +1,57 @@
+'use strict';
+
+const httpService = require('./httpService-d8a5b474.js');
+const auth_store = require('./auth.store-1e630a7d.js');
+
+const { state, reset } = auth_store.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.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.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.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;
+  }
+}
+
+exports.FeedService = FeedService;
+exports.feedStore = feedStore;