Apply 2023C01 changes on main

authgear · Nov 21, 2023 · d8a9a62 · d8a9a62
1 parent ec8f663
commit d8a9a62
Show file tree

Hide file tree

Showing 32 changed files with 1,520 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,7 +27,7 @@ jobs:
   app:
     runs-on: macos-12
     needs: ["test"]
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/2023C01'
     env:
       # The version depends on the Android Gradle Plugin version in /build.gradle.kts
       BUILD_TOOLS_VERSION: "33.0.1"

diff --git a/javasample/src/main/java/com/oursky/authgeartest/MainActivity.java b/javasample/src/main/java/com/oursky/authgeartest/MainActivity.java
@@ -125,6 +125,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         String[] uiVariants = {
                 UIVariant.CUSTOM_TABS.name(),
+                UIVariant.WEB_VIEW.name(),
+                UIVariant.WEB_VIEW_FULL_SCREEN.name(),
         };
         mUIVariant = findViewById(R.id.uiVariantSpinner);
         ArrayAdapter<String> mUIVariantAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, uiVariants);
@@ -205,6 +207,10 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
                 String value = (String) parent.getItemAtPosition(position);
                 if (UIVariant.CUSTOM_TABS.name().equals(value)) {
                     viewModel.setUIVariant(UIVariant.CUSTOM_TABS);
+                } else if (UIVariant.WEB_VIEW.name().equals(value)) {
+                    viewModel.setUIVariant(UIVariant.WEB_VIEW);
+                } else if (UIVariant.WEB_VIEW_FULL_SCREEN.name().equals(value)) {
+                    viewModel.setUIVariant(UIVariant.WEB_VIEW_FULL_SCREEN);
                 }
             }
 

diff --git a/sdk/src/main/AndroidManifest.xml b/sdk/src/main/AndroidManifest.xml
@@ -11,5 +11,18 @@
         <activity android:name=".CustomTabActivity"
             android:exported="false"
             android:launchMode="singleTask" />
+        <activity
+            android:name=".OAuthWebViewActivity"
+            android:exported="false" />
+        <activity
+            android:name=".OAuthWebViewFullScreenActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:exported="false" />
     </application>
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="mailto"/>
+        </intent>
+    </queries>
 </manifest>
diff --git a/sdk/src/main/java/com/oursky/authgear/AuthgearCore.kt b/sdk/src/main/java/com/oursky/authgear/AuthgearCore.kt
@@ -737,14 +737,34 @@ internal class AuthgearCore(
             }
             application.registerReceiver(br, intentFilter)
             val redirectUri = Uri.parse(redirectUrl)
-            application.startActivity(
-                OAuthActivity.createAuthorizationIntent(
-                    application,
-                    action,
-                    redirectUrl,
-                    authorizeUri.toString()
+            if (uiVariant == UIVariant.WEB_VIEW) {
+                application.startActivity(
+                    OAuthWebViewActivity.createIntent(
+                        application,
+                        action,
+                        authorizeUri,
+                        redirectUri
+                    )
                 )
-            )
+            } else if (uiVariant == UIVariant.WEB_VIEW_FULL_SCREEN) {
+                application.startActivity(
+                    OAuthWebViewFullScreenActivity.createIntent(
+                        application,
+                        action,
+                        authorizeUri,
+                        redirectUri
+                    )
+                )
+            } else {
+                application.startActivity(
+                    OAuthActivity.createAuthorizationIntent(
+                        application,
+                        action,
+                        redirectUrl,
+                        authorizeUri.toString()
+                    )
+                )
+            }
         }
     }
 

diff --git a/sdk/src/main/java/com/oursky/authgear/OAuthWebViewActivity.kt b/sdk/src/main/java/com/oursky/authgear/OAuthWebViewActivity.kt
@@ -0,0 +1,19 @@
+package com.oursky.authgear
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+
+internal class OAuthWebViewActivity : OAuthWebViewBaseActivity() {
+
+    companion object {
+        fun createIntent(ctx: Context?, broadcastAction: String, uri: Uri?, redirectUri: Uri?): Intent {
+            val intent = Intent(ctx, OAuthWebViewActivity::class.java)
+            intent.data = uri
+            intent.putExtra(OAuthWebViewBaseActivity.KEY_BROADCAST_ACTION, broadcastAction)
+            intent.putExtra(OAuthWebViewBaseActivity.KEY_REDIRECT_URI, redirectUri)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            return intent
+        }
+    }
+}
diff --git a/sdk/src/main/java/com/oursky/authgear/OAuthWebViewFullScreenActivity.kt b/sdk/src/main/java/com/oursky/authgear/OAuthWebViewFullScreenActivity.kt
@@ -0,0 +1,19 @@
+package com.oursky.authgear
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+
+internal class OAuthWebViewFullScreenActivity : OAuthWebViewBaseActivity() {
+
+    companion object {
+        fun createIntent(ctx: Context?, broadcastAction: String, uri: Uri?, redirectUri: Uri?): Intent {
+            val intent = Intent(ctx, OAuthWebViewFullScreenActivity::class.java)
+            intent.data = uri
+            intent.putExtra(OAuthWebViewBaseActivity.KEY_BROADCAST_ACTION, broadcastAction)
+            intent.putExtra(OAuthWebViewBaseActivity.KEY_REDIRECT_URI, redirectUri)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            return intent
+        }
+    }
+}
diff --git a/sdk/src/main/java/com/oursky/authgear/UIVariant.kt b/sdk/src/main/java/com/oursky/authgear/UIVariant.kt
@@ -1,5 +1,7 @@
 package com.oursky.authgear
 
 enum class UIVariant {
-    CUSTOM_TABS
+    CUSTOM_TABS,
+    WEB_VIEW,
+    WEB_VIEW_FULL_SCREEN
 }
diff --git a/sdk/src/main/java/com/oursky/authgear/latte/AuthenticateOptions.kt b/sdk/src/main/java/com/oursky/authgear/latte/AuthenticateOptions.kt
@@ -0,0 +1,16 @@
+package com.oursky.authgear.latte
+
+import com.oursky.authgear.ColorScheme
+import com.oursky.authgear.PromptOption
+
+data class AuthenticateOptions @JvmOverloads constructor(
+    var xSecrets: Map<String, String> = mapOf(),
+    var xState: Map<String, String> = mapOf(),
+    var responseType: String? = "code",
+    var prompt: List<PromptOption>? = null,
+    var loginHint: String? = null,
+    var uiLocales: List<String>? = null,
+    var colorScheme: ColorScheme? = null,
+    var wechatRedirectURI: String? = null,
+    var page: String? = null
+)
diff --git a/sdk/src/main/java/com/oursky/authgear/latte/BiometricOptions.kt b/sdk/src/main/java/com/oursky/authgear/latte/BiometricOptions.kt
@@ -0,0 +1,12 @@
+package com.oursky.authgear.latte
+
+import androidx.fragment.app.FragmentActivity
+
+data class BiometricOptions constructor(
+    var activity: FragmentActivity,
+    var title: String,
+    var subtitle: String? = null,
+    var description: String? = null,
+    var negativeButtonText: String? = null,
+    var allowedAuthenticators: Int = androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK
+)
diff --git a/sdk/src/main/java/com/oursky/authgear/latte/Capability.kt b/sdk/src/main/java/com/oursky/authgear/latte/Capability.kt
@@ -0,0 +1,5 @@
+package com.oursky.authgear.latte
+
+enum class Capability(val raw: String) {
+    BIOMETRIC("biometric")
+}
diff --git a/sdk/src/main/java/com/oursky/authgear/latte/EmailClient.kt b/sdk/src/main/java/com/oursky/authgear/latte/EmailClient.kt
@@ -0,0 +1,45 @@
+package com.oursky.authgear.latte
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.LabeledIntent
+import android.content.pm.PackageManager
+
+data class EmailClient(val packageName: String) {
+    companion object {
+        @JvmField
+        val GMAIL = EmailClient("com.google.android.gm")
+        @JvmField
+        val OUTLOOK = EmailClient("com.microsoft.office.outlook")
+
+        @JvmStatic
+        fun makeEmailClientIntentChooser(
+            ctx: Context,
+            title: String,
+            clients: List<EmailClient>
+        ): Intent? {
+            val launchIntents: MutableList<Intent> = mutableListOf()
+            val pm: PackageManager = ctx.packageManager
+            for (client in clients) {
+                val intent = pm.getLaunchIntentForPackage(client.packageName) ?: continue
+                val info = pm.resolveActivity(intent, 0) ?: continue
+                launchIntents.add(
+                    LabeledIntent(
+                        intent,
+                        client.packageName,
+                        info.loadLabel(pm),
+                        info.icon
+                    )
+                )
+            }
+            if (launchIntents.size == 0) {
+                return null
+            }
+            val firstIntent = launchIntents[0]
+            val chooser = Intent.createChooser(firstIntent, title)
+            chooser.putExtra(Intent.EXTRA_INITIAL_INTENTS, launchIntents.toTypedArray())
+            chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            return chooser
+        }
+    }
+}