From 4b706e004d2345dd8ef265b046ecc4dc65dec8f9 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Mon, 7 Aug 2023 16:22:00 +0200 Subject: [PATCH] chore: Rename getSamlAuthProviders as listSamlAuthProviders query --- ...providers.ee.ts => list-saml-auth-providers.ee.ts} | 4 ++-- packages/backend/src/graphql/query-resolvers.ts | 4 ++-- packages/backend/src/graphql/schema.graphql | 4 ++-- packages/backend/src/helpers/authentication.ts | 5 ++--- .../src/graphql/queries/get-saml-auth-providers.ee.ts | 11 ----------- .../graphql/queries/list-saml-auth-providers.ee.ts | 11 +++++++++++ packages/web/src/hooks/useSamlAuthProviders.ee.ts | 8 ++++---- 7 files changed, 23 insertions(+), 24 deletions(-) rename packages/backend/src/graphql/queries/{get-saml-auth-providers.ee.ts => list-saml-auth-providers.ee.ts} (67%) delete mode 100644 packages/web/src/graphql/queries/get-saml-auth-providers.ee.ts create mode 100644 packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts diff --git a/packages/backend/src/graphql/queries/get-saml-auth-providers.ee.ts b/packages/backend/src/graphql/queries/list-saml-auth-providers.ee.ts similarity index 67% rename from packages/backend/src/graphql/queries/get-saml-auth-providers.ee.ts rename to packages/backend/src/graphql/queries/list-saml-auth-providers.ee.ts index 39de490f..313dd8e4 100644 --- a/packages/backend/src/graphql/queries/get-saml-auth-providers.ee.ts +++ b/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; diff --git a/packages/backend/src/graphql/query-resolvers.ts b/packages/backend/src/graphql/query-resolvers.ts index b5f50222..169701af 100644 --- a/packages/backend/src/graphql/query-resolvers.ts +++ b/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, diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql index 87a28d16..bb7587e9 100644 --- a/packages/backend/src/graphql/schema.graphql +++ b/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 diff --git a/packages/backend/src/helpers/authentication.ts b/packages/backend/src/helpers/authentication.ts index b31df2c7..de8ab5f0 100644 --- a/packages/backend/src/helpers/authentication.ts +++ b/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: { diff --git a/packages/web/src/graphql/queries/get-saml-auth-providers.ee.ts b/packages/web/src/graphql/queries/get-saml-auth-providers.ee.ts deleted file mode 100644 index e50d83e1..00000000 --- a/packages/web/src/graphql/queries/get-saml-auth-providers.ee.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { gql } from '@apollo/client'; - -export const GET_SAML_AUTH_PROVIDERS = gql` - query GetSamlAuthProviders { - getSamlAuthProviders { - id - name - issuer - } - } -`; diff --git a/packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts b/packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts new file mode 100644 index 00000000..62646bd2 --- /dev/null +++ b/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 + } + } +`; diff --git a/packages/web/src/hooks/useSamlAuthProviders.ee.ts b/packages/web/src/hooks/useSamlAuthProviders.ee.ts index 39d64179..2e154656 100644 --- a/packages/web/src/hooks/useSamlAuthProviders.ee.ts +++ b/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, }; }