From 20c38318ac4ec6d43e091440d38fe919126e9022 Mon Sep 17 00:00:00 2001
From: Mrsandeep27 <sandeeppandey70391@gmail.com>
Date: Mon, 20 Apr 2026 00:01:05 +0530
Subject: [PATCH] fix(datasource): move expiresIn field right after scope in
 OAuth2 form

Relocates the 'Authorization expires in (seconds)' input in the
Authorization Code OAuth2 datasource form so it renders immediately after
the shared OAuth2 common fields (which ends with Scope), grouping all
authentication-related inputs together and improving discoverability.

Closes #31059

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../RestAPIDatasourceForm.tsx                 | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
index 341cf1dc5814..a0d506bb8dd3 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
@@ -834,6 +834,16 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
     return (
       <>
         {this.renderOauth2Common()}
+        <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.authorizationUrl")}
         >
@@ -870,16 +880,6 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
             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>
 
         {!_.get(formData.authentication, "isAuthorizationHeader", true) &&
           this.renderOauth2CommonAdvanced()}