Added code challenge method as a query param to UriAssembler

uber · Jul 17, 2024 · 6bea435 · 6bea435
1 parent 168c1bd
commit 6bea435
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/samples/login-with-auth-code-demo/src/main/AndroidManifest.xml b/samples/login-with-auth-code-demo/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <application
+    <application android:networkSecurityConfig="@xml/network_security_config"
         android:allowBackup="true"
         android:label="@string/app_name"
         android:theme="@style/Theme.AppCompat"

diff --git a/...es/login-with-auth-code-demo/src/main/java/com/uber/sdk/android/samples/DemoActivity.java b/...es/login-with-auth-code-demo/src/main/java/com/uber/sdk/android/samples/DemoActivity.java
@@ -113,6 +113,11 @@ private void handleAuthCode(String authCode) {
         ).execute(new TokenRequestFlowCallback() {
             @Override
             public void onSuccess(AccessToken accessToken) {
+                Toast.makeText(
+                        DemoActivity.this,
+                        getString(R.string.token_success_message),
+                        Toast.LENGTH_LONG
+                ).show();
                 sharedPreferences.edit()
                         .putString(ACCESS_TOKEN, accessToken.getToken())
                         .apply();

diff --git a/...with-auth-code-demo/src/main/java/com/uber/sdk/android/samples/auth/AuthUriAssembler.java b/...with-auth-code-demo/src/main/java/com/uber/sdk/android/samples/auth/AuthUriAssembler.java
@@ -40,6 +40,10 @@ public class AuthUriAssembler {
     static final String PLATFORM_PARAM = "sdk";
     static final String SDK_VERSION_PARAM = "sdk_version";
     static final String CODE_CHALLENGE_PARAM = "code_challenge";
+
+    static final String CODE_CHALLENGE_METHOD = "code_challenge_method";
+
+    static final String CODE_CHALLENGE_METHOD_VAL = "S256";
     public static Uri assemble(
             @NonNull String clientId,
             @NonNull String scopes,
@@ -57,7 +61,8 @@ public static Uri assemble(
                 .appendQueryParameter(REDIRECT_PARAM, redirectUri)
                 .appendQueryParameter(SDK_VERSION_PARAM, BuildConfig.VERSION_NAME)
                 .appendQueryParameter(SCOPE_PARAM, scopes)
-                .appendQueryParameter(CODE_CHALLENGE_PARAM, codeChallenge);
+                .appendQueryParameter(CODE_CHALLENGE_PARAM, codeChallenge)
+                .appendQueryParameter(CODE_CHALLENGE_METHOD, CODE_CHALLENGE_METHOD_VAL);
         return builder.build();
     }
 }
diff --git a/samples/login-with-auth-code-demo/src/main/res/values/strings.xml b/samples/login-with-auth-code-demo/src/main/res/values/strings.xml
@@ -33,6 +33,7 @@
     <string name="custom_login_text">I want to sign in using my Uber app.</string>
     <string name="app_link_sso">I want to sign in using App link</string>
     <string name="authorization_code_message">Received an authorization code:\n %s</string>
+    <string name="token_success_message">Received auth token</string>
     <string name="authorization_code_error_message">Could not get tokens via authorization code: %s</string>
     <string name="greeting">Hello %s!</string>
 </resources>
diff --git a/samples/login-with-auth-code-demo/src/main/res/xml/network_security_config.xml b/samples/login-with-auth-code-demo/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <debug-overrides>
+        <trust-anchors>
+            <!-- Trust user added CAs while debuggable only -->
+            <certificates src="user" />
+            <certificates src="system" />
+        </trust-anchors>
+    </debug-overrides>
+
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>