Merge branch 'master' into redesign-for-demo-apps

Resolve example/src/app/tab1/tab1.page.html: keep the redesign button
styling and add master's Open Admin Portal button in that style (keeping
the aria-label for the E2E tests).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: dianaKhortiuk-frontegg

FronteggIonicCapacitor.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '14.0'
   s.dependency 'Capacitor'
-  s.dependency "FronteggSwift", "1.2.76"
+  s.dependency "FronteggSwift", "1.3.10"
   s.swift_version = '5.1'
   s.pod_target_xcconfig = {
     'CODE_SIGNING_ALLOWED' => 'YES'

android/build.gradle

@@ -62,7 +62,7 @@ dependencies {
     implementation "androidx.browser:browser:1.8.0"
     implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
     implementation 'com.google.code.gson:gson:2.10'
-    implementation 'com.frontegg.sdk:android:1.3.18'
+    implementation 'com.frontegg.sdk:android:1.3.34'
 
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"

android/src/main/java/com/frontegg/ionic/FronteggNativePlugin.java

@@ -1,12 +1,14 @@
 package com.frontegg.ionic;
 
 
+
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
 import kotlin.Unit;
 
+import com.frontegg.android.AdminPortalActivity;
 import com.frontegg.android.FronteggApp;
 import com.frontegg.android.FronteggAppKt;
 import com.frontegg.android.FronteggAuth;
@@ -101,6 +103,14 @@ public void load() {
             String clientId = config.getString("clientId");
             String applicationId = config.getString("applicationId");
 
+            // Allow E2E tests to override the base URL via system property.
+            // Tests set this via: System.setProperty("FRONTEGG_E2E_BASE_URL", url)
+            String e2eBaseUrl = System.getProperty("FRONTEGG_E2E_BASE_URL");
+            if (e2eBaseUrl != null && !e2eBaseUrl.isEmpty()) {
+                Log.i("FronteggNative", "E2E override: using base URL " + e2eBaseUrl);
+                baseUrl = e2eBaseUrl;
+            }
+
             if (baseUrl == null || clientId == null) {
                 throw new RuntimeException("Missing required config parameters: baseUrl, clientId");
             }
@@ -313,4 +323,15 @@ public void getConstants(PluginCall call) {
         call.resolve(resultMap);
     }
 
+    @PluginMethod
+    public void openAdminPortal(PluginCall call) {
+        if (this.getActivity() == null) {
+            call.reject("NO_ACTIVITY", "Cannot open Admin Portal without an active Activity");
+            return;
+        }
+
+        AdminPortalActivity.open(this.getActivity());
+        call.resolve();
+    }
+
 }

docs/README.md

@@ -22,6 +22,28 @@ For full documentation, visit the Frontegg Developer Portal:
 
 ---
 
+## 🔐 Native SDK versions
+
+The Ionic Capacitor wrapper depends on the underlying native SDKs:
+
+- On **Android**, the plugin and example app use `com.frontegg.sdk:android:1.3.34`.
+- On **iOS**, the plugin depends on `FronteggSwift` **1.3.10** via CocoaPods.
+
+After upgrading, run `pod install` in your iOS project and rebuild both platforms.
+
+---
+
+## 🔐 Native SDK versions
+
+The Ionic Capacitor wrapper depends on the underlying native SDKs:
+
+- On **Android**, the plugin and example app use `com.frontegg.sdk:android:1.3.34`.
+- On **iOS**, the plugin depends on `FronteggSwift` **1.3.10** via CocoaPods.
+
+After upgrading, run `pod install` in your iOS project and rebuild both platforms.
+
+---
+
 ## 🧑‍💻 Getting Started with Frontegg
 
 Don't have a Frontegg account yet?  

docs/_sidebar.md

@@ -3,3 +3,4 @@
 - [Setup Guide](setup.md)
 - [Usage Examples](usage.md)
 - [Advanced Topics](advanced.md)
+- [API Reference](api.md)

docs/advanced.md

@@ -244,4 +244,25 @@ export default config;
 
 If your app supports multiple environments or regions, define `applicationId` inside each region object:
 
-```
+## Admin Portal (Beta)
+
+The Admin Portal is a hosted page that lets end users manage their account, profile, sessions, and tenant settings. The Ionic Capacitor SDK exposes `openAdminPortal()` on `FronteggService`, which delegates to the native SDKs:
+
+- **Android** — launches `AdminPortalActivity` (full-screen `WebView`)
+- **iOS** — presents `AdminPortalView` as a page sheet (`WKWebView`)
+
+The portal loads `${baseUrl}/oauth/portal?appId=<applicationId>` and shares the SDK session, so authenticated users are not asked to sign in again.
+
+> **Beta.** The API may change in future minor releases. Pin to an exact SDK version when embedding this in a shipping app.
+
+### Multi-app prerequisite
+
+For multi-app workspaces, configure `applicationId` in your native setup (see [Multi-apps support](#multi-apps-support)). Without `?appId=` the portal renders **"Application not found"** after sign-in.
+
+### Open the portal
+
+```typescript
+await this.fronteggService.openAdminPortal();
+```
+
+The portal is dismissed when the user swipes down (iOS) or taps the built-in close button. On Android, `window.close()` finishes the activity automatically.

docs/usage.md

@@ -287,3 +287,13 @@ export class MyPage implements OnInit {
   }
 }
 ```
+
+## Admin Portal (Beta)
+
+Open the embedded Frontegg Admin Portal for authenticated users:
+
+```typescript
+await this.fronteggService.openAdminPortal();
+```
+
+See [Advanced Topics](advanced.md#admin-portal-beta) for prerequisites and platform behavior.

example/android/app/build.gradle

@@ -62,11 +62,15 @@ dependencies {
 
   implementation project(':capacitor-android')
   implementation project(':capacitor-cordova-android-plugins')
-  implementation 'com.frontegg.sdk:android:1.3.18'
+  implementation 'com.frontegg.sdk:android:1.3.34'
 
   testImplementation "junit:junit:$junitVersion"
   androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
   androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+  androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0"
+  androidTestImplementation "androidx.test:runner:1.5.2"
+  androidTestImplementation "androidx.test:rules:1.5.0"
+  androidTestImplementation "com.squareup.okhttp3:mockwebserver:4.12.0"
 }
 
 apply from: 'capacitor.build.gradle'

example/android/app/src/androidTest/java/com/frontegg/demo/ColdLaunchTest.kt

@@ -0,0 +1,51 @@
+package com.frontegg.demo
+
+import androidx.test.uiautomator.By
+import com.frontegg.demo.utils.UiTestInstrumentation
+import org.junit.Before
+import org.junit.Test
+import java.util.regex.Pattern
+
+/**
+ * Verifies that a cold launch with no persisted session shows the login page.
+ *
+ * Mirrors frontegg-ios-swift MultiRegion `testColdLaunchWithNoSessionShowsLoginPage`
+ * and Embedded `testColdLaunchWithOfflineModeDisabledReachesLoginQuickly`.
+ *
+ * NOTE: This test assumes no prior session exists. If tests run sequentially
+ * after a login test that doesn't clean up, this may see the authenticated
+ * state instead. For true isolation, clear app data before running.
+ */
+class ColdLaunchTest {
+    private lateinit var instrumentation: UiTestInstrumentation
+
+    @Before
+    fun setUp() {
+        instrumentation = UiTestInstrumentation()
+        instrumentation.openApp()
+    }
+
+    @Test
+    fun cold_launch_shows_login_or_authenticated_state() {
+        // On a fresh install (or after logout), the app should show the login
+        // page with "Not Logged In" text and a "Login" button.
+        // If a prior test left a session, we accept the authenticated state too.
+        val loginPattern = Pattern.compile("login", Pattern.CASE_INSENSITIVE)
+        val loginButton = instrumentation.waitForView(By.text(loginPattern), timeout = 15_000)
+
+        val notLoggedIn = instrumentation.waitForView(By.text("Not Logged In"), timeout = 3_000)
+        val logoutPattern = Pattern.compile("logout", Pattern.CASE_INSENSITIVE)
+        val logoutButton = instrumentation.waitForView(By.text(logoutPattern), timeout = 3_000)
+
+        // Must show EITHER the login page OR the authenticated state.
+        val isLoginPage = loginButton != null && notLoggedIn != null
+        val isAuthenticated = logoutButton != null
+
+        if (!isLoginPage && !isAuthenticated) {
+            throw Exception(
+                "Cold launch did not reach a valid state — " +
+                "expected login page or authenticated state"
+            )
+        }
+    }
+}

example/android/app/src/androidTest/java/com/frontegg/demo/GoogleSocialLoginTest.kt

@@ -0,0 +1,99 @@
+package com.frontegg.demo
+
+import androidx.test.uiautomator.By
+import com.frontegg.demo.utils.Env
+import com.frontegg.demo.utils.UiTestInstrumentation
+import com.frontegg.demo.utils.delay
+import com.frontegg.demo.utils.logout
+import com.frontegg.demo.utils.tapLoginButton
+import org.junit.Assume.assumeTrue
+import org.junit.Before
+import org.junit.Test
+import java.util.regex.Pattern
+
+/**
+ * P2: Verifies Google social login via Chrome Custom Tabs.
+ *
+ * Mirrors frontegg-android-kotlin's LoginViaGoogleTest. The flow:
+ * 1. Tap Login on the Ionic login page.
+ * 2. On the Frontegg hosted login, tap the Google social button.
+ * 3. Chrome Custom Tab opens with Google's sign-in.
+ * 4. Authenticate with Google test credentials.
+ * 5. Return to the app — Logout button appears.
+ *
+ * Requires GOOGLE_EMAIL and GOOGLE_PASSWORD instrumentation arguments.
+ * Skipped if credentials are not provided.
+ */
+class GoogleSocialLoginTest {
+    private lateinit var instrumentation: UiTestInstrumentation
+
+    @Before
+    fun setUp() {
+        instrumentation = UiTestInstrumentation()
+        instrumentation.openApp()
+    }
+
+    @Test
+    fun success_login_with_google() {
+        // Skip if Google credentials not provided.
+        assumeTrue(
+            "GOOGLE_EMAIL not set — skipping Google social login test",
+            Env.googleEmail.isNotEmpty()
+        )
+        assumeTrue(
+            "GOOGLE_PASSWORD not set — skipping Google social login test",
+            Env.googlePassword.isNotEmpty()
+        )
+
+        // 1. Open the Frontegg hosted login.
+        instrumentation.tapLoginButton()
+
+        // 2. Tap the Google social login button on the Frontegg hosted page.
+        //    The button may be labeled "Continue with Google" or show a Google icon.
+        val googleButton = instrumentation.waitForView(
+            By.text(Pattern.compile(".*google.*", Pattern.CASE_INSENSITIVE)),
+            timeout = 10_000
+        ) ?: throw Exception("Google social login button not found on hosted login page")
+        googleButton.click()
+
+        // 3. Chrome Custom Tab opens. Wait for Google's sign-in page.
+        delay(3_000) // allow Chrome Custom Tab to open
+
+        // Handle "Choose an account" / sign-in form.
+        // First, try to find an email input field.
+        val emailField = instrumentation.waitForView(
+            By.clazz(android.widget.EditText::class.java),
+            timeout = 10_000
+        )
+        if (emailField != null) {
+            emailField.text = Env.googleEmail
+            instrumentation.clickByText("Next", timeout = 5_000)
+
+            delay(2_000)
+
+            // Password field.
+            val passwordField = instrumentation.waitForView(
+                By.clazz(android.widget.EditText::class.java),
+                timeout = 10_000
+            )
+            if (passwordField != null) {
+                passwordField.text = Env.googlePassword
+                instrumentation.clickByText("Next", timeout = 5_000)
+            }
+        }
+
+        // 4. Handle potential consent screens ("Accept & continue", "No thanks").
+        delay(2_000)
+        instrumentation.clickByText("Accept & continue", timeout = 3_000)
+        delay(1_000)
+        instrumentation.clickByText("No thanks", timeout = 3_000)
+
+        // 5. Verify authenticated state — Logout button appears.
+        val logoutPattern = Pattern.compile("logout", Pattern.CASE_INSENSITIVE)
+        instrumentation.waitForView(By.text(logoutPattern), timeout = 30_000)
+            ?: throw Exception("Google login did not complete — Logout button not found")
+
+        // 6. Cleanup.
+        instrumentation.logout()
+    }
+}