🎉 Source Google Sheets: Support connecting via oAuth webflow #6354
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,18 +4,81 @@ | |
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "title": "Stripe Source Spec", | ||
| "type": "object", | ||
| "required": ["spreadsheet_id"], | ||
|
There was a problem hiding this comment. Is "credentials" not required? There was a problem hiding this comment. the idea is to have a backward compatibility with the old-style config, and credentials are still required for auth through the UI |
||
| "additionalProperties": true, | ||
| "properties": { | ||
| "spreadsheet_id": { | ||
| "type": "string", | ||
| "description": "The ID of the spreadsheet to be replicated." | ||
| }, | ||
| "credentials": { | ||
| "type": "object", | ||
| "oneOf": [ | ||
| { | ||
| "title": "Authenticate via Google (Oauth)", | ||
| "type": "object", | ||
| "required": [ | ||
| "auth_type", | ||
| "client_id", | ||
| "client_secret", | ||
| "refresh_token" | ||
| ], | ||
| "properties": { | ||
| "auth_type": { | ||
|
There was a problem hiding this comment. I think, auth_type shouldn't be part of specification. It should be recognized in code. There was a problem hiding this comment. @vitaliizazmic this practice is used in the others connectors, could you point to some code with a new approach? |
||
| "type": "string", | ||
| "const": "Client" | ||
| }, | ||
| "client_id": { | ||
| "title": "Client ID", | ||
| "type": "string", | ||
| "description": "The Client ID of your developer application", | ||
| "airbyte_secret": true | ||
| }, | ||
| "client_secret": { | ||
| "title": "Client Secret", | ||
| "type": "string", | ||
| "description": "The client secret of your developer application", | ||
| "airbyte_secret": true | ||
| }, | ||
| "refresh_token": { | ||
| "title": "Refresh Token", | ||
| "type": "string", | ||
| "description": "A refresh token generated using the above client ID and secret", | ||
| "airbyte_secret": true | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "title": "Service Account Key Authentication", | ||
| "type": "object", | ||
| "required": ["auth_type", "service_account_info"], | ||
| "properties": { | ||
| "auth_type": { | ||
| "type": "string", | ||
| "const": "Service" | ||
| }, | ||
| "service_account_info": { | ||
| "type": "string", | ||
| "description": "The JSON key of the service account to use for authorization", | ||
| "examples": [ | ||
| "{ \"type\": \"service_account\", \"project_id\": YOUR_PROJECT_ID, \"private_key_id\": YOUR_PRIVATE_KEY, ... }" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "authSpecification": { | ||
|
|
||
| "auth_type": "oauth2.0", | ||
| "oauth2Specification": { | ||
| "rootObject": ["credentials", 0], | ||
| "oauthFlowInitParameters": [ | ||
| ["client_id"], | ||
| ["client_secret"], | ||
| ["refresh_token"] | ||
| ] | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| { | ||
| "spreadsheet_id": "invalid_spreadsheet_id", | ||
| "credentials": { | ||
| "auth_type": "Client", | ||
| "client_id": "invalid_id", | ||
| "client_secret": "invalid_secret", | ||
| "refresh_token": "invalid_token" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| { | ||
| "spreadsheet_id": "random_id", | ||
| "credentials": { | ||
| "auth_type": "Client", | ||
| "client_id": "CLIENT_ID", | ||
| "client_secret": "CLIENT_SECRET", | ||
| "refresh_token": "CLIENT_REFRESH_TOKEN" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I might be wrong, but what will happen here if the first comparison fail?
so the
auth_typeis already removed, would it always return None?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, I read it as a two
pops, but nevertheless can't we popauth_typefirst and then do if/else logic?