From 2eeeeb00284b645a4afa49b095b996965d07f24a Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Sun, 24 Oct 2021 16:51:29 +0200 Subject: [PATCH] chore: Introduce GraphQLJSONObject type for credentials --- packages/backend/package.json | 1 + .../src/graphql/mutations/create-connection.ts | 4 ++-- .../src/graphql/mutations/update-connection.ts | 4 ++-- .../src/graphql/types/twitter-credential-input.ts | 12 ------------ .../backend/src/graphql/types/twitter-credential.ts | 11 ----------- .../web/src/graphql/mutations/create-connection.ts | 2 +- .../web/src/graphql/mutations/update-connection.ts | 2 +- yarn.lock | 5 +++++ 8 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 packages/backend/src/graphql/types/twitter-credential-input.ts delete mode 100644 packages/backend/src/graphql/types/twitter-credential.ts diff --git a/packages/backend/package.json b/packages/backend/package.json index c9292861..16f07efe 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -22,6 +22,7 @@ "express": "~4.16.1", "express-graphql": "^0.12.0", "flickr-sdk": "^3.10.0", + "graphql-type-json": "^0.3.2", "http-errors": "~1.6.3", "knex": "^0.95.11", "morgan": "^1.10.0", diff --git a/packages/backend/src/graphql/mutations/create-connection.ts b/packages/backend/src/graphql/mutations/create-connection.ts index c0e7ca0e..cc97ab62 100644 --- a/packages/backend/src/graphql/mutations/create-connection.ts +++ b/packages/backend/src/graphql/mutations/create-connection.ts @@ -2,8 +2,8 @@ import { GraphQLString, GraphQLNonNull } from 'graphql'; import Connection from '../../models/connection'; import App from '../../models/app'; import connectionType from '../types/connection'; -import twitterCredentialInputType from '../types/twitter-credential-input'; import RequestWithCurrentUser from '../../types/express/request-with-current-user'; +import { GraphQLJSONObject } from 'graphql-type-json'; type Params = { key: string, @@ -27,7 +27,7 @@ const createConnection = { type: connectionType, args: { key: { type: GraphQLNonNull(GraphQLString) }, - data: { type: GraphQLNonNull(twitterCredentialInputType) } + data: { type: GraphQLNonNull(GraphQLJSONObject) } }, resolve: (_: any, params: Params, req: RequestWithCurrentUser) => createConnectionResolver(params, req) }; diff --git a/packages/backend/src/graphql/mutations/update-connection.ts b/packages/backend/src/graphql/mutations/update-connection.ts index 2b0b7521..6b7a1063 100644 --- a/packages/backend/src/graphql/mutations/update-connection.ts +++ b/packages/backend/src/graphql/mutations/update-connection.ts @@ -1,7 +1,7 @@ import { GraphQLString, GraphQLNonNull } from 'graphql'; +import { GraphQLJSONObject } from 'graphql-type-json'; import Connection from '../../models/connection'; import connectionType from '../types/connection'; -import twitterCredentialInputType from '../types/twitter-credential-input'; import RequestWithCurrentUser from '../../types/express/request-with-current-user'; type Params = { @@ -28,7 +28,7 @@ const updateConnection = { type: connectionType, args: { id: { type: GraphQLNonNull(GraphQLString) }, - data: { type: GraphQLNonNull(twitterCredentialInputType) } + data: { type: GraphQLNonNull(GraphQLJSONObject) } }, resolve: (_: any, params: Params, req: RequestWithCurrentUser) => updateConnectionResolver(params, req) }; diff --git a/packages/backend/src/graphql/types/twitter-credential-input.ts b/packages/backend/src/graphql/types/twitter-credential-input.ts deleted file mode 100644 index 0a08efb2..00000000 --- a/packages/backend/src/graphql/types/twitter-credential-input.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { GraphQLString, GraphQLInputObjectType } from 'graphql'; - -const twitterCredentialInputType = new GraphQLInputObjectType({ - name: 'TwitterCredentialInput', - fields: { - consumerKey: { type: GraphQLString }, - consumerSecret: { type: GraphQLString }, - oauthVerifier: { type: GraphQLString }, - } -}) - -export default twitterCredentialInputType; diff --git a/packages/backend/src/graphql/types/twitter-credential.ts b/packages/backend/src/graphql/types/twitter-credential.ts deleted file mode 100644 index a54e91e8..00000000 --- a/packages/backend/src/graphql/types/twitter-credential.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { GraphQLString, GraphQLObjectType } from 'graphql'; - -const twitterCredentialInputType = new GraphQLObjectType({ - name: 'TwitterCredential', - fields: { - consumerKey: { type: GraphQLString }, - consumerSecret: { type: GraphQLString }, - } -}) - -export default twitterCredentialInputType; diff --git a/packages/web/src/graphql/mutations/create-connection.ts b/packages/web/src/graphql/mutations/create-connection.ts index fe856e10..ca35ad3c 100644 --- a/packages/web/src/graphql/mutations/create-connection.ts +++ b/packages/web/src/graphql/mutations/create-connection.ts @@ -1,7 +1,7 @@ import { gql } from '@apollo/client'; export const CREATE_CONNECTION = gql` - mutation CreateConnection($key: String!, $data: TwitterCredentialInput!) { + mutation CreateConnection($key: String!, $data: JSONObject!) { createConnection(key: $key, data: $data) { id key diff --git a/packages/web/src/graphql/mutations/update-connection.ts b/packages/web/src/graphql/mutations/update-connection.ts index 82e8e1f4..a2b617b7 100644 --- a/packages/web/src/graphql/mutations/update-connection.ts +++ b/packages/web/src/graphql/mutations/update-connection.ts @@ -1,7 +1,7 @@ import { gql } from '@apollo/client'; export const UPDATE_CONNECTION = gql` - mutation UpdateConnection($id: String!, $data: TwitterCredentialInput!) { + mutation UpdateConnection($id: String!, $data: JSONObject!) { updateConnection(id: $id, data: $data) { id key diff --git a/yarn.lock b/yarn.lock index 9f0ddb71..ab8d6173 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7959,6 +7959,11 @@ graphql-tag@^2.12.3: dependencies: tslib "^2.1.0" +graphql-type-json@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115" + integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg== + graphql@^15.6.0: version "15.6.1" resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.6.1.tgz#9125bdf057553525da251e19e96dab3d3855ddfc"