From ab49535b6ccf98f556e042d39b922563cb5ccd6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C4=B1dvan=20Akca?= <akca.ridvann@gmail.com>
Date: Thu, 14 Mar 2024 15:13:17 +0300
Subject: [PATCH] refactor: rewrite useSamlAuthProviders with RQ

---
 .../queries/list-saml-auth-providers.ee.js    |  9 --------
 .../backend/src/graphql/query-resolvers.js    |  2 --
 packages/backend/src/graphql/schema.graphql   |  8 -------
 .../backend/src/helpers/authentication.js     |  1 -
 .../src/components/SsoProviders/index.ee.jsx  | 12 +++++++---
 .../queries/list-saml-auth-providers.ee.js    | 11 ---------
 .../src/hooks/useAdminSamlAuthProviders.ee.js | 18 +++++++++++++++
 packages/web/src/hooks/useLazyApps.js         |  2 +-
 .../web/src/hooks/useSamlAuthProviders.ee.js  | 23 +++++++++++++------
 .../web/src/pages/Authentication/index.jsx    | 10 ++++----
 packages/web/src/pages/EditUser/index.jsx     |  2 +-
 .../web/src/pages/ProfileSettings/index.jsx   |  2 +-
 12 files changed, 52 insertions(+), 48 deletions(-)
 delete mode 100644 packages/backend/src/graphql/queries/list-saml-auth-providers.ee.js
 delete mode 100644 packages/web/src/graphql/queries/list-saml-auth-providers.ee.js
 create mode 100644 packages/web/src/hooks/useAdminSamlAuthProviders.ee.js

diff --git a/packages/backend/src/graphql/queries/list-saml-auth-providers.ee.js b/packages/backend/src/graphql/queries/list-saml-auth-providers.ee.js
deleted file mode 100644
index 1e2ee21e..00000000
--- a/packages/backend/src/graphql/queries/list-saml-auth-providers.ee.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import SamlAuthProvider from '../../models/saml-auth-provider.ee.js';
-
-const listSamlAuthProviders = async () => {
-  const providers = await SamlAuthProvider.query().where({ active: true });
-
-  return providers;
-};
-
-export default listSamlAuthProviders;
diff --git a/packages/backend/src/graphql/query-resolvers.js b/packages/backend/src/graphql/query-resolvers.js
index 48d4ac97..0419571b 100644
--- a/packages/backend/src/graphql/query-resolvers.js
+++ b/packages/backend/src/graphql/query-resolvers.js
@@ -14,7 +14,6 @@ import getSamlAuthProviderRoleMappings from './queries/get-saml-auth-provider-ro
 import getStepWithTestExecutions from './queries/get-step-with-test-executions.js';
 import getTrialStatus from './queries/get-trial-status.ee.js';
 import getUsers from './queries/get-users.js';
-import listSamlAuthProviders from './queries/list-saml-auth-providers.ee.js';
 import testConnection from './queries/test-connection.js';
 
 const queryResolvers = {
@@ -34,7 +33,6 @@ const queryResolvers = {
   getStepWithTestExecutions,
   getTrialStatus,
   getUsers,
-  listSamlAuthProviders,
   testConnection,
 };
 
diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql
index eec816d3..d0b3d176 100644
--- a/packages/backend/src/graphql/schema.graphql
+++ b/packages/backend/src/graphql/schema.graphql
@@ -30,7 +30,6 @@ type Query {
   getSamlAuthProviderRoleMappings(id: String!): [SamlAuthProvidersRoleMapping]
   getTrialStatus: GetTrialStatus
   getUsers(limit: Int!, offset: Int!): UserConnection
-  listSamlAuthProviders: [ListSamlAuthProvider]
 }
 
 type Mutation {
@@ -642,13 +641,6 @@ type Usage {
   task: Int
 }
 
-type ListSamlAuthProvider {
-  id: String
-  name: String
-  issuer: String
-  loginUrl: String
-}
-
 type Permission {
   id: String
   action: String
diff --git a/packages/backend/src/helpers/authentication.js b/packages/backend/src/helpers/authentication.js
index 448d8777..1e34a8fd 100644
--- a/packages/backend/src/helpers/authentication.js
+++ b/packages/backend/src/helpers/authentication.js
@@ -44,7 +44,6 @@ export const authenticationRules = {
     '*': isAuthenticatedRule,
     getConfig: allow,
     getNotifications: allow,
-    listSamlAuthProviders: allow,
   },
   Mutation: {
     '*': isAuthenticatedRule,
diff --git a/packages/web/src/components/SsoProviders/index.ee.jsx b/packages/web/src/components/SsoProviders/index.ee.jsx
index 5689eda6..a1cb6557 100644
--- a/packages/web/src/components/SsoProviders/index.ee.jsx
+++ b/packages/web/src/components/SsoProviders/index.ee.jsx
@@ -3,19 +3,25 @@ import Paper from '@mui/material/Paper';
 import Button from '@mui/material/Button';
 import Stack from '@mui/material/Stack';
 import Divider from '@mui/material/Divider';
+
 import useSamlAuthProviders from 'hooks/useSamlAuthProviders.ee';
 import useFormatMessage from 'hooks/useFormatMessage';
+
 function SsoProviders() {
   const formatMessage = useFormatMessage();
-  const { providers, loading } = useSamlAuthProviders();
-  if (!loading && providers.length === 0) return null;
+  const { data, isLoading: isSamlAuthProvidersLoading } =
+    useSamlAuthProviders();
+  const providers = data?.data;
+
+  if (!isSamlAuthProvidersLoading && providers?.length === 0) return null;
+
   return (
     <>
       <Divider>{formatMessage('loginPage.divider')}</Divider>
 
       <Paper sx={{ px: 2, py: 4 }}>
         <Stack direction="column" gap={1}>
-          {providers.map((provider) => (
+          {providers?.map((provider) => (
             <Button
               key={provider.id}
               component="a"
diff --git a/packages/web/src/graphql/queries/list-saml-auth-providers.ee.js b/packages/web/src/graphql/queries/list-saml-auth-providers.ee.js
deleted file mode 100644
index c922d604..00000000
--- a/packages/web/src/graphql/queries/list-saml-auth-providers.ee.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { gql } from '@apollo/client';
-export const LIST_SAML_AUTH_PROVIDERS = gql`
-  query ListSamlAuthProviders {
-    listSamlAuthProviders {
-      id
-      name
-      loginUrl
-      issuer
-    }
-  }
-`;
diff --git a/packages/web/src/hooks/useAdminSamlAuthProviders.ee.js b/packages/web/src/hooks/useAdminSamlAuthProviders.ee.js
new file mode 100644
index 00000000..a2ac0d4f
--- /dev/null
+++ b/packages/web/src/hooks/useAdminSamlAuthProviders.ee.js
@@ -0,0 +1,18 @@
+import { useQuery } from '@tanstack/react-query';
+
+import api from 'helpers/api';
+
+export default function useAdminSamlAuthProviders() {
+  const query = useQuery({
+    queryKey: ['adminSamlAuthProviders'],
+    queryFn: async ({ signal }) => {
+      const { data } = await api.get('/v1/admin/saml-auth-providers', {
+        signal,
+      });
+
+      return data;
+    },
+  });
+
+  return query;
+}
diff --git a/packages/web/src/hooks/useLazyApps.js b/packages/web/src/hooks/useLazyApps.js
index 33fab2c1..0f72050d 100644
--- a/packages/web/src/hooks/useLazyApps.js
+++ b/packages/web/src/hooks/useLazyApps.js
@@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query';
 import api from 'helpers/api';
 import React from 'react';
 
-export default function useLazyApps({ appName } = {}, { onSuccess }) {
+export default function useLazyApps({ appName } = {}, { onSuccess } = {}) {
   const abortControllerRef = React.useRef(new AbortController());
 
   React.useEffect(() => {
diff --git a/packages/web/src/hooks/useSamlAuthProviders.ee.js b/packages/web/src/hooks/useSamlAuthProviders.ee.js
index 1bfcedf7..2aab241a 100644
--- a/packages/web/src/hooks/useSamlAuthProviders.ee.js
+++ b/packages/web/src/hooks/useSamlAuthProviders.ee.js
@@ -1,9 +1,18 @@
-import { useQuery } from '@apollo/client';
-import { LIST_SAML_AUTH_PROVIDERS } from 'graphql/queries/list-saml-auth-providers.ee';
+import { useQuery } from '@tanstack/react-query';
+
+import api from 'helpers/api';
+
 export default function useSamlAuthProviders() {
-  const { data, loading } = useQuery(LIST_SAML_AUTH_PROVIDERS);
-  return {
-    providers: data?.listSamlAuthProviders || [],
-    loading,
-  };
+  const query = useQuery({
+    queryKey: ['samlAuthProviders'],
+    queryFn: async ({ signal }) => {
+      const { data } = await api.get('/v1/saml-auth-providers', {
+        signal,
+      });
+
+      return data;
+    },
+  });
+
+  return query;
 }
diff --git a/packages/web/src/pages/Authentication/index.jsx b/packages/web/src/pages/Authentication/index.jsx
index 6a15cf45..83428a66 100644
--- a/packages/web/src/pages/Authentication/index.jsx
+++ b/packages/web/src/pages/Authentication/index.jsx
@@ -6,12 +6,14 @@ import useFormatMessage from 'hooks/useFormatMessage';
 import useSamlAuthProvider from 'hooks/useSamlAuthProvider';
 import SamlConfiguration from './SamlConfiguration';
 import RoleMappings from './RoleMappings';
-import useSamlAuthProviders from 'hooks/useSamlAuthProviders.ee';
+import useAdminSamlAuthProviders from 'hooks/useAdminSamlAuthProviders.ee';
 function AuthenticationPage() {
   const formatMessage = useFormatMessage();
-  const { providers } = useSamlAuthProviders();
-  const samlAuthProviderId = providers[0]?.id;
-  const { data, loading: isProviderLoading } = useSamlAuthProvider({
+
+  const { data: adminSamlAuthProviders } = useAdminSamlAuthProviders();
+  const samlAuthProviderId = adminSamlAuthProviders?.data?.[0].id;
+
+  const { data, isLoading: isProviderLoading } = useSamlAuthProvider({
     samlAuthProviderId,
   });
   const provider = data?.data;
diff --git a/packages/web/src/pages/EditUser/index.jsx b/packages/web/src/pages/EditUser/index.jsx
index 596f5933..1100ea80 100644
--- a/packages/web/src/pages/EditUser/index.jsx
+++ b/packages/web/src/pages/EditUser/index.jsx
@@ -30,7 +30,7 @@ export default function EditUser() {
   const { userId } = useParams();
   const { data: userData, loading: isUserLoading } = useUser({ userId });
   const user = userData?.data;
-  const { data, loading: isRolesLoading } = useRoles();
+  const { data, isLoading: isRolesLoading } = useRoles();
   const roles = data?.data;
   const enqueueSnackbar = useEnqueueSnackbar();
   const navigate = useNavigate();
diff --git a/packages/web/src/pages/ProfileSettings/index.jsx b/packages/web/src/pages/ProfileSettings/index.jsx
index 9a7ab8b3..93835a1b 100644
--- a/packages/web/src/pages/ProfileSettings/index.jsx
+++ b/packages/web/src/pages/ProfileSettings/index.jsx
@@ -63,7 +63,7 @@ function ProfileSettings() {
       optimisticResponse: {
         updateCurrentUser: {
           __typename: 'User',
-          id: currentUser?.id,
+          id: currentUser.id,
           fullName,
           email,
         },