admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Oauth1 support and Twitter node

Browse Source
This commit is contained in:
ricardo
2020-06-01 20:42:38 -04:00
parent f1f09d4a03
commit af3d799e5c
26 changed files with 822 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/editor-ui/src/components/CredentialsInput.vue
View File

@@ -47,13 +47,13 @@
Not all required credential properties are filled
</span>
<span v-else-if="isOAuthConnected === true">
<el-button title="Reconnect OAuth Credentials" @click.stop="oAuth2CredentialAuthorize()" circle>
<el-button title="Reconnect OAuth Credentials" @click.stop="oAuthCredentialAuthorize()" circle>
<font-awesome-icon icon="redo" />
</el-button>
Is connected
</span>
<span v-else>
<el-button title="Connect OAuth Credentials" @click.stop="oAuth2CredentialAuthorize()" circle>
<el-button title="Connect OAuth Credentials" @click.stop="oAuthCredentialAuthorize()" circle>
<font-awesome-icon icon="sign-in-alt" />
</el-button>
Is NOT connected
@@ -222,8 +222,11 @@ export default mixins(
if (this.credentialTypeData.name === 'oAuth2Api') {
return true;
}
if (this.credentialTypeData.name === 'oAuth1Api') {
return true;
}
const types = this.parentTypes(this.credentialTypeData.name);
return types.includes('oAuth2Api');
return types.includes('oAuth2Api') || types.includes('oAuth1Api');
},
isOAuthConnected (): boolean {
if (this.isOAuthType === false) {
@@ -233,7 +236,9 @@ export default mixins(
return this.credentialDataDynamic !== null && !!this.credentialDataDynamic.data!.oauthTokenData;
},
oAuthCallbackUrl (): string {
return this.$store.getters.getWebhookBaseUrl + 'rest/oauth2-credential/callback';
const types = this.parentTypes(this.credentialTypeData.name);
const oauthType = (this.credentialTypeData.name === 'oAuth2Api' || types.includes('oAuth2Api')) ? 'oauth2' : 'oauth1';
return this.$store.getters.getWebhookBaseUrl + `rest/${oauthType}-credential/callback`;
},
requiredPropertiesFilled (): boolean {
for (const property of this.credentialProperties) {
@@ -323,7 +328,7 @@ export default mixins(
return result;
},
async oAuth2CredentialAuthorize () {
async oAuthCredentialAuthorize () {
let url;
let credentialData = this.credentialDataDynamic;
@@ -350,8 +355,14 @@ export default mixins(
}
}
const types = this.parentTypes(this.credentialTypeData.name);
try {
url = await this.restApi().oAuth2CredentialAuthorize(credentialData as ICredentialsResponse) as string;
if (this.credentialTypeData.name === 'oAuth2Api' || types.includes('oAuth2Api')) {
url = await this.restApi().oAuth2CredentialAuthorize(credentialData as ICredentialsResponse) as string;
} else if (this.credentialTypeData.name === 'oAuth1Api' || types.includes('oAuth1Api')) {
url = await this.restApi().oAuth1CredentialAuthorize(credentialData as ICredentialsResponse) as string;
}
} catch (error) {
this.$showError(error, 'OAuth Authorization Error', 'Error generating authorization URL:');
return;