Fixes typecasting issues and revert fixes for CI tests failure

NandanPrabhu · NandanPrabhu · commit 705c046dc19b · 2026-06-12T17:24:08.000+05:30
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ concurrency:
 env:
     ruby: '3.3.1'
     flutter: '3.x'
-    ios-simulator: iPhone 17
+    ios-simulator: iPhone 16
     java: 17
 
 jobs:
diff --git a/auth0_flutter/android/src/main/kotlin/com/auth0/auth0_flutter/Auth0FlutterPlugin.kt b/auth0_flutter/android/src/main/kotlin/com/auth0/auth0_flutter/Auth0FlutterPlugin.kt
@@ -187,8 +187,6 @@ class Auth0FlutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
   }
 
   override fun onDetachedFromActivityForConfigChanges() {
-    webAuthCallHandler.activity = null
-    credentialsManagerCallHandler.activity = null
     WebAuthProvider.removeCallback(processDeathCallback)
   }
 
@@ -199,8 +197,6 @@ class Auth0FlutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
   }
 
   override fun onDetachedFromActivity() {
-    webAuthCallHandler.activity = null
-    credentialsManagerCallHandler.activity = null
     WebAuthProvider.removeCallback(processDeathCallback)
   }
 }
diff --git a/auth0_flutter/android/src/main/kotlin/com/auth0/auth0_flutter/Auth0FlutterWebAuthMethodCallHandler.kt b/auth0_flutter/android/src/main/kotlin/com/auth0/auth0_flutter/Auth0FlutterWebAuthMethodCallHandler.kt
@@ -9,17 +9,15 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
 
 class Auth0FlutterWebAuthMethodCallHandler(private val requestHandlers: List<WebAuthRequestHandler>) : MethodCallHandler {
-    // Null while the plugin is detached from an Activity (see ActivityAware
-    // callbacks in Auth0FlutterPlugin).
-    var activity: Activity? = null
+   lateinit var activity: Activity
 
     override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
         val requestHandler = requestHandlers.find { it.method == call.method }
 
         if (requestHandler != null) {
             val request = MethodCallRequest.fromCall(call)
 
-            requestHandler.handle(activity!!, request, result)
+            requestHandler.handle(activity, request, result)
         } else {
             result.notImplemented()
         }
diff --git a/auth0_flutter/android/src/main/kotlin/com/auth0/auth0_flutter/request_handlers/api/PasskeyCredentialExchangeApiRequestHandler.kt b/auth0_flutter/android/src/main/kotlin/com/auth0/auth0_flutter/request_handlers/api/PasskeyCredentialExchangeApiRequestHandler.kt
@@ -36,7 +36,8 @@ class PasskeyCredentialExchangeApiRequestHandler : ApiRequestHandler {
 
         assertHasProperties(listOf("challenge.authSession", "credential"), args)
 
-        val authSession = (args["challenge"] as Map<*, *>)["authSession"] as String
+        val challenge = args["challenge"] as Map<*, *>
+        val authSession = challenge["authSession"] as String
         val credentialMap = args["credential"] as Map<*, *>
 
         val connection = args["connection"] as? String
diff --git a/auth0_flutter/android/src/main/kotlin/com/auth0/auth0_flutter/request_handlers/api/PasskeySignupChallengeApiRequestHandler.kt b/auth0_flutter/android/src/main/kotlin/com/auth0/auth0_flutter/request_handlers/api/PasskeySignupChallengeApiRequestHandler.kt
@@ -24,8 +24,9 @@ class PasskeySignupChallengeApiRequestHandler : ApiRequestHandler {
         val connection = args["connection"] as? String
         val organization = args["organization"] as? String
 
-        @Suppress("UNCHECKED_CAST")
-        val userMetadata = args["userMetadata"] as? Map<String, String>
+        val userMetadata = (args["userMetadata"] as? Map<*, *>)
+            ?.mapKeys { it.key.toString() }
+            ?.mapValues { it.value.toString() }
         val userData = UserData(
             email = args["email"] as? String,
             phoneNumber = args["phoneNumber"] as? String,
diff --git a/auth0_flutter/darwin/.gitignore b/auth0_flutter/darwin/.gitignore
@@ -12,10 +12,6 @@ build/
 GeneratedPluginRegistrant.h
 GeneratedPluginRegistrant.m
 
-# Swift Package Manager build cache
-.build/
-.swiftpm/
-
 .generated/
 
 *.pbxuser
diff --git a/auth0_flutter/example/android/gradle.properties b/auth0_flutter/example/android/gradle.properties
@@ -7,7 +7,3 @@ org.gradle.jvmargs=-Xmx1536M \
 android.useAndroidX=true
 android.enableJetifier=true
 android.jetifier.ignorelist=bcprov-jdk15on
-# This builtInKotlin flag was added automatically by Flutter migrator
-android.builtInKotlin=false
-# This newDsl flag was added automatically by Flutter migrator
-android.newDsl=false
diff --git a/auth0_flutter/example/android/settings.gradle b/auth0_flutter/example/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.6.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
+    id "com.android.application" version "8.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
 }
 
 include ':app'
diff --git a/auth0_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/auth0_flutter/example/ios/Runner.xcodeproj/project.pbxproj
@@ -1116,7 +1116,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerDebug.entitlements;
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
diff --git a/auth0_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/auth0_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "NO"
       codeCoverageEnabled = "YES">
       <MacroExpansion>
@@ -77,13 +76,11 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/auth0_flutter/example/lib/example_app.dart b/auth0_flutter/example/lib/example_app.dart
@@ -77,7 +77,7 @@ class _ExampleAppState extends State<ExampleApp> {
           _isLoggedIn = true;
         });
 
-        output = result.idToken.replaceAll(RegExp('.'), '*');
+        output = result.idToken.replaceAll(RegExp(r'.'), '*');
       }
     } catch (e) {
       output = e.toString();
@@ -231,9 +231,8 @@ class _ExampleAppState extends State<ExampleApp> {
           'Session Transfer Token: ${token.substring(0, 20)}...\n'
           'Token Type: ${ssoCredentials.tokenType}\n'
           'Expires In: ${ssoCredentials.expiresIn}s\n'
-          'ID Token: ****\n'
-          'Refresh Token: '
-          '${ssoCredentials.refreshToken != null ? '****' : 'N/A'}';
+          'ID Token: ${ssoCredentials.idToken != null ? '****' : 'N/A'}\n'
+          'Refresh Token: ${ssoCredentials.refreshToken != null ? '****' : 'N/A'}';
     } on CredentialsManagerException catch (e) {
       output = 'SSO Error: ${e.code}\n${e.message}';
     } catch (e) {
diff --git a/auth0_flutter/ios/.gitignore b/auth0_flutter/ios/.gitignore
@@ -12,10 +12,6 @@ build/
 GeneratedPluginRegistrant.h
 GeneratedPluginRegistrant.m
 
-# Swift Package Manager build cache
-.build/
-.swiftpm/
-
 .generated/
 
 *.pbxuser
diff --git a/auth0_flutter/macos/.gitignore b/auth0_flutter/macos/.gitignore
@@ -12,10 +12,6 @@ build/
 GeneratedPluginRegistrant.h
 GeneratedPluginRegistrant.m
 
-# Swift Package Manager build cache
-.build/
-.swiftpm/
-
 .generated/
 
 *.pbxuser

Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,6 @@ class Auth0FlutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`override fun onDetachedFromActivityForConfigChanges() {`
`190`		`- webAuthCallHandler.activity = null`
`191`		`- credentialsManagerCallHandler.activity = null`
`192`	`190`	`WebAuthProvider.removeCallback(processDeathCallback)`
`193`	`191`	`}`
`194`	`192`
`@@ -199,8 +197,6 @@ class Auth0FlutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {`
`199`	`197`	`}`
`200`	`198`
`201`	`199`	`override fun onDetachedFromActivity() {`
`202`		`- webAuthCallHandler.activity = null`
`203`		`- credentialsManagerCallHandler.activity = null`
`204`	`200`	`WebAuthProvider.removeCallback(processDeathCallback)`
`205`	`201`	`}`
`206`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`		`- id "com.android.application" version "8.6.0" apply false`
`22`		`- id "org.jetbrains.kotlin.android" version "1.9.22" apply false`
	`21`	`+ id "com.android.application" version "8.3.0" apply false`
	`22`	`+ id "org.jetbrains.kotlin.android" version "1.9.10" apply false`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`include ':app'`