diff --git a/packages/backend/src/graphql/mutation-resolvers.js b/packages/backend/src/graphql/mutation-resolvers.js index e02841fa..741bf98b 100644 --- a/packages/backend/src/graphql/mutation-resolvers.js +++ b/packages/backend/src/graphql/mutation-resolvers.js @@ -1,11 +1,14 @@ // Converted mutations import verifyConnection from './mutations/verify-connection.js'; import resetConnection from './mutations/reset-connection.js'; -import updateConnection from './mutations/update-connection.js'; const mutationResolvers = { resetConnection, +<<<<<<< HEAD updateConnection, +======= + updateCurrentUser, +>>>>>>> 82cde73e (chore: remove redundant update connection mutation) verifyConnection, }; diff --git a/packages/backend/src/graphql/mutations/update-connection.js b/packages/backend/src/graphql/mutations/update-connection.js deleted file mode 100644 index bc8cdc58..00000000 --- a/packages/backend/src/graphql/mutations/update-connection.js +++ /dev/null @@ -1,33 +0,0 @@ -import AppAuthClient from '../../models/app-auth-client.js'; - -const updateConnection = async (_parent, params, context) => { - context.currentUser.can('create', 'Connection'); - - let connection = await context.currentUser - .$relatedQuery('connections') - .findOne({ - id: params.input.id, - }) - .throwIfNotFound(); - - let formattedData = params.input.formattedData; - - if (params.input.appAuthClientId) { - const appAuthClient = await AppAuthClient.query() - .findById(params.input.appAuthClientId) - .throwIfNotFound(); - - formattedData = appAuthClient.formattedAuthDefaults; - } - - connection = await connection.$query().patchAndFetch({ - formattedData: { - ...connection.formattedData, - ...formattedData, - }, - }); - - return connection; -}; - -export default updateConnection; diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql index 329803ef..ce9655fb 100644 --- a/packages/backend/src/graphql/schema.graphql +++ b/packages/backend/src/graphql/schema.graphql @@ -4,7 +4,6 @@ type Query { type Mutation { resetConnection(input: ResetConnectionInput): Connection - updateConnection(input: UpdateConnectionInput): Connection verifyConnection(input: VerifyConnectionInput): Connection } @@ -186,12 +185,6 @@ type SamlAuthProvidersRoleMapping { remoteRoleName: String } -input UpdateConnectionInput { - id: String! - formattedData: JSONObject - appAuthClientId: String -} - input ResetConnectionInput { id: String! } diff --git a/packages/web/src/graphql/mutations/index.js b/packages/web/src/graphql/mutations/index.js index e00ad910..7cbc753a 100644 --- a/packages/web/src/graphql/mutations/index.js +++ b/packages/web/src/graphql/mutations/index.js @@ -1,9 +1,7 @@ -import { UPDATE_CONNECTION } from './update-connection'; import { VERIFY_CONNECTION } from './verify-connection'; import { RESET_CONNECTION } from './reset-connection'; const mutations = { - updateConnection: UPDATE_CONNECTION, verifyConnection: VERIFY_CONNECTION, resetConnection: RESET_CONNECTION, }; diff --git a/packages/web/src/graphql/mutations/update-connection.js b/packages/web/src/graphql/mutations/update-connection.js deleted file mode 100644 index 6b70cebe..00000000 --- a/packages/web/src/graphql/mutations/update-connection.js +++ /dev/null @@ -1,13 +0,0 @@ -import { gql } from '@apollo/client'; -export const UPDATE_CONNECTION = gql` - mutation UpdateConnection($input: UpdateConnectionInput) { - updateConnection(input: $input) { - id - key - verified - formattedData { - screenName - } - } - } -`;