Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: HighLevel oauth2 api credentials #9542

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ export class OAuth2CredentialController extends AbstractOAuthController {
// At some point in the past we saved hidden scopes to credentials (but shouldn't)
// Delete scope before applying defaults to make sure new scopes are present on reconnect
// Generic Oauth2 API is an exception because it needs to save the scope
const genericOAuth2 = ['oAuth2Api', 'googleOAuth2Api', 'microsoftOAuth2Api'];
const genericOAuth2 = [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this change necessary? is it to prevent the delete decryptedDataOriginal.scope call?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have bug with Scopes property in OAuth2 as it not possible to set value there, scopes are always empty in authorization url, I will create ticket for that

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in that case we should leave a comment in the code linking to the ticket, to make sure that anyone looking at this code isn't confused about why one particular service's oauth credential type is being included in the generic type list.

'oAuth2Api',
'googleOAuth2Api',
'microsoftOAuth2Api',
'highLevelOAuth2Api',
];
if (
decryptedDataOriginal?.scope &&
credential.type.includes('OAuth2') &&
Expand Down
65 changes: 65 additions & 0 deletions packages/nodes-base/credentials/HighLevelOAuth2Api.credentials.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import type { ICredentialType, INodeProperties } from 'n8n-workflow';

export class HighLevelOAuth2Api implements ICredentialType {
name = 'highLevelOAuth2Api';

extends = ['oAuth2Api'];

displayName = 'HighLevel OAuth2 API';

documentationUrl = 'highLevel';

icon = 'file:icons/highLevel.svg';

properties: INodeProperties[] = [
{
displayName: 'Grant Type',
name: 'grantType',
type: 'hidden',
default: 'authorizationCode',
},
{
displayName: 'Authorization URL',
name: 'authUrl',
type: 'options',
default: 'https://marketplace.leadconnectorhq.com/oauth/chooselocation',
required: true,
options: [
{
name: 'White-Label',
value: 'https://marketplace.leadconnectorhq.com/oauth/chooselocation',
},
{
name: 'Standard',
value: 'https://marketplace.gohighlevel.com/oauth/chooselocation',
},
],
},
{
displayName: 'Scope',
name: 'scope',
type: 'string',
hint: 'Separate scopes by space',
default: '',
required: true,
},
{
displayName: 'Access Token URL',
name: 'accessTokenUrl',
type: 'hidden',
default: 'https://services.leadconnectorhq.com/oauth/token',
},
{
displayName: 'Auth URI Query Parameters',
name: 'authQueryParameters',
type: 'hidden',
default: '',
},
{
displayName: 'Authentication',
name: 'authentication',
type: 'hidden',
default: 'body',
},
];
}
1 change: 1 addition & 0 deletions packages/nodes-base/credentials/icons/highLevel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/nodes-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
"dist/credentials/HarvestOAuth2Api.credentials.js",
"dist/credentials/HelpScoutOAuth2Api.credentials.js",
"dist/credentials/HighLevelApi.credentials.js",
"dist/credentials/HighLevelOAuth2Api.credentials.js",
"dist/credentials/HomeAssistantApi.credentials.js",
"dist/credentials/HttpBasicAuth.credentials.js",
"dist/credentials/HttpDigestAuth.credentials.js",
Expand Down
Loading