From 21a2a2bdf4db91923729867cfdd5e5040a10058d Mon Sep 17 00:00:00 2001
From: Piyush <piyush@codeitout.com>
Date: Fri, 26 Feb 2021 12:28:47 +0530
Subject: [PATCH] Redirect URL for oAuth Auth code flow (#3232)

---
 .../src/components/ads/CopyToClipBoard.tsx    | 60 +++++++++++++++++++
 .../appsmith/CopyToClipBoard.tsx              | 23 +++----
 .../formControls/DropDownControl.tsx          | 18 +++++-
 .../formControls/InputTextControl.tsx         | 32 ++++++++--
 .../RestAPIDatasourceForm.tsx                 | 24 +++++++-
 .../pages/organization/AppInviteUsersForm.tsx |  2 +-
 6 files changed, 140 insertions(+), 19 deletions(-)
 create mode 100644 app/client/src/components/ads/CopyToClipBoard.tsx

diff --git a/app/client/src/components/ads/CopyToClipBoard.tsx b/app/client/src/components/ads/CopyToClipBoard.tsx
new file mode 100644
index 0000000000..e6ff4633a3
--- /dev/null
+++ b/app/client/src/components/ads/CopyToClipBoard.tsx
@@ -0,0 +1,60 @@
+import React, { createRef, useState } from "react";
+import styled from "styled-components";
+import copy from "copy-to-clipboard";
+import TextInput from "components/ads/TextInput";
+import Button, { Category, Size } from "components/ads/Button";
+
+const Wrapper = styled.div`
+  display: flex;
+
+  div {
+    flex-basis: calc(100% - 110px);
+  }
+  a {
+    flex-basis: 110px;
+  }
+`;
+
+const CopyToClipboard = (props: any) => {
+  const { copyText } = props;
+  const copyURLInput = createRef<HTMLInputElement>();
+  const [isCopied, setIsCopied] = useState(false);
+
+  const copyToClipboard = (url: string) => {
+    copy(url);
+    setIsCopied(true);
+    setTimeout(() => {
+      setIsCopied(false);
+    }, 3000);
+  };
+
+  const selectText = () => {
+    if (copyURLInput.current) {
+      copyURLInput.current.setSelectionRange(0, copyText.length);
+    }
+  };
+  return (
+    <Wrapper>
+      <TextInput
+        fill
+        ref={copyURLInput}
+        readOnly
+        onChange={() => {
+          selectText();
+        }}
+        defaultValue={copyText}
+      />
+
+      <Button
+        text={isCopied ? "Copied" : "Copy"}
+        category={Category.tertiary}
+        onClick={() => {
+          copyToClipboard(copyText);
+        }}
+        size={Size.large}
+      />
+    </Wrapper>
+  );
+};
+
+export default CopyToClipboard;
diff --git a/app/client/src/components/designSystems/appsmith/CopyToClipBoard.tsx b/app/client/src/components/designSystems/appsmith/CopyToClipBoard.tsx
index e6ff4633a3..cbcf6cda22 100644
--- a/app/client/src/components/designSystems/appsmith/CopyToClipBoard.tsx
+++ b/app/client/src/components/designSystems/appsmith/CopyToClipBoard.tsx
@@ -1,17 +1,21 @@
 import React, { createRef, useState } from "react";
 import styled from "styled-components";
 import copy from "copy-to-clipboard";
-import TextInput from "components/ads/TextInput";
-import Button, { Category, Size } from "components/ads/Button";
+import { BaseTextInput } from "components/designSystems/appsmith/TextInputComponent";
+import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
 
 const Wrapper = styled.div`
   display: flex;
 
   div {
-    flex-basis: calc(100% - 110px);
+    flex-basis: calc(100% - 90px);
   }
-  a {
-    flex-basis: 110px;
+  input:disabled {
+    color: #555;
+  }
+  button {
+    flex-basis: 80px;
+    margin-left: 10px;
   }
 `;
 
@@ -35,23 +39,20 @@ const CopyToClipboard = (props: any) => {
   };
   return (
     <Wrapper>
-      <TextInput
+      <BaseTextInput
         fill
-        ref={copyURLInput}
-        readOnly
+        disabled={true}
         onChange={() => {
           selectText();
         }}
         defaultValue={copyText}
       />
 
-      <Button
+      <BaseButton
         text={isCopied ? "Copied" : "Copy"}
-        category={Category.tertiary}
         onClick={() => {
           copyToClipboard(copyText);
         }}
-        size={Size.large}
       />
     </Wrapper>
   );
diff --git a/app/client/src/components/formControls/DropDownControl.tsx b/app/client/src/components/formControls/DropDownControl.tsx
index 318759b5f2..cb2289b500 100644
--- a/app/client/src/components/formControls/DropDownControl.tsx
+++ b/app/client/src/components/formControls/DropDownControl.tsx
@@ -8,12 +8,21 @@ import { DropdownOption } from "widgets/DropdownWidget";
 import { ControlType } from "constants/PropertyControlConstants";
 import { theme } from "constants/DefaultTheme";
 import FormLabel from "components/editorComponents/FormLabel";
+import { Colors } from "constants/Colors";
 
 const DropdownSelect = styled.div`
   font-size: 14px;
   width: 50vh;
 `;
 
+const StyledInfo = styled.span`
+  font-weight: normal;
+  line-height: normal;
+  color: ${Colors.DOVE_GRAY};
+  font-size: 12px;
+  margin-left: 1px;
+`;
+
 const customSelectStyles = {
   option: (
     styles: { [x: string]: any },
@@ -40,12 +49,18 @@ const customSelectStyles = {
 
 class DropDownControl extends BaseControl<DropDownControlProps> {
   render() {
-    const { configProperty, options, label, isRequired } = this.props;
+    const { configProperty, options, label, isRequired, subtitle } = this.props;
 
     return (
       <div>
         <FormLabel>
           {label} {isRequired && "*"}
+          {subtitle && (
+            <>
+              <br />
+              <StyledInfo>{subtitle}</StyledInfo>
+            </>
+          )}
         </FormLabel>
         <DropdownSelect data-cy={configProperty}>
           <DropdownField
@@ -89,6 +104,7 @@ export interface DropDownControlProps extends ControlProps {
   options: DropdownOption[];
   placeholderText: string;
   propertyValue: string;
+  subtitle?: string;
 }
 
 export default DropDownControl;
diff --git a/app/client/src/components/formControls/InputTextControl.tsx b/app/client/src/components/formControls/InputTextControl.tsx
index 75f26e73e6..b8780955b6 100644
--- a/app/client/src/components/formControls/InputTextControl.tsx
+++ b/app/client/src/components/formControls/InputTextControl.tsx
@@ -8,10 +8,10 @@ import { FormIcons } from "icons/FormIcons";
 import { Colors } from "constants/Colors";
 import styled from "styled-components";
 
-const StyledInfo = styled.span`
+export const StyledInfo = styled.span`
   font-weight: normal;
   line-height: normal;
-  color: ${Colors.CADET_BLUE};
+  color: ${Colors.DOVE_GRAY};
   font-size: 12px;
   margin-left: 1px;
 `;
@@ -20,30 +20,48 @@ export function InputText(props: {
   label: string;
   value: string;
   isValid: boolean;
+  subtitle?: string;
   validationMessage?: string;
   placeholder?: string;
   dataType?: string;
   isRequired?: boolean;
   name: string;
   encrypted?: boolean;
+  disabled?: boolean;
 }) {
-  const { name, placeholder, dataType, label, isRequired } = props;
+  const {
+    name,
+    placeholder,
+    dataType,
+    label,
+    isRequired,
+    disabled,
+    subtitle,
+    encrypted,
+  } = props;
 
   return (
     <div style={{ width: "50vh" }} data-cy={name}>
       <FormLabel>
         {label} {isRequired && "*"}{" "}
-        {props.encrypted && (
+        {encrypted && (
           <>
             <FormIcons.LOCK_ICON width={12} height={12} keepColors />
             <StyledInfo>Encrypted</StyledInfo>
           </>
         )}
+        {subtitle && (
+          <>
+            <br />
+            <StyledInfo>{subtitle}</StyledInfo>
+          </>
+        )}
       </FormLabel>
       <TextField
         name={name}
         placeholder={placeholder}
         type={dataType}
+        disabled={disabled || false}
         showError
       />
     </div>
@@ -60,6 +78,8 @@ class InputTextControl extends BaseControl<InputControlProps> {
       placeholderText,
       dataType,
       configProperty,
+      disabled,
+      subtitle,
     } = this.props;
 
     return (
@@ -72,6 +92,8 @@ class InputTextControl extends BaseControl<InputControlProps> {
         placeholder={placeholderText}
         dataType={this.getType(dataType)}
         encrypted={this.props.encrypted}
+        disabled={disabled}
+        subtitle={subtitle}
       />
     );
   }
@@ -109,7 +131,9 @@ export interface InputControlProps extends ControlProps {
   placeholderText: string;
   inputType?: InputType;
   dataType?: InputType;
+  subtitle?: string;
   encrypted?: boolean;
+  disabled?: boolean;
 }
 
 export default InputTextControl;
diff --git a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
index 7f953347fd..de0c16afd7 100644
--- a/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
+++ b/app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
@@ -16,7 +16,9 @@ import {
 import { BaseButton } from "components/designSystems/blueprint/ButtonComponent";
 import AnalyticsUtil from "utils/AnalyticsUtil";
 import BackButton from "./BackButton";
-import InputTextControl from "components/formControls/InputTextControl";
+import InputTextControl, {
+  StyledInfo,
+} from "components/formControls/InputTextControl";
 import KeyValueInputControl from "components/formControls/KeyValueInputControl";
 import DropDownControl from "components/formControls/DropDownControl";
 import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper";
@@ -50,6 +52,8 @@ import {
 } from "constants/messages";
 import Collapsible from "./Collapsible";
 import _ from "lodash";
+import FormLabel from "components/editorComponents/FormLabel";
+import CopyToClipBoard from "components/designSystems/appsmith/CopyToClipBoard";
 
 interface DatasourceRestApiEditorProps {
   updateDatasource: (
@@ -194,6 +198,7 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
   }
 
   ensureOAuthDefaultsAreCorrect = () => {
+    if (!this.props.formData) return;
     const { authentication } = this.props.formData;
 
     if (!authentication || !authentication.grantType) {
@@ -384,7 +389,8 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
         <FormInputContainer>
           <DropDownControl
             {...COMMON_INPUT_PROPS}
-            label="Send Appsmith signature header (X-APPSMITH-SIGNATURE)"
+            label="Send Appsmith signature header"
+            subtitle="Header key: X-APPSMITH-SIGNATURE"
             configProperty="isSendSessionEnabled"
             isRequired={true}
             placeholderText=""
@@ -570,6 +576,8 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
       "datasourceConfiguration.authentication.isAuthorized",
       false,
     );
+    const redirectURL =
+      window.location.origin + "/api/v1/datasources/authorize";
     return (
       <>
         {this.renderOauth2Common()}
@@ -581,6 +589,18 @@ class DatasourceRestAPIEditor extends React.Component<Props> {
             placeholderText="https://example.com/login/oauth/authorize"
           />
         </FormInputContainer>
+        <FormInputContainer>
+          <div style={{ width: "50vh" }}>
+            <FormLabel>
+              Redirect URL
+              <br />
+              <StyledInfo>
+                Url that the oauth server should redirect to
+              </StyledInfo>
+            </FormLabel>
+            <CopyToClipBoard copyText={redirectURL} />
+          </div>
+        </FormInputContainer>
         <FormInputContainer>
           <KeyValueInputControl
             {...COMMON_INPUT_PROPS}
diff --git a/app/client/src/pages/organization/AppInviteUsersForm.tsx b/app/client/src/pages/organization/AppInviteUsersForm.tsx
index 20167172b2..ee5326c883 100644
--- a/app/client/src/pages/organization/AppInviteUsersForm.tsx
+++ b/app/client/src/pages/organization/AppInviteUsersForm.tsx
@@ -4,7 +4,7 @@ import { connect, useSelector } from "react-redux";
 import { AppState } from "reducers";
 import { getCurrentAppOrg } from "selectors/organizationSelectors";
 import { ReduxActionTypes } from "constants/ReduxActionConstants";
-import CopyToClipBoard from "components/designSystems/appsmith/CopyToClipBoard";
+import CopyToClipBoard from "components/ads/CopyToClipBoard";
 import {
   isPermitted,
   PERMISSION_TYPE,