Skip to content

fix: inclusion of authorization error for Google sheets #6674

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.

Sign up for GitHub

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

Merged
ohansFavour merged 4 commits into from
Aug 25, 2021
Merged

fix: inclusion of authorization error for Google sheets #6674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fac980
Added authorization status to datasource form
ohansFavour Aug 17, 2021
0ea72ac
Added auth message to form
ohansFavour Aug 18, 2021
09e2571
handle unauthenticated and unauthorized state in Gsheet datasource
ohansFavour Aug 23, 2021
18b2201
show authorization state on Gsheet datasource viewMode
ohansFavour Aug 23, 2021
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
1 change: 0 additions & 1 deletion app/client/cypress/fixtures/saveAction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
}
],
"authentication": {
"authenticationType": "dbAuth",
"authenticationType": "dbAuth",
"authType": "SCRAM_SHA_1",
"username": "cypress-test",
Expand Down
1 change: 1 addition & 0 deletions app/client/src/entities/Datasource/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export interface DatasourceAuthentication {
value?: string;
addTo?: string;
bearerToken?: string;
authenticationStatus?: string;
}

export interface DatasourceColumns {
Expand Down
34 changes: 32 additions & 2 deletions app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ type DatasourceSaaSEditorProps = StateProps &
type Props = DatasourceSaaSEditorProps &
InjectedFormProps<Datasource, DatasourceSaaSEditorProps>;

enum AuthenticationStatus {
NONE = "NONE",
IN_PROGRESS = "IN_PROGRESS",
SUCCESS = "SUCCESS",
}

const StyledButton = styled(Button)`
&&&& {
width: 180px;
Expand All @@ -91,6 +97,15 @@ const EditDatasourceButton = styled(AdsButton)`
}
`;

const StyledAuthMessage = styled.div`
color: ${(props) => props.theme.colors.error};
margin-top: 15px;
&:after {
content: " *";
color: inherit;
}
`;

class DatasourceSaaSEditor extends JSONtoForm<Props> {
componentDidMount() {
super.componentDidMount();
Expand Down Expand Up @@ -131,6 +146,7 @@ class DatasourceSaaSEditor extends JSONtoForm<Props> {

renderDataSourceConfigForm = (sections: any) => {
const {
datasource,
deleteDatasource,
isDeleting,
isSaving,
Expand All @@ -141,6 +157,10 @@ class DatasourceSaaSEditor extends JSONtoForm<Props> {

const params: string = location.search;
const viewMode = new URLSearchParams(params).get("viewMode");
const isAuthorized =
datasource?.datasourceConfiguration.authentication
?.authenticationStatus === AuthenticationStatus.SUCCESS;

return (
<form
onSubmit={(e) => {
Expand All @@ -152,6 +172,7 @@ class DatasourceSaaSEditor extends JSONtoForm<Props> {
<PluginImage alt="Datasource" src={this.props.pluginImage} />
<FormTitle focusOnMount={this.props.isNewDatasource} />
</FormTitleContainer>

{viewMode && (
<EditDatasourceButton
category={Category.tertiary}
Expand All @@ -178,6 +199,9 @@ class DatasourceSaaSEditor extends JSONtoForm<Props> {
{!_.isNil(sections)
? _.map(sections, this.renderMainSection)
: null}
{!isAuthorized && (
<StyledAuthMessage>Datasource not authorized</StyledAuthMessage>
)}
<SaveButtonContainer>
<ActionButton
accent="error"
Expand All @@ -194,6 +218,7 @@ class DatasourceSaaSEditor extends JSONtoForm<Props> {
}
text="Delete"
/>

<StyledButton
className="t--save-datasource"
disabled={this.validate()}
Expand All @@ -215,12 +240,17 @@ class DatasourceSaaSEditor extends JSONtoForm<Props> {
);
}}
size="small"
text="Continue"
text={isAuthorized ? "Re-authorize" : "Authorize"}
/>
</SaveButtonContainer>
</>
) : (
<Connected />
<>
<Connected />
{!isAuthorized && (
<StyledAuthMessage>Datasource not authorized</StyledAuthMessage>
)}
</>
)}
</form>
);
Expand Down