Modify oauthConig.

databricks · Nov 25, 2020 · ffb8291 · ffb8291
1 parent 27ffcca
commit ffb8291
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 26 deletions.
diff --git a/tableau-databricks/connection-resolver.tdr b/tableau-databricks/connection-resolver.tdr
@@ -35,11 +35,6 @@ limitations under the License.
                     <attr>authentication-type</attr>
                     <attr>instanceurl</attr>
                     <attr>odbc-connect-string-extras</attr>
-                    <attr>ACCESSTOKEN</attr>
-                    <attr>REFRESHTOKEN</attr>
-                    <attr>access-token-issue-time</attr>
-                    <attr>access-token-expires-in</attr>
-                    <attr>oauth-client</attr>
                 </attribute-list>
             </required-attributes>
         </connection-normalizer>

diff --git a/tableau-databricks/oauth-config.xml b/tableau-databricks/oauth-config.xml
@@ -2,13 +2,12 @@
 <pluginOAuthConfig>
     <dbclass>databricks</dbclass>
 
-    <clientIdDesktop>******</clientIdDesktop>
-    <clientSecretDesktop>******</clientSecretDesktop>
+    <clientIdDesktop>602b9111-dbbc-469f-bd20-7e2db0f7f956</clientIdDesktop>
     <redirectUrisDesktop>http://localhost:55555/Callback</redirectUrisDesktop>
-
-    <clientIdServerCustom>******</clientIdServerCustom>
-    <clientSecretServerCustom>******</clientSecretServerCustom>
-    <redirectUrisServerCustom>http://localhost/auth/add_oauth_token</redirectUrisServerCustom>
+    <redirectUrisDesktop>http://localhost:55556/Callback</redirectUrisDesktop>
+    <redirectUrisDesktop>http://localhost:55557/Callback</redirectUrisDesktop>
+    <redirectUrisDesktop>http://localhost:55558/Callback</redirectUrisDesktop>
+    <redirectUrisDesktop>http://localhost:55559/Callback</redirectUrisDesktop>
 
     <authUri>/oauth2/v2.0/authorize</authUri>
     <tokenUri>/oauth2/v2.0/token</tokenUri>
@@ -19,19 +18,6 @@
     <scopes>offline_access</scopes>
     <scopes>2ff814a6-3304-4ab8-85cb-cd0e6f879c1d/user_impersonation</scopes>
 
-    <!-- TODO: required attrs need review -->
-    <requiredAuthAttrs>class</requiredAuthAttrs>
-    <requiredAuthAttrs>server</requiredAuthAttrs>
-    <requiredAuthAttrs>dbname</requiredAuthAttrs>
-    <requiredAuthAttrs>instanceurl</requiredAuthAttrs>
-    <requiredAuthAttrs>oauth-client</requiredAuthAttrs>
-    <requiredRefreshAttrs>class</requiredRefreshAttrs>
-    <requiredRefreshAttrs>server</requiredRefreshAttrs>
-    <requiredRefreshAttrs>dbname</requiredRefreshAttrs>
-    <requiredRefreshAttrs>authentication</requiredRefreshAttrs>
-    <requiredRefreshAttrs>instanceurl</requiredRefreshAttrs>
-    <requiredRefreshAttrs>REFRESHTOKEN</requiredRefreshAttrs>
-    <requiredRefreshAttrs>oauth-client</requiredRefreshAttrs>
     <capabilities>
         <entry>
             <key>CAP_SUPPORTS_CUSTOM_DOMAIN</key>
@@ -57,8 +43,12 @@
             <key>CAP_CLIENT_SECRET_IN_URL_QUERY_PARAM</key>
             <value>true</value>
         </entry>
+        <entry>
+            <key>CAP_SUPPORTS_GET_USERINFO_FROM_ID_TOKEN</key>
+            <value>true</value>
+        </entry>
     </capabilities>
-    <attrMaps>
+    <accessTokenResponseMaps>
         <entry>
             <key>ACCESSTOKEN</key>
             <value>access_token</value>
@@ -75,5 +65,13 @@
             <key>access-token-expires-in</key>
             <value>expires_in</value>
         </entry>
-    </attrMaps>
+        <entry>
+            <key>id-token</key>
+            <value>id_token</value>
+        </entry>
+        <entry>
+            <key>username</key>
+            <value>preferred_username</value>
+        </entry>
+    </accessTokenResponseMaps>
  </pluginOAuthConfig>