From e5aabe6168e549d47d3a195bc294ff9710fbf7de Mon Sep 17 00:00:00 2001
From: Jade Koskela <jkoskeladev@gmail.com>
Date: Fri, 11 Aug 2023 11:54:10 -0700
Subject: [PATCH 1/2] Update/add OAuth example callbacks

---
 samples/components/oauth/athena.okta.xml    |   8 +-
 samples/components/oauth/redshift.azure.xml | 130 ++++++++++----------
 2 files changed, 72 insertions(+), 66 deletions(-)

diff --git a/samples/components/oauth/athena.okta.xml b/samples/components/oauth/athena.okta.xml
index 9673e78e..cab346f6 100644
--- a/samples/components/oauth/athena.okta.xml
+++ b/samples/components/oauth/athena.okta.xml
@@ -1,11 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <pluginOAuthConfig>
   <dbclass>athena</dbclass>
   <oauthConfigId>custom_athena_okta</oauthConfigId>
   <clientIdDesktop>$clientID</clientIdDesktop>
   <clientSecretDesktop>$clientSecret</clientSecretDesktop>
-  <redirectUrisDesktop>http://localhost:56666/Callback</redirectUrisDesktop>
-  <redirectUrisDesktop>http://localhost:56667/Callback</redirectUrisDesktop>
-  <redirectUrisDesktop>http://localhost:56668/Callback</redirectUrisDesktop>
+  <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>https://${oktaDomain}/oauth2/v1/authorize</authUri>
   <tokenUri>https://${oktaDomain}/oauth2/v1/token</tokenUri>
   <scopes>openid</scopes>
diff --git a/samples/components/oauth/redshift.azure.xml b/samples/components/oauth/redshift.azure.xml
index f38ff93b..37b1e2d4 100644
--- a/samples/components/oauth/redshift.azure.xml
+++ b/samples/components/oauth/redshift.azure.xml
@@ -1,63 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
-<pluginOAuthConfig>	 
-	<dbclass>redshift</dbclass>
-    <oauthConfigId>custom_redshift_azure</oauthConfigId>
-    <clientIdDesktop>$clientID</clientIdDesktop>
-    <clientSecretDesktop>$clientSecret</clientSecretDesktop>
-    <authUri>https://${msUrlBegin}/oauth2/v2.0/authorize</authUri>
-    <tokenUri>https://${msUrlBegin}/oauth2/v2.0/token</tokenUri>
-    <scopes>openid</scopes>
-    <scopes>email</scopes>
-    <scopes>profile</scopes>
-    <scopes>offline_access</scopes>
-    <scopes></scopes>
-    <capabilities>
-        <entry>
-            <key>OAUTH_CAP_REQUIRES_PROMPT_SELECT_ACCOUNT</key>
-            <value>true</value>
-        </entry>
-        <entry>
-            <key>OAUTH_CAP_REQUIRE_PKCE</key>
-            <value>true</value>
-        </entry>
-        <entry>
-            <key>OAUTH_CAP_PKCE_REQUIRES_CODE_CHALLENGE_METHOD</key>
-            <value>true</value>
-        </entry>
-        <entry>
-            <key>OAUTH_CAP_CLIENT_SECRET_IN_URL_QUERY_PARAM</key>
-            <value>true</value>
-        </entry>
-        <entry>
-            <key>OAUTH_CAP_SUPPORTS_GET_USERINFO_FROM_ID_TOKEN</key>
-            <value>true</value>
-        </entry>
-    </capabilities>
-    <accessTokenResponseMaps>
-        <entry>
-            <key>ACCESSTOKEN</key>
-            <value>access_token</value>
-        </entry>
-        <entry>
-            <key>REFRESHTOKEN</key>
-            <value>refresh_token</value>
-        </entry>
-        <entry>
-            <key>access-token-issue-time</key>
-            <value>issued_at</value>
-        </entry>
-        <entry>
-            <key>access-token-expires-in</key>
-            <value>expires_in</value>
-        </entry>
-        <entry>
-            <key>id-token</key>
-            <value>id_token</value>
-        </entry>
-        <entry>
-            <key>username</key>
-            <value>preferred_username</value>
-        </entry>
-    </accessTokenResponseMaps>
- </pluginOAuthConfig>
-
+<?xml version="1.0" encoding="utf-8"?>
+<pluginOAuthConfig>
+  <dbclass>redshift</dbclass>
+  <oauthConfigId>custom_redshift_azure</oauthConfigId>
+  <clientIdDesktop>$clientID</clientIdDesktop>
+  <clientSecretDesktop>$clientSecret</clientSecretDesktop>
+  <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>https://${msUrlBegin}/oauth2/v2.0/authorize</authUri>
+  <tokenUri>https://${msUrlBegin}/oauth2/v2.0/token</tokenUri>
+  <scopes>openid</scopes>
+  <scopes>email</scopes>
+  <scopes>profile</scopes>
+  <scopes>offline_access</scopes>
+  <scopes></scopes>
+  <capabilities>
+    <entry>
+      <key>OAUTH_CAP_REQUIRES_PROMPT_SELECT_ACCOUNT</key>
+      <value>true</value>
+    </entry>
+    <entry>
+      <key>OAUTH_CAP_REQUIRE_PKCE</key>
+      <value>true</value>
+    </entry>
+    <entry>
+      <key>OAUTH_CAP_PKCE_REQUIRES_CODE_CHALLENGE_METHOD</key>
+      <value>true</value>
+    </entry>
+    <entry>
+      <key>OAUTH_CAP_CLIENT_SECRET_IN_URL_QUERY_PARAM</key>
+      <value>true</value>
+    </entry>
+    <entry>
+      <key>OAUTH_CAP_SUPPORTS_GET_USERINFO_FROM_ID_TOKEN</key>
+      <value>true</value>
+    </entry>
+  </capabilities>
+  <accessTokenResponseMaps>
+    <entry>
+      <key>ACCESSTOKEN</key>
+      <value>access_token</value>
+    </entry>
+    <entry>
+      <key>REFRESHTOKEN</key>
+      <value>refresh_token</value>
+    </entry>
+    <entry>
+      <key>access-token-issue-time</key>
+      <value>issued_at</value>
+    </entry>
+    <entry>
+      <key>access-token-expires-in</key>
+      <value>expires_in</value>
+    </entry>
+    <entry>
+      <key>id-token</key>
+      <value>id_token</value>
+    </entry>
+    <entry>
+      <key>username</key>
+      <value>preferred_username</value>
+    </entry>
+  </accessTokenResponseMaps>
+ </pluginOAuthConfig>
+

From b4532066f137e445aab5ee2af9342e95bcadfa9b Mon Sep 17 00:00:00 2001
From: Jade Koskela <jkoskeladev@gmail.com>
Date: Fri, 11 Aug 2023 12:21:11 -0700
Subject: [PATCH 2/2] Add README

---
 samples/components/oauth/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 samples/components/oauth/README.md

diff --git a/samples/components/oauth/README.md b/samples/components/oauth/README.md
new file mode 100644
index 00000000..45a110f6
--- /dev/null
+++ b/samples/components/oauth/README.md
@@ -0,0 +1,8 @@
+# OAuth Config Templates
+
+For these templates, if you are using the corresponding IDP, you should only have to substitute the following:
+- Desktop client ID
+- Desktop client Secret
+- IDP URL prefix/domain name
+
+See the [OAuth](https://tableau.github.io/connector-plugin-sdk/docs/oauth) section in the SDK docs for more information.
\ No newline at end of file