diff --git a/packages/backend/src/apps/discord/index.ts b/packages/backend/src/apps/discord/index.ts index d1d82006..e0cb2e3c 100644 --- a/packages/backend/src/apps/discord/index.ts +++ b/packages/backend/src/apps/discord/index.ts @@ -22,7 +22,7 @@ export default class Discord { return this.appData.fields.find((field: Field) => field.key == 'oAuthRedirectUrl').value; } - async createAuthLink() { + async createAuthData() { const searchParams = new URLSearchParams({ client_id: this.connectionData.consumerKey, redirect_uri: this.oauthRedirectUrl, diff --git a/packages/backend/src/apps/discord/info.json b/packages/backend/src/apps/discord/info.json index 2b21c824..e7d6ef61 100644 --- a/packages/backend/src/apps/discord/info.json +++ b/packages/backend/src/apps/discord/info.json @@ -71,7 +71,7 @@ { "step": 2, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -86,7 +86,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, @@ -163,7 +163,7 @@ { "step": 3, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -178,7 +178,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, diff --git a/packages/backend/src/apps/firebase/index.ts b/packages/backend/src/apps/firebase/index.ts index af62c3aa..88f6b385 100644 --- a/packages/backend/src/apps/firebase/index.ts +++ b/packages/backend/src/apps/firebase/index.ts @@ -31,7 +31,7 @@ export default class Firebase { return this.appData.fields.find((field: Field) => field.key == 'oAuthRedirectUrl').value; } - async createAuthLink() { + async createAuthData() { const url = this.oauthClient.generateAuthUrl({ access_type: 'offline', scope: this.scopes diff --git a/packages/backend/src/apps/firebase/info.json b/packages/backend/src/apps/firebase/info.json index 51800125..8e906d98 100644 --- a/packages/backend/src/apps/firebase/info.json +++ b/packages/backend/src/apps/firebase/info.json @@ -71,7 +71,7 @@ { "step": 2, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -86,7 +86,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, @@ -163,7 +163,7 @@ { "step": 3, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -178,7 +178,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, diff --git a/packages/backend/src/apps/flickr/index.ts b/packages/backend/src/apps/flickr/index.ts index f2617768..badc6522 100644 --- a/packages/backend/src/apps/flickr/index.ts +++ b/packages/backend/src/apps/flickr/index.ts @@ -26,7 +26,7 @@ export default class Flickr { this.appData = App.findOneByKey('flickr'); } - async createAuthLink() { + async createAuthData() { const appFields = this.appData.fields.find((field: Field) => field.key == 'oAuthRedirectUrl') const callbackUrl = appFields.value; diff --git a/packages/backend/src/apps/flickr/info.json b/packages/backend/src/apps/flickr/info.json index 3dcac7e7..d93c5f13 100644 --- a/packages/backend/src/apps/flickr/info.json +++ b/packages/backend/src/apps/flickr/info.json @@ -71,7 +71,7 @@ { "step": 2, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -86,7 +86,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, @@ -163,7 +163,7 @@ { "step": 3, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -178,7 +178,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, diff --git a/packages/backend/src/apps/twitch/index.ts b/packages/backend/src/apps/twitch/index.ts index 168df065..8c75c1dd 100644 --- a/packages/backend/src/apps/twitch/index.ts +++ b/packages/backend/src/apps/twitch/index.ts @@ -36,7 +36,7 @@ export default class Twitch { return this.appData.fields.find((field: Field) => field.key == 'oAuthRedirectUrl').value; } - async createAuthLink() { + async createAuthData() { const { url } = await fetchUtil('https://id.twitch.tv/oauth2/authorize', { search: { client_id: this.connectionData.consumerKey, diff --git a/packages/backend/src/apps/twitch/info.json b/packages/backend/src/apps/twitch/info.json index 0f4853fa..1e91c0c7 100644 --- a/packages/backend/src/apps/twitch/info.json +++ b/packages/backend/src/apps/twitch/info.json @@ -71,7 +71,7 @@ { "step": 2, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -86,7 +86,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, @@ -163,7 +163,7 @@ { "step": 3, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -178,7 +178,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, diff --git a/packages/backend/src/apps/twitter/index.ts b/packages/backend/src/apps/twitter/index.ts index 3e8692bf..9416dc28 100644 --- a/packages/backend/src/apps/twitter/index.ts +++ b/packages/backend/src/apps/twitter/index.ts @@ -19,7 +19,7 @@ export default class Twitter { this.appData = App.findOneByKey('twitter'); } - async createAuthLink() { + async createAuthData() { const appFields = this.appData.fields.find((field: Field) => field.key == 'oAuthRedirectUrl') const callbackUrl = appFields.value; diff --git a/packages/backend/src/apps/twitter/info.json b/packages/backend/src/apps/twitter/info.json index 0629db15..7f74c36f 100644 --- a/packages/backend/src/apps/twitter/info.json +++ b/packages/backend/src/apps/twitter/info.json @@ -71,7 +71,7 @@ { "step": 2, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -86,7 +86,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, @@ -163,7 +163,7 @@ { "step": 3, "type": "mutation", - "name": "createAuthLink", + "name": "createAuthData", "fields": [ { "name": "id", @@ -178,7 +178,7 @@ "fields": [ { "name": "url", - "value": "{createAuthLink.url}" + "value": "{createAuthData.url}" } ] }, diff --git a/packages/backend/src/graphql/mutations/create-auth-link.ts b/packages/backend/src/graphql/mutations/create-auth-data.ts similarity index 80% rename from packages/backend/src/graphql/mutations/create-auth-link.ts rename to packages/backend/src/graphql/mutations/create-auth-data.ts index ff2ee6be..ccf7ed99 100644 --- a/packages/backend/src/graphql/mutations/create-auth-link.ts +++ b/packages/backend/src/graphql/mutations/create-auth-data.ts @@ -6,7 +6,7 @@ import RequestWithCurrentUser from '../../types/express/request-with-current-use type Params = { id: number, } -const createAuthLinkResolver = async (params: Params, req: RequestWithCurrentUser) => { +const createAuthDataResolver = async (params: Params, req: RequestWithCurrentUser) => { const connection = await Connection.query().findOne({ user_id: req.currentUser.id, id: params.id @@ -19,7 +19,7 @@ const createAuthLinkResolver = async (params: Params, req: RequestWithCurrentUse consumerSecret: connection.data.consumerSecret }); - const authLink = await appInstance.createAuthLink(); + const authLink = await appInstance.createAuthData(); await connection.$query().patch({ data: { @@ -31,12 +31,12 @@ const createAuthLinkResolver = async (params: Params, req: RequestWithCurrentUse return authLink; } -const createAuthLink = { +const createAuthData = { type: authLinkType, args: { id: { type: GraphQLNonNull(GraphQLString) }, }, - resolve: (_: any, params: Params, req: RequestWithCurrentUser) => createAuthLinkResolver(params, req) + resolve: (_: any, params: Params, req: RequestWithCurrentUser) => createAuthDataResolver(params, req) }; -export default createAuthLink; +export default createAuthData; diff --git a/packages/backend/src/graphql/root-mutation.ts b/packages/backend/src/graphql/root-mutation.ts index 68d0c5b0..34892723 100644 --- a/packages/backend/src/graphql/root-mutation.ts +++ b/packages/backend/src/graphql/root-mutation.ts @@ -1,6 +1,6 @@ import { GraphQLObjectType } from 'graphql'; import createConnection from './mutations/create-connection'; -import createAuthLink from './mutations/create-auth-link'; +import createAuthData from './mutations/create-auth-data'; import updateConnection from './mutations/update-connection'; import resetConnection from './mutations/reset-connection'; import verifyConnection from './mutations/verify-connection'; @@ -10,7 +10,7 @@ const rootMutation = new GraphQLObjectType({ name: 'Mutation', fields: { createConnection, - createAuthLink, + createAuthData, updateConnection, resetConnection, verifyConnection, diff --git a/packages/web/src/graphql/mutations/create-auth-data.ts b/packages/web/src/graphql/mutations/create-auth-data.ts new file mode 100644 index 00000000..d7f03d59 --- /dev/null +++ b/packages/web/src/graphql/mutations/create-auth-data.ts @@ -0,0 +1,9 @@ +import { gql } from '@apollo/client'; + +export const CREATE_AUTH_DATA = gql` + mutation createAuthData($id: String!) { + createAuthData(id: $id) { + url + } + } +`; diff --git a/packages/web/src/graphql/mutations/create-auth-link.ts b/packages/web/src/graphql/mutations/create-auth-link.ts deleted file mode 100644 index 13599185..00000000 --- a/packages/web/src/graphql/mutations/create-auth-link.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { gql } from '@apollo/client'; - -export const CREATE_AUTH_LINK = gql` - mutation CreateAuthLink($id: String!) { - createAuthLink(id: $id) { - url - } - } -`; diff --git a/packages/web/src/graphql/mutations/index.ts b/packages/web/src/graphql/mutations/index.ts index b1323191..d797935a 100644 --- a/packages/web/src/graphql/mutations/index.ts +++ b/packages/web/src/graphql/mutations/index.ts @@ -3,7 +3,7 @@ import { UPDATE_CONNECTION } from './update-connection'; import { VERIFY_CONNECTION } from './verify-connection'; import { RESET_CONNECTION } from './reset-connection'; import { DELETE_CONNECTION } from './delete-connection'; -import { CREATE_AUTH_LINK } from './create-auth-link'; +import { CREATE_AUTH_DATA } from './create-auth-data'; type Mutations = { [key: string]: any, @@ -15,7 +15,7 @@ const mutations: Mutations = { verifyConnection: VERIFY_CONNECTION, resetConnection: RESET_CONNECTION, deleteConnection: DELETE_CONNECTION, - createAuthLink: CREATE_AUTH_LINK, + createAuthData: CREATE_AUTH_DATA, }; export default mutations;