Merge pull request #84 from webitel/hotfix/double-call-login-api

Hotfix/double call login api
webitel · May 23, 2024 · 724b550 · 724b550
2 parents 9b2e4ef + 76cf7ec
commit 724b550
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 54 deletions.
diff --git a/src/api/auth/auth.js b/src/api/auth/auth.js
@@ -95,13 +95,6 @@ const checkCurrentSession = async () => {
   }
 };
 
-const loadServiceProviders = async ({ domain }) => {
-  const baseUrl = '/login';
-  const url = `${baseUrl}?domain=${domain}`;
-  const response = await instance.get(url);
-  return response;
-};
-
 const clearToken = () => {
   localStorage.removeItem('access-token');
   instance.defaults.headers['X-Webitel-Access'] = '';
@@ -116,7 +109,7 @@ const checkDomainExistence = async (domain) => {
   const baseUrl = '/login';
   const url = `${baseUrl}?domain=${domain}`;
   try {
-    await instance.get(url);
+    return await instance.get(url);
   } catch (err) {
     throw err;
   }
@@ -127,7 +120,6 @@ const AuthAPI = {
   login2fa,
   register,
   checkCurrentSession,
-  loadServiceProviders,
   checkDomainExistence,
 };
 

diff --git a/src/components/auth/login/providers/__tests__/the-login-providers.spec.js b/src/components/auth/login/providers/__tests__/the-login-providers.spec.js
@@ -29,16 +29,6 @@ describe('TheLoginProviders', () => {
     expect(wrapper.exists()).toBe(true);
   });
 
-  it('loads service providers initially', () => {
-    const mock = vi.spyOn(store, 'dispatch').mockImplementationOnce(vi.fn());
-    const wrapper = shallowMount(TheLoginProviders, {
-      global: {
-        plugins: [store],
-      },
-    });
-    expect(mock).toHaveBeenCalledWith('auth/LOAD_SERVICE_PROVIDERS');
-  });
-
   it('should render service providers', () => {
     const loginProviders = {
       [ServiceProvider.ADFS]: {},

diff --git a/src/components/auth/login/providers/the-login-providers.vue b/src/components/auth/login/providers/the-login-providers.vue
@@ -50,12 +50,6 @@ const serviceProviders = computed(() => {
 function openProvider({ ticket }) {
   return store.dispatch('auth/EXECUTE_PROVIDER', { ticket });
 }
-
-function loadAvailableProviders() {
-  return store.dispatch('auth/LOAD_SERVICE_PROVIDERS');
-}
-
-loadAvailableProviders();
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/store/modules/auth/__tests__/auth.spec.js b/src/store/modules/auth/__tests__/auth.spec.js
@@ -56,21 +56,6 @@ describe('auth store', () => {
     expect(mock).toHaveBeenCalledWith(state);
   });
 
-  it('LOAD_SERVICE_PROVIDERS action calls AuthAPI.loadServiceProviders with domain from state', async () => {
-    const state = {
-      domain: 'domain',
-    };
-
-    const federation = {};
-
-    context.state = state;
-
-    const mock = vi.spyOn(authAPI, 'loadServiceProviders').mockImplementationOnce(() => ({ federation }));
-    await auth.actions.LOAD_SERVICE_PROVIDERS(context);
-    expect(mock).toHaveBeenCalledWith({ domain: state.domain });
-    expect(context.commit).toHaveBeenCalledWith('SET_SERVICE_PROVIDERS', federation);
-  });
-
   it('CHECK_CURRENT_SESSION action calls AuthAPI.checkCurrentSession', async () => {
     const accessToken = 'vi';
     const mock = vi.spyOn(authAPI, 'checkCurrentSession')
@@ -111,11 +96,16 @@ describe('auth store', () => {
   });
 
   it('CHECK_DOMAIN action calls AuthAPI.checkDomainExistence with domain from state', async () => {
-    const domain = 'domain';
-    context.state.domain = domain;
+    const state = {
+      domain: 'domain',
+      federation: {},
+    };
+
+    context.state = state;
 
-    const mock = vi.spyOn(authAPI, 'checkDomainExistence').mockImplementationOnce(vi.fn());
+    const mock = vi.spyOn(authAPI, 'checkDomainExistence').mockImplementationOnce(() => ({ federation: state.federation }));
     await auth.actions.CHECK_DOMAIN(context);
-    expect(mock).toHaveBeenCalledWith(domain);
+    expect(mock).toHaveBeenCalledWith(state.domain);
+    expect(context.commit).toHaveBeenCalledWith('SET_SERVICE_PROVIDERS', state.federation);
   });
 });
diff --git a/src/store/modules/auth/auth.js b/src/store/modules/auth/auth.js
@@ -74,14 +74,6 @@ const actions = {
     }
   },
 
-  LOAD_SERVICE_PROVIDERS: async (context) => {
-    const domain = context.state.domain;
-    const response = await AuthAPI.loadServiceProviders({ domain });
-    const { federation = {}, enabledTfa } = response;
-    context.commit('SET_SERVICE_PROVIDERS', federation);
-    await context.dispatch('SET_PROPERTY', { prop: 'enabledTfa', value: enabledTfa });
-  },
-
   EXECUTE_PROVIDER: (context, { ticket }) => {
     const baseUrl = `${import.meta.env.VITE_API_URL}/login`;
     const query = {
@@ -118,8 +110,11 @@ const actions = {
     if (context.state.domain) localStorage.setItem('auth/domain', context.state.domain);
   },
 
-  CHECK_DOMAIN: (context, domain = context.state.domain) => {
-    return AuthAPI.checkDomainExistence(domain);
+  CHECK_DOMAIN: async (context, domain = context.state.domain) => {
+    const response = await AuthAPI.checkDomainExistence(domain);
+    const { federation = {}, enabledTfa } = response;
+    context.commit('SET_SERVICE_PROVIDERS', federation);
+    await context.dispatch('SET_PROPERTY', { prop: 'enabledTfa', value: enabledTfa });
   },
 
   SET_PROPERTY: (context, { prop, value }) => {