Merge pull request #1198 from automatisch/list-saml-auth-providers

Rename getSamlAuthProviders as listSamlAuthProviders query

packages/backend/src/graphql/queries/list-saml-auth-providers.ee.ts

@@ -1,9 +1,9 @@
 import SamlAuthProvider from '../../models/saml-auth-provider.ee';
 
-const getSamlAuthProviders = async () => {
+const listSamlAuthProviders = async () => {
   const providers = await SamlAuthProvider.query().where({ active: true });
 
   return providers;
 };
 
-export default getSamlAuthProviders;
+export default listSamlAuthProviders;

packages/backend/src/graphql/query-resolvers.ts

@@ -19,7 +19,7 @@ import getPaymentPlans from './queries/get-payment-plans.ee';
 import getPermissionCatalog from './queries/get-permission-catalog.ee';
 import getRole from './queries/get-role.ee';
 import getRoles from './queries/get-roles.ee';
-import getSamlAuthProviders from './queries/get-saml-auth-providers.ee';
+import listSamlAuthProviders from './queries/list-saml-auth-providers.ee';
 import getStepWithTestExecutions from './queries/get-step-with-test-executions';
 import getSubscriptionStatus from './queries/get-subscription-status.ee';
 import getTrialStatus from './queries/get-trial-status.ee';
@@ -46,7 +46,7 @@ const queryResolvers = {
   getPermissionCatalog,
   getRole,
   getRoles,
-  getSamlAuthProviders,
+  listSamlAuthProviders,
   getStepWithTestExecutions,
   getSubscriptionStatus,
   getTrialStatus,

packages/backend/src/graphql/schema.graphql

@@ -41,7 +41,7 @@ type Query {
   getAutomatischInfo: GetAutomatischInfo
   getTrialStatus: GetTrialStatus
   getSubscriptionStatus: GetSubscriptionStatus
-  getSamlAuthProviders: [GetSamlAuthProviders]
+  listSamlAuthProviders: [ListSamlAuthProviders]
   getUsers(limit: Int!, offset: Int!): UserConnection
   getUser(id: String!): User
   getRoles: [Role]
@@ -659,7 +659,7 @@ type PaymentPlan {
   productId: String
 }
 
-type GetSamlAuthProviders {
+type ListSamlAuthProviders {
   id: String
   name: String
   issuer: String

packages/backend/src/helpers/authentication.ts

@@ -12,8 +12,7 @@ const isAuthenticated = rule()(async (_parent, _args, req) => {
     const { userId } = jwt.verify(token, appConfig.appSecretKey) as {
       userId: string;
     };
-    req.currentUser = await User
-      .query()
+    req.currentUser = await User.query()
       .findById(userId)
       .leftJoinRelated({
         role: true,
@@ -35,7 +34,7 @@ const authentication = shield(
     Query: {
       '*': isAuthenticated,
       getAutomatischInfo: allow,
-      getSamlAuthProviders: allow,
+      listSamlAuthProviders: allow,
       healthcheck: allow,
     },
     Mutation: {

packages/web/src/graphql/queries/get-saml-auth-providers.ee.ts

@@ -1,11 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const GET_SAML_AUTH_PROVIDERS = gql`
-  query GetSamlAuthProviders {
-    getSamlAuthProviders {
-      id
-      name
-      issuer
-    }
-  }
-`;

packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts

@@ -0,0 +1,11 @@
+import { gql } from '@apollo/client';
+
+export const LIST_SAML_AUTH_PROVIDERS = gql`
+  query ListSamlAuthProviders {
+    listSamlAuthProviders {
+      id
+      name
+      issuer
+    }
+  }
+`;

packages/web/src/hooks/useSamlAuthProviders.ee.ts

@@ -1,7 +1,7 @@
 import { useQuery } from '@apollo/client';
 
 import { TSamlAuthProvider } from '@automatisch/types';
-import { GET_SAML_AUTH_PROVIDERS } from 'graphql/queries/get-saml-auth-providers.ee';
+import { LIST_SAML_AUTH_PROVIDERS } from 'graphql/queries/list-saml-auth-providers.ee';
 
 type UseSamlAuthProvidersReturn = {
   providers: TSamlAuthProvider[];
@@ -9,10 +9,10 @@ type UseSamlAuthProvidersReturn = {
 };
 
 export default function useSamlAuthProviders(): UseSamlAuthProvidersReturn {
-  const { data, loading } = useQuery(GET_SAML_AUTH_PROVIDERS);
+  const { data, loading } = useQuery(LIST_SAML_AUTH_PROVIDERS);
 
   return {
-    providers: data?.getSamlAuthProviders || [],
-    loading
+    providers: data?.listSamlAuthProviders || [],
+    loading,
   };
 }