From 0d307fc6293e027baff510a218b7ec996cbdc50d Mon Sep 17 00:00:00 2001
From: eric_wang <wangxinlei.zju@gmail.com>
Date: Thu, 3 Dec 2020 05:38:29 -0800
Subject: [PATCH] Additional OAuth changes (#26)

Remove instanceUrl from attr list.
Reformat the place showing custom domain.

* Modify oauthConig.

* Remove instanceUrl from requiredAttrlist, move custom domain field to
Adv tab.

* Remove instanceUrl from requiredAttrlist, move custom domain field to
Adv tab.

* Update connection-fields.xml

* Update connection-fields.xml

* Update connection-fields.xml

* Update connection-builder.js

Change auth mode name for backward compatibility.

Co-authored-by: Eric Wang <ewang@tableau.com>
---
 tableau-databricks/connection-builder.js   |  2 +-
 tableau-databricks/connection-fields.xml   | 28 +++++-----------------
 tableau-databricks/connection-resolver.tdr |  1 -
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/tableau-databricks/connection-builder.js b/tableau-databricks/connection-builder.js
index ac24797..a0bd6c3 100644
--- a/tableau-databricks/connection-builder.js
+++ b/tableau-databricks/connection-builder.js
@@ -29,7 +29,7 @@ limitations under the License.
 	var authenticationMode = attr[connectionHelper.attributeAuthentication];
 	switch (authenticationMode) {
 		case "auth-user-pass":
-		case "username-password":
+		case "Username and Password":
 			params["AUTHMECH"] = 3;
 			params["UID"] = attr[connectionHelper.attributeUsername];
 			params["PWD"] = attr[connectionHelper.attributePassword];
diff --git a/tableau-databricks/connection-fields.xml b/tableau-databricks/connection-fields.xml
index d946389..26a8f0e 100644
--- a/tableau-databricks/connection-fields.xml
+++ b/tableau-databricks/connection-fields.xml
@@ -32,30 +32,14 @@ limitations under the License. -->
         </selection-group>
     </field>
 
-    <field name="v-show-advanced-aad-options" label="@string/authentication_aad_advanced_options_prompt/" category="authentication" value-type="boolean">
+    <field name="instanceurl" label="@string/authentication_aad_endpoint_prompt/" category="advanced" value-type="string" default-value="https://login.microsoftonline.com/common">
         <conditions>
           <condition field="authentication" value="oauth" />
         </conditions>
-        <boolean-options>
-            <false-value value="" />
-            <true-value value="true" />
-        </boolean-options>
-    </field>
-
-    <field name="instanceurl" label="@string/authentication_aad_endpoint_prompt/" category="authentication" value-type="string" default-value="https://login.microsoftonline.com/common/" editable="false">
-        <conditions>
-          <condition field="v-show-advanced-aad-options" value="" />
-        </conditions>
-    </field>
-
-    <field name="instanceurl" label="@string/authentication_aad_endpoint_prompt/" category="authentication" value-type="string" default-value="https://login.microsoftonline.com/common/">
-        <conditions>
-          <condition field="v-show-advanced-aad-options" value="true" />
-        </conditions>
-        <!-- limit to well-known domains:
-              https://*.microsoftonline.(com|us|de|cn)/ (public, govcloud, germany, china),
-              https://*.chinacloudapi.cn/ (China) -->
-        <validation-rule reg-exp="^https:\/\/([a-zA-Z0-9-.]+\.)?((microsoftonline\.(com|us|cn|de))|chinacloudapi\.cn)/"/>
+           <!-- limit to well-known domains:
+                 https://*.microsoftonline.(com|us|de|cn)/ (public, govcloud, germany, china),
+                 https://*.chinacloudapi.cn/ (China) -->
+           <validation-rule reg-exp="^https:\/\/([a-zA-Z0-9-.]+\.)?((microsoftonline\.(com|us|cn|de))|chinacloudapi\.cn)/"/>
     </field>
 
     <field name="username" label="@string/username_prompt/" category="authentication" value-type="string">
@@ -111,4 +95,4 @@ limitations under the License. -->
         <!-- valid values: word, Word, some-arbitrary*string, {has-semicolon;}, {has{closing}}bracket;} -->
         <validation-rule reg-exp="^(([a-zA-Z0-9_.-]+)=(([^{};]*)|(\{((\}\}|[^}])*)\}));)*(([a-zA-Z0-9_.-]+)=(([^{};]*)|(\{((\}\}|[^}])*)\})))?$" />
     </field>
-</connection-fields>
\ No newline at end of file
+</connection-fields>
diff --git a/tableau-databricks/connection-resolver.tdr b/tableau-databricks/connection-resolver.tdr
index 531ba8b..f43fd32 100644
--- a/tableau-databricks/connection-resolver.tdr
+++ b/tableau-databricks/connection-resolver.tdr
@@ -33,7 +33,6 @@ limitations under the License.
                     <attr>username</attr>
                     <attr>password</attr>
                     <attr>authentication-type</attr>
-                    <attr>instanceurl</attr>
                     <attr>odbc-connect-string-extras</attr>
                 </attribute-list>
             </required-attributes>