Migrate plugin to null safety (#45)

* updated dependencies

* Updated dependencies

* migrated firebase_auth_oauth_platform_interface

* migrated firebase_auth_oauth_web

* migrated firebase_auth_oauth

* updated example

* fixed premature invocation for Firebase.app that's happening before Firebase.initialise() is called

* Update minimum version to iOS 10

* Updated Android to include androidx.browser dependency and added queries to manifest

* published platform_interface

* published web

* published plugin update

* Updated gitignore

Author: amrfarid140

.gitignore

@@ -7,4 +7,4 @@
 build/
 *.iml
 .flutter-plugins
-
+*.lock

README.md

@@ -15,9 +15,9 @@ OAuth flows are performed by opening pop-up on top of the application to allow t
 dependencies:
   flutter:
     sdk: flutter
-  firebase_auth: ^0.20.0+1
-  firebase_core: ^0.7.0
-  firebase_auth_oauth: ^0.2.4
+  firebase_auth: ^1.0.0
+  firebase_core: ^1.0.0
+  firebase_auth_oauth: ^1.0.0
 ```
 
 - Then in your project just call

firebase_auth_oauth/CHANGELOG.md

@@ -1,53 +1,73 @@
+## 1.0.0
+
+* Migrated to null safety
+* Updated `firebase_auth` to Version ^1.0.0
+* Updated `firebase_core` to Version ^1.0.0
+
 ## 0.2.4
+
 * Updated `firebase_auth` to Version ^0.20.0+1
 * Updated `firebase_core` to Version ^0.7.0
 
 ## 0.2.3
+
 * Replace CryptoKit pod with Apple's CryptoKit framework
 
 ## 0.2.2
-* Fixed crash on iOS when using Microsoft sign in. Thanks
-  to [@camillobucciarelli](https://github.com/camillobucciarelli).
+
+* Fixed crash on iOS when using Microsoft sign in. Thanks to [@camillobucciarelli](https://github.com/camillobucciarelli).
 
 ## 0.2.1
 * Fixed Firebase not initialised issue when using this plugin
 
 ## 0.2.0
+
 * Migrated to `firebase_auth` ^0.18.0+1
 * Migrated to `firebase_auth` ^0.5.0
 * Added `linkExistingUserWithCredentials` to link existing user with OAuth credentials
 
 ## 0.1.1+1
+
 * Fixed type in README
 
 ## 0.1.1
+
 * Improved error handling across iOS and Android
 * Consistent error behaviour across platforms
 
 ## 0.1.0+8
+
 * Updated firebase_auth to Version ^0.16.1
 * Updated firebase_core to Version ^0.4.5
 
 ## 0.1.0+7
+
 * Updated firebase_auth to Version ^0.16.0
 
 ## 0.1.0+6
+
 * Downgraded Firebase version 0.15.3
 
 ## 0.1.0+5
+
 * Use Firebase version 0.15.4
 
 ## 0.1.0+4
+
 * Updated Firebase version
 
 ## 0.1.0+3
+
 * Updated example
 
 ## 0.1.0+2
+
 * Fix release builds on iOS
 
 ## 0.1.0+1
+
 * Fix builds on iOS
 
 ## 0.1.0
+
 * Initial release

firebase_auth_oauth/README.md

@@ -15,9 +15,9 @@ OAuth flows are performed by opening pop-up on top of the application to allow t
 dependencies:
   flutter:
     sdk: flutter
-  firebase_auth: ^0.20.0+1
-  firebase_core: ^0.7.0
-  firebase_auth_oauth: ^0.2.4
+  firebase_auth: ^1.0.0
+  firebase_core: ^1.0.0
+  firebase_auth_oauth: ^1.0.0
 ```
 
 - Then in your project just call

firebase_auth_oauth/android/build.gradle

@@ -42,5 +42,6 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.firebase:firebase-auth'
+    implementation "androidx.browser:browser:1.3.0"
     implementation 'com.google.code.gson:gson:2.8.6'
 }

firebase_auth_oauth/android/src/main/AndroidManifest.xml

@@ -1,3 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="me.amryousef.apple.auth.firebase_apple_auth">
+
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https" />
+        </intent>
+    </queries>
 </manifest>

firebase_auth_oauth/android/src/main/kotlin/me/amryousef/apple/auth/firebase_auth_oauth/FirebaseAuthOAuthPlugin.kt

@@ -18,30 +18,36 @@ import io.flutter.plugin.common.PluginRegistry.Registrar
 
 
 /** FirebaseAppleAuthPlugin */
-@Suppress("DEPRECATION")
 class FirebaseAuthOAuthPlugin : FlutterPlugin, ActivityAware, MethodCallHandler {
 
     private var activity: Activity? = null
 
     override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-        val channel = MethodChannel(flutterPluginBinding.flutterEngine.dartExecutor, "me.amryousef.apple.auth/firebase_auth_oauth")
+        val channel = MethodChannel(
+            flutterPluginBinding.binaryMessenger,
+            "me.amryousef.apple.auth/firebase_auth_oauth"
+        )
         channel.setMethodCallHandler(this)
     }
 
     companion object {
         private const val CREATE_USER_METHOD = "openSignInFlow"
         private const val LINK_USER_METHOD = "linkExistingUserWithCredentials"
 
-        @Suppress("unused")
+        @Suppress("unused", "deprecation")
         @JvmStatic
         fun registerWith(registrar: Registrar) {
-            val channel = MethodChannel(registrar.messenger(), "me.amryousef.apple.auth/firebase_auth_oauth")
-            channel.setMethodCallHandler(FirebaseAuthOAuthPlugin().apply { activity = registrar.activity() })
+            val channel =
+                MethodChannel(registrar.messenger(), "me.amryousef.apple.auth/firebase_auth_oauth")
+            channel.setMethodCallHandler(FirebaseAuthOAuthPlugin().apply {
+                activity = registrar.activity()
+            })
         }
     }
 
     override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
-        val providerBuilder = call.argument<String>("provider")?.let { OAuthProvider.newBuilder(it) }
+        val providerBuilder =
+            call.argument<String>("provider")?.let { OAuthProvider.newBuilder(it) }
         if (providerBuilder == null) {
             FirebaseAuthOAuthPluginError
                 .PluginError("Provider argument cannot be null")
@@ -62,7 +68,8 @@ class FirebaseAuthOAuthPlugin : FlutterPlugin, ActivityAware, MethodCallHandler
             providerBuilder.addCustomParameters(
                 gson.fromJson<Map<String, String>>(
                     it,
-                    object : TypeToken<Map<String, String>>() {}.type)
+                    object : TypeToken<Map<String, String>>() {}.type
+                )
             )
         }
         val provider = providerBuilder.build()
@@ -77,7 +84,8 @@ class FirebaseAuthOAuthPlugin : FlutterPlugin, ActivityAware, MethodCallHandler
                 FirebaseAuthOAuthPluginError
                     .FirebaseAuthError(error)
                     .toResult(result)
-            } ?: auth.startActivityForSignInWithProvider(it, provider).addOnSuccessListener { authResult ->
+            } ?: auth.startActivityForSignInWithProvider(it, provider)
+                .addOnSuccessListener { authResult ->
                     if (call.method == CREATE_USER_METHOD) {
                         result.success("")
                         return@addOnSuccessListener
@@ -91,17 +99,18 @@ class FirebaseAuthOAuthPlugin : FlutterPlugin, ActivityAware, MethodCallHandler
                         user?.linkWithCredential(authResult.credential!!)
                     }
                 }.addOnFailureListener { error ->
-                    FirebaseAuthOAuthPluginError
-                        .FirebaseAuthError(error)
-                        .toResult(result)
-                }
+                FirebaseAuthOAuthPluginError
+                    .FirebaseAuthError(error)
+                    .toResult(result)
+            }
         }
     }
 
     override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
     }
 
     override fun onDetachedFromActivity() {
+        activity = null
     }
 
     override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
@@ -113,5 +122,6 @@ class FirebaseAuthOAuthPlugin : FlutterPlugin, ActivityAware, MethodCallHandler
     }
 
     override fun onDetachedFromActivityForConfigChanges() {
+        activity = null
     }
 }

firebase_auth_oauth/example/android/app/src/main/AndroidManifest.xml

@@ -7,24 +7,25 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="firebase_apple_auth_example"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:label="firebase_apple_auth_example">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
+            android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
     </application>
 </manifest>

firebase_auth_oauth/example/android/build.gradle

@@ -1,8 +1,8 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.4.20'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -15,7 +15,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

firebase_auth_oauth/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Sep 05 09:11:23 BST 2020
+#Sat Mar 06 11:26:02 GMT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME

firebase_auth_oauth/example/ios/Flutter/Debug.xcconfig

@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

firebase_auth_oauth/example/ios/Flutter/Release.xcconfig

@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

firebase_auth_oauth/example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '9.0'
+platform :ios, '10.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'