groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Rename getSamlAuthProviders as listSamlAuthProviders query
This commit is contained in:
Ömer Faruk Aydın
2023-08-07 16:48:06 +02:00
committed by GitHub
parent 40e10cc270 4b706e004d
commit f488a71304
7 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/graphql/queries/get-saml-auth-providers.ee.ts → packages/backend/src/graphql/queries/list-saml-auth-providers.ee.ts
View File

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

4
packages/backend/src/graphql/query-resolvers.ts
View File

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

4
packages/backend/src/graphql/schema.graphql
View File

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

5
packages/backend/src/helpers/authentication.ts
View File

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

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

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

11
packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts Normal file
View File

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

8
packages/web/src/hooks/useSamlAuthProviders.ee.ts
View File

@@ -1,7 +1,7 @@
import { useQuery } from '@apollo/client'; import { useQuery } from '@apollo/client';
import { TSamlAuthProvider } from '@automatisch/types'; 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 = { type UseSamlAuthProvidersReturn = {
providers: TSamlAuthProvider[]; providers: TSamlAuthProvider[];
@@ -9,10 +9,10 @@ type UseSamlAuthProvidersReturn = {
}; };
export default function useSamlAuthProviders(): UseSamlAuthProvidersReturn { export default function useSamlAuthProviders(): UseSamlAuthProvidersReturn {
const { data, loading } = useQuery(GET_SAML_AUTH_PROVIDERS); const { data, loading } = useQuery(LIST_SAML_AUTH_PROVIDERS);
return { return {
providers: data?.getSamlAuthProviders || [], providers: data?.listSamlAuthProviders || [],
loading loading,
}; };
} }