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.

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

fix: Moved expires_in field after scope in OAuth2 DatasourceForm #31059 #31863

Closed
wants to merge 8 commits into from
Closed

fix: Moved expires_in field after scope in OAuth2 DatasourceForm #31059 #31863

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b7584a2
task: #31059 Move expires_in field after scope while configuring oaut…
theAravinthM Mar 17, 2024
5f3ef02
Merge branch 'appsmithorg:release' into fix/Move-expires_in-field-aft…
theAravinthM Mar 18, 2024
3b6686e
Refactored RestAPIDatasourceForm.tsx
theAravinthM Mar 18, 2024
81d438e
Merge branch 'appsmithorg:release' into fix/Move-expires_in-field-aft…
theAravinthM Apr 1, 2024
394b66e
Merge branch 'appsmithorg:release' into fix/Move-expires_in-field-aft…
theAravinthM Apr 1, 2024
63509d7
fix: Updated RestAPIDatasourceForm.tsx
theAravinthM Apr 1, 2024
d2e65fc
fix: Formatted the Code using Prettier Formatter
theAravinthM Apr 1, 2024
61c2bc9
Merge branch 'appsmithorg:release' into fix/Move-expires_in-field-aft…
theAravinthM Apr 8, 2024
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
Prev Previous commit
Next Next commit
Refactored RestAPIDatasourceForm.tsx
  • Loading branch information
@theAravinthM
theAravinthM authored Mar 18, 2024
commit 3b6686e0413490218ef62c04bbda4534f1d7f114
156 changes: 26 additions & 130 deletions app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,12 @@ class DatasourceRestAPIEditor extends React.Component<Props> {

renderOauth2Common = () => {
const { formData } = this.props;
const isGrantTypeAuthorizationCode =
_.get(formData.authentication, "grantType") === GrantType.AuthorizationCode;

return (
<>
<FormInputContainer
data-location-id={btoa("authentication.isTokenHeader")}
>
<FormInputContainer data-location-id={btoa("authentication.isTokenHeader")}>
{this.renderDropdownControlViaFormControl(
"authentication.isTokenHeader",
[
Expand All @@ -599,9 +600,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
)}
</FormInputContainer>
{_.get(formData.authentication, "isTokenHeader") && (
<FormInputContainer
data-location-id={btoa("authentication.headerPrefix")}
>
<FormInputContainer data-location-id={btoa("authentication.headerPrefix")}>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.headerPrefix",
label: "Header prefix",
Expand All @@ -612,9 +611,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
})}
</FormInputContainer>
)}
<FormInputContainer
data-location-id={btoa("authentication.accessTokenUrl")}
>
<FormInputContainer data-location-id={btoa("authentication.accessTokenUrl")}>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.accessTokenUrl",
label: "Access token URL",
Expand All @@ -635,9 +632,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
isRequired: false,
})}
</FormInputContainer>
<FormInputContainer
data-location-id={btoa("authentication.clientSecret")}
>
<FormInputContainer data-location-id={btoa("authentication.clientSecret")}>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.clientSecret",
label: "Client secret",
Expand All @@ -648,9 +643,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
isSecretExistsPath: "authentication.secretExists.clientSecret",
})}
</FormInputContainer>
<FormInputContainer
data-location-id={btoa("authentication.scopeString")}
>
<FormInputContainer data-location-id={btoa("authentication.scopeString")}>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.scopeString",
label: "Scope(s)",
Expand All @@ -660,9 +653,11 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
isRequired: false,
})}
</FormInputContainer>
<FormInputContainer
data-location-id={btoa("authentication.isAuthorizationHeader")}
>
{/* Moved the expires_in field here right after scopeString field
so that users can find it together */}
{ isGrantTypeAuthorizationCode && this.renderOauth2ExpiresInSeconds }

<FormInputContainer data-location-id={btoa("authentication.isAuthorizationHeader")}>
{this.renderDropdownControlViaFormControl(
"authentication.isAuthorizationHeader",
[
Expand Down Expand Up @@ -800,119 +795,18 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
);
};

renderOauth2CommonForAuthorizationCode = () => {
const { formData } = this.props;
renderOauth2ExpiresInSeconds = () => {
return (
<>
<FormInputContainer
data-location-id={btoa("authentication.isTokenHeader")}
>
{this.renderDropdownControlViaFormControl(
"authentication.isTokenHeader",
[
{
label: "Request Header",
value: true,
},
{
label: "Request URL",
value: false,
},
],
"Add Access Token To",
"",
false,
"",
!!_.get(formData.authentication, "isTokenHeader"),
)}
</FormInputContainer>
{_.get(formData.authentication, "isTokenHeader") && (
<FormInputContainer
data-location-id={btoa("authentication.headerPrefix")}
>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.headerPrefix",
label: "Header prefix",
placeholderText: "eg: Bearer ",
dataType: "TEXT",
encrypted: false,
isRequired: false,
})}
</FormInputContainer>
)}
<FormInputContainer
data-location-id={btoa("authentication.accessTokenUrl")}
>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.accessTokenUrl",
label: "Access token URL",
placeholderText: "https://example.com/login/oauth/access_token",
dataType: "TEXT",
encrypted: false,
isRequired: false,
fieldValidator: this.urlValidator,
})}
</FormInputContainer>
<FormInputContainer data-location-id={btoa("authentication.clientId")}>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.clientId",
label: "Client ID",
placeholderText: "Client ID",
dataType: "TEXT",
encrypted: false,
isRequired: false,
})}
</FormInputContainer>
<FormInputContainer data-location-id={btoa("authentication.clientSecret")}>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.clientSecret",
label: "Client secret",
placeholderText: "Client secret",
dataType: "PASSWORD",
encrypted: true,
isRequired: false,
isSecretExistsPath: "authentication.secretExists.clientSecret",
})}
</FormInputContainer>
<FormInputContainer data-location-id={btoa("authentication.scopeString")}>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.scopeString",
label: "Scope(s)",
placeholderText: "e.g. read, write",
dataType: "TEXT",
encrypted: false,
isRequired: false,
})}
</FormInputContainer>
<FormInputContainer data-location-id={btoa("authentication.expiresIn")}>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.expiresIn",
label: "Authorization expires in (seconds)",
placeholderText: "3600",
dataType: "NUMBER",
encrypted: false,
isRequired: false,
})}
</FormInputContainer>
<FormInputContainer data-location-id={btoa("authentication.isAuthorizationHeader")}>
{this.renderDropdownControlViaFormControl(
"authentication.isAuthorizationHeader",
[
{
label: "Send as Basic Auth header",
value: true,
},
{
label: "Send client credentials in body",
value: false,
},
],
"Client Authentication",
"",
false,
"",
!!_.get(formData.authentication, "isAuthorizationHeader"),
)}
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.expiresIn",
label: "Authorization expires in (seconds)",
placeholderText: "3600",
dataType: "NUMBER",
encrypted: false,
isRequired: false,
})}
</FormInputContainer>
</>
);
Expand All @@ -925,8 +819,10 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
window.location.origin + "/api/v1/datasources/authorize";
return (
<>
{this.renderOauth2CommonForAuthorizationCode()}
<FormInputContainer data-location-id={btoa("authentication.authorizationUrl")}>
{this.renderOauth2Common()}
<FormInputContainer
data-location-id={btoa("authentication.authorizationUrl")}
>
{this.renderInputTextControlViaFormControl({
configProperty: "authentication.authorizationUrl",
label: "Authorization URL",
Expand Down
Loading