@webitel/ui-sdk 24.4.12 → 24.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webitel/ui-sdk",
-  "version": "24.4.12",
+  "version": "24.4.13",
   "private": false,
   "scripts": {
     "dev": "vite",

package/src/modules/Userinfo/api/userinfo.js

@@ -2,17 +2,12 @@ import applyTransform, {
   notify,
   snakeToCamel,
 } from '../../../api/transformers';
-import BaseAPIService from './BaseAPIService';
 
-class UserinfoAPI extends BaseAPIService {
-  // gets user by token from localstorage
-// stores response username in vuex
+const userinfo = (instance) => ({
   async getSession() {
-    // const tokenCheck = localStorage.getItem('access-token');
-    // if (typeof tokenCheck === 'string') { // if there is no token, localStorage returns object
     const url = '/userinfo';
     try {
-      const response = await this._instance.get(url);
+      const response = await instance.get(url);
       return applyTransform(response.data, [
         snakeToCamel(),
       ]);
@@ -21,13 +16,12 @@ class UserinfoAPI extends BaseAPIService {
         notify,
       ]);
     }
-    // }
-  }
+  },
 
   async getApplicationsAccess() {
     const url = 'role/metadata/access';
     try {
-      const response = await this._instance.get(url);
+      const response = await instance.get(url);
       return applyTransform(response.data, [
         snakeToCamel(),
       ]);
@@ -36,9 +30,19 @@ class UserinfoAPI extends BaseAPIService {
         notify,
       ]);
     }
-  }
-}
+  },
+
+  async logout() {
+    const url = '/logout';
 
-const userinfo = new UserinfoAPI();
+    try {
+      return await instance.post(url, {});
+    } catch (err) {
+      throw applyTransform(err, [
+        notify,
+      ]);
+    }
+  }
+});
 
 export default userinfo;

package/src/modules/Userinfo/store/UserinfoStoreModule.js

@@ -1,8 +1,10 @@
-import userinfo from '../api/userinfo';
+import userinfoGenerator from '../api/userinfo';
 import ApplicationsAccess from '../classes/ApplicationsAccess';
 import BaseStoreModule from '../../../store/BaseStoreModules/BaseStoreModule';
 import Permissions from '../enums/Permissions.enum';
 
+let userinfo = null;
+
 const defaultState = () => ({
   isLoading: true,
   domainId: 0,
@@ -87,7 +89,9 @@ export default class UserinfoStoreModule extends BaseStoreModule {
       return permissions;
     },
 
-    OPEN_SESSION: async (context) => {
+    OPEN_SESSION: async (context, { instance }) => {
+      let userinfo = userinfoGenerator(instance);
+
       await context.dispatch('BEFORE_OPEN_SESSION_HOOK');
       // !!! it should be checked in router.js beforeEach hook
       // if (!localStorage.getItem('access-token')) {
@@ -122,6 +126,12 @@ export default class UserinfoStoreModule extends BaseStoreModule {
       }
     },
 
+    LOGOUT: async (context, { authUrl = import.meta.env.VITE_AUTH_URL }) => {
+      if (!authUrl) throw new Error('No authUrl for LOGOUT provided');
+      await userinfo.logout();
+      window.location.href = authUrl;
+    },
+
     SET_APPLICATIONS_ACCESS: (context, access) => context.commit('SET_APPLICATIONS_ACCESS', access),
 
     SET_LOADING: (context, isLoading) => {

package/src/modules/Userinfo/api/BaseAPIService.js

@@ -1,7 +0,0 @@
-export default class BaseAPIService {
-  _instance = null
-
-  setInstance(instance) {
-    this._instance = instance;
-  }
-}

package/src/modules/Userinfo/api/auth.js

@@ -1,31 +0,0 @@
-import BaseAPIService from './BaseAPIService';
-import applyTransform, {
-  notify,
-} from '../../../api/transformers';
-
-class AuthAPI extends BaseAPIService {
-  async setToken(token) {
-    localStorage.setItem('access-token', token);
-  }
-
-  removeToken() {
-    localStorage.removeItem('access-token');
-  }
-
-  async logout() {
-    const url = '/logout';
-
-    try {
-      await this._instance.post(url, {});
-      this.removeToken();
-    } catch (err) {
-      throw applyTransform(err, [
-        notify,
-      ]);
-    }
-  }
-}
-
-const auth = new AuthAPI();
-
-export default auth;

package/src/modules/Userinfo/components/__tests__/auth.spec.js

@@ -1,54 +0,0 @@
-import { shallowMount } from '@vue/test-utils';
-import { createStore } from 'vuex';
-import { createRouter, createWebHistory } from 'vue-router';
-import authAPI from '../../api/auth';
-import userinfoAPI from '../../api/userinfo';
-import Auth from '../the-auth.vue';
-import UserinfoStoreModule from '../../store/UserinfoStoreModule';
-
-import '../../../../../tests/mocks/localStorageMock';
-
-localStorage.setItem('access-token', 'jest');
-
-authAPI.setToken = vi.fn();
-userinfoAPI.getSession = vi.fn(() => ({}));
-userinfoAPI.getApplicationsAccess = vi.fn(() => ({}));
-
-describe('Auth', () => {
-  let store;
-  let wrapper;
-  const router = createRouter({
-    history: createWebHistory(),
-    routes: [],
-  });
-  router.replace = vi.fn();
-
-  const userinfo = new UserinfoStoreModule().getModule();
-  beforeEach(() => {
-    store = createStore({
-      modules: { userinfo },
-    });
-
-    wrapper = shallowMount(Auth, {
-      global: {
-        plugins: [router, store],
-      },
-    });
-  });
-
-  it('renders a component', () => {
-    expect(wrapper.classes('auth-wrap')).toBe(true);
-  });
-
-  it('sets token, gets session and opens app after auth token message emit', async () => {
-    const accessToken = 'hello there';
-    window.postMessage({ accessToken }, '*');
-    await new Promise((resolve) => setTimeout(() => {
-      expect(authAPI.setToken).toHaveBeenCalledWith(accessToken);
-      expect(userinfoAPI.getSession).toHaveBeenCalled();
-      expect(userinfoAPI.getApplicationsAccess).toHaveBeenCalled();
-      expect(router.replace).toHaveBeenCalled();
-      resolve();
-    }, 100));
-  });
-});

package/src/modules/Userinfo/components/the-auth.vue

@@ -1,79 +0,0 @@
-<template>
-  <div class="auth-wrap">
-    <div
-      v-show="!isLoaded"
-      class="auth-loader"
-    >
-      <wt-loader />
-    </div>
-    <iframe
-      class="auth"
-      :src="authURL"
-      @load="isLoaded = true"
-    >
-      <p>Your browser does not support iframes.</p>
-    </iframe>
-  </div>
-</template>
-
-<script>
-import AuthAPI from '../api/auth';
-
-const authURL = process ? process.env.VUE_APP_AUTH_MODULE_URL : import.meta.env.VITE_AUTH_MODE_URL;
-
-export default {
-  name: 'Auth',
-  props: {
-    namespace: {
-      type: String,
-      default: 'userinfo',
-    },
-  },
-  data: () => ({
-    authURL,
-    isLoaded: false,
-  }),
-
-  mounted() {
-    window.addEventListener('message', this.authMessageHandler, false);
-  },
-  unmounted() {
-    window.removeEventListener('message', this.authMessageHandler, false);
-  },
-
-  methods: {
-    openSession(payload) {
-      return this.$store.dispatch(`${this.namespace}/OPEN_SESSION`, payload);
-    },
-    async authMessageHandler(event) {
-      if (event.data.accessToken) {
-        // eslint-disable-next-line import/no-named-as-default-member
-        await AuthAPI.setToken(event.data.accessToken);
-        await this.openSession();
-        await this.$router.replace('/');
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.auth-wrap {
-  position: relative;
-  height: 100vh;
-  width: 100vw;
-  overflow: hidden;
-
-  .wt-loader {
-    position: absolute;
-    top: 50%;
-    right: 50%;
-    transform: translate(-50%, -50%);
-  }
-
-  .auth {
-    height: 100%;
-    width: 100%;
-  }
-}
-</style>