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

chore: Make createAuthLink mutation more generic

Browse Source
This commit is contained in:
Faruk AYDIN
2021-10-24 20:06:16 +02:00
committed by Ali BARIN
parent 81d5e6d17c
commit 8e91f1f7ed
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/package.json
View File

@@ -21,8 +21,8 @@
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"express": "~4.16.1", "express": "~4.16.1",
"express-graphql": "^0.12.0", "express-graphql": "^0.12.0",
"flickr-sdk": "^3.10.0", "flickr-sdk": "3.10.0",
"googleapis": "^89.0.0", "googleapis": "89.0.0",
"graphql-type-json": "^0.3.2", "graphql-type-json": "^0.3.2",
"http-errors": "~1.6.3", "http-errors": "~1.6.3",
"knex": "^0.95.11", "knex": "^0.95.11",

5
packages/backend/src/apps/flickr/index.ts
View File

@@ -34,8 +34,9 @@ export default class Flickr {
const url = await this.oauthClient.authorizeUrl(oauthData.oauth_token, 'delete'); const url = await this.oauthClient.authorizeUrl(oauthData.oauth_token, 'delete');
return { return {
...oauthData, accessToken: oauthData.oauth_token,
url, accessSecret: oauthData.oauth_token_secret,
url: url,
}; };
} }

8
packages/backend/src/apps/twitter/index.ts
View File

@@ -23,7 +23,13 @@ export default class Twitter {
const appFields = this.appData.fields.find((field: Field) => field.key == 'oAuthRedirectUrl') const appFields = this.appData.fields.find((field: Field) => field.key == 'oAuthRedirectUrl')
const callbackUrl = appFields.value; const callbackUrl = appFields.value;
return this.client.generateAuthLink(callbackUrl); const authLink = await this.client.generateAuthLink(callbackUrl);
return {
url: authLink.url,
accessToken: authLink.oauth_token,
accessSecret: authLink.oauth_token_secret,
}
} }
async verifyCredentials() { async verifyCredentials() {

8
packages/backend/src/graphql/mutations/create-auth-link.ts
View File

@@ -18,16 +18,14 @@ const createAuthLinkResolver = async (params: Params, req: RequestWithCurrentUse
consumerKey: connection.data.consumerKey, consumerKey: connection.data.consumerKey,
consumerSecret: connection.data.consumerSecret consumerSecret: connection.data.consumerSecret
}); });
const authLink = await appInstance.createAuthLink(); const authLink = await appInstance.createAuthLink();
await connection.$query().patch({ await connection.$query().patch({
data: { data: {
...connection.data, ...connection.data,
url: authLink.url, ...authLink
accessToken: authLink.oauth_token, }
accessSecret: authLink.oauth_token_secret,
},
verified: authLink.oauth_callback_confirmed === 'true' ? true : false
}) })
return authLink; return authLink;

3
packages/backend/src/graphql/mutations/verify-connection.ts
View File

@@ -18,7 +18,8 @@ const verifyConnectionResolver = async (params: Params, req: RequestWithCurrentU
const verifiedCredentials = await appInstance.verifyCredentials(); const verifiedCredentials = await appInstance.verifyCredentials();
connection = await connection.$query().patchAndFetch({ connection = await connection.$query().patchAndFetch({
data: verifiedCredentials data: verifiedCredentials,
verified: true
}) })
return connection; return connection;

4
yarn.lock
View File

@@ -7530,7 +7530,7 @@ flatten@^1.0.2:
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
flickr-sdk@^3.10.0: flickr-sdk@3.10.0:
version "3.10.0" version "3.10.0"
resolved "https://registry.yarnpkg.com/flickr-sdk/-/flickr-sdk-3.10.0.tgz#87eb0221bc2a5380eacac328a0230a86555316d3" resolved "https://registry.yarnpkg.com/flickr-sdk/-/flickr-sdk-3.10.0.tgz#87eb0221bc2a5380eacac328a0230a86555316d3"
integrity sha512-JBGWFYTE5xvm6oG34IEQL0TX7FFLuWWFcWjlv2wVeB6Gj7VybVeoOXSvIX35hG1FVUbJTrVYBJRgpbjGf3cl3A== integrity sha512-JBGWFYTE5xvm6oG34IEQL0TX7FFLuWWFcWjlv2wVeB6Gj7VybVeoOXSvIX35hG1FVUbJTrVYBJRgpbjGf3cl3A==
@@ -8017,7 +8017,7 @@ googleapis-common@^5.0.2:
url-template "^2.0.8" url-template "^2.0.8"
uuid "^8.0.0" uuid "^8.0.0"
googleapis@^89.0.0: googleapis@89.0.0:
version "89.0.0" version "89.0.0"
resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-89.0.0.tgz#03de7b1467c066d48b989f6a8384857ef6971e69" resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-89.0.0.tgz#03de7b1467c066d48b989f6a8384857ef6971e69"
integrity sha512-eH91BN+6R/Mp5uulrhKWGwKAbibfDNOIu1Oq8n12aFTiqb23/A9kVdRhituYVqhRqSWLr/kv1dpFbd6n+uN+7Q== integrity sha512-eH91BN+6R/Mp5uulrhKWGwKAbibfDNOIu1Oq8n12aFTiqb23/A9kVdRhituYVqhRqSWLr/kv1dpFbd6n+uN+7Q==