diff --git a/packages/backend/src/graphql/mutation-resolvers.js b/packages/backend/src/graphql/mutation-resolvers.js index f29b5f57..e02841fa 100644 --- a/packages/backend/src/graphql/mutation-resolvers.js +++ b/packages/backend/src/graphql/mutation-resolvers.js @@ -1,11 +1,9 @@ // Converted mutations import verifyConnection from './mutations/verify-connection.js'; -import generateAuthUrl from './mutations/generate-auth-url.js'; import resetConnection from './mutations/reset-connection.js'; import updateConnection from './mutations/update-connection.js'; const mutationResolvers = { - generateAuthUrl, resetConnection, updateConnection, verifyConnection, diff --git a/packages/backend/src/graphql/mutations/generate-auth-url.js b/packages/backend/src/graphql/mutations/generate-auth-url.js deleted file mode 100644 index 17948c14..00000000 --- a/packages/backend/src/graphql/mutations/generate-auth-url.js +++ /dev/null @@ -1,30 +0,0 @@ -import globalVariable from '../../helpers/global-variable.js'; -import App from '../../models/app.js'; - -const generateAuthUrl = async (_parent, params, context) => { - context.currentUser.can('create', 'Connection'); - - const connection = await context.currentUser - .$relatedQuery('connections') - .findOne({ - id: params.input.id, - }) - .throwIfNotFound(); - - if (!connection.formattedData) { - return null; - } - - const authInstance = ( - await import(`../../apps/${connection.key}/auth/index.js`) - ).default; - - const app = await App.findOneByKey(connection.key); - - const $ = await globalVariable({ connection, app }); - await authInstance.generateAuthUrl($); - - return connection.formattedData; -}; - -export default generateAuthUrl; diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql index d3b753d3..329803ef 100644 --- a/packages/backend/src/graphql/schema.graphql +++ b/packages/backend/src/graphql/schema.graphql @@ -1,23 +1,13 @@ type Query { placeholderQuery(name: String): Boolean } + type Mutation { - generateAuthUrl(input: GenerateAuthUrlInput): AuthLink resetConnection(input: ResetConnectionInput): Connection updateConnection(input: UpdateConnectionInput): Connection verifyConnection(input: VerifyConnectionInput): Connection } -""" -Exposes a URL that specifies the behaviour of this scalar. -""" -directive @specifiedBy( - """ - The URL that specifies the behaviour of this scalar. - """ - url: String! -) on SCALAR - type Trigger { name: String key: String @@ -130,10 +120,6 @@ type AuthenticationStepProperty { value: String } -type AuthLink { - url: String -} - type Connection { id: String key: String @@ -200,10 +186,6 @@ type SamlAuthProvidersRoleMapping { remoteRoleName: String } -input GenerateAuthUrlInput { - id: String! -} - input UpdateConnectionInput { id: String! formattedData: JSONObject diff --git a/packages/web/src/graphql/mutations/generate-auth-url.js b/packages/web/src/graphql/mutations/generate-auth-url.js deleted file mode 100644 index 44ce0431..00000000 --- a/packages/web/src/graphql/mutations/generate-auth-url.js +++ /dev/null @@ -1,8 +0,0 @@ -import { gql } from '@apollo/client'; -export const GENERATE_AUTH_URL = gql` - mutation generateAuthUrl($input: GenerateAuthUrlInput) { - generateAuthUrl(input: $input) { - url - } - } -`; diff --git a/packages/web/src/graphql/mutations/index.js b/packages/web/src/graphql/mutations/index.js index 07e46710..e00ad910 100644 --- a/packages/web/src/graphql/mutations/index.js +++ b/packages/web/src/graphql/mutations/index.js @@ -1,12 +1,11 @@ import { UPDATE_CONNECTION } from './update-connection'; import { VERIFY_CONNECTION } from './verify-connection'; import { RESET_CONNECTION } from './reset-connection'; -import { GENERATE_AUTH_URL } from './generate-auth-url'; const mutations = { updateConnection: UPDATE_CONNECTION, verifyConnection: VERIFY_CONNECTION, resetConnection: RESET_CONNECTION, - generateAuthUrl: GENERATE_AUTH_URL, }; + export default mutations;