Move ActionData into operator

Author: Daeda88

firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -82,28 +82,28 @@ actual class AuthResult internal constructor(val android: com.google.firebase.au
 actual class ActionCodeResult(val android: com.google.firebase.auth.ActionCodeResult) {
     actual val operation: Operation
         get() = when (android.operation) {
-            com.google.firebase.auth.ActionCodeResult.PASSWORD_RESET -> Operation.PasswordReset
-            com.google.firebase.auth.ActionCodeResult.VERIFY_EMAIL -> Operation.VerifyEmail
-            com.google.firebase.auth.ActionCodeResult.RECOVER_EMAIL -> Operation.RecoverEmail
+            com.google.firebase.auth.ActionCodeResult.PASSWORD_RESET -> Operation.PasswordReset(this)
+            com.google.firebase.auth.ActionCodeResult.VERIFY_EMAIL -> Operation.VerifyEmail(this)
+            com.google.firebase.auth.ActionCodeResult.RECOVER_EMAIL -> Operation.RecoverEmail(this)
             com.google.firebase.auth.ActionCodeResult.ERROR -> Operation.Error
             com.google.firebase.auth.ActionCodeResult.SIGN_IN_WITH_EMAIL_LINK -> Operation.SignInWithEmailLink
-            com.google.firebase.auth.ActionCodeResult.VERIFY_BEFORE_CHANGE_EMAIL -> Operation.VerifyBeforeChangeEmail
-            com.google.firebase.auth.ActionCodeResult.REVERT_SECOND_FACTOR_ADDITION -> Operation.RevertSecondFactorAddition
+            com.google.firebase.auth.ActionCodeResult.VERIFY_BEFORE_CHANGE_EMAIL -> Operation.VerifyBeforeChangeEmail(this)
+            com.google.firebase.auth.ActionCodeResult.REVERT_SECOND_FACTOR_ADDITION -> Operation.RevertSecondFactorAddition(this)
             else -> Operation.Error
         }
 }
 
-actual sealed class ActionCodeDataType<out T> {
+internal actual sealed class ActionCodeDataType<out T> {
 
-    internal actual abstract fun dataForResult(result: ActionCodeResult): T?
+    actual abstract fun dataForResult(result: ActionCodeResult): T
 
     actual object Email : ActionCodeDataType<String>() {
-        override fun dataForResult(result: ActionCodeResult): String? = result.android.info?.email
+        override fun dataForResult(result: ActionCodeResult): String = result.android.info!!.email
     }
     actual object PreviousEmail : ActionCodeDataType<String>() {
-        override fun dataForResult(result: ActionCodeResult): String? = (result.android.info as? ActionCodeEmailInfo)?.previousEmail
+        override fun dataForResult(result: ActionCodeResult): String = (result.android.info as ActionCodeEmailInfo).previousEmail
     }
-    actual object MultiFactor : ActionCodeDataType<MultiFactorInfo>() {
+    actual object MultiFactor : ActionCodeDataType<MultiFactorInfo?>() {
         override fun dataForResult(result: ActionCodeResult): MultiFactorInfo? = (result.android.info as? ActionCodeMultiFactorInfo)?.multiFactorInfo?.let { MultiFactorInfo(it) }
     }
 }

firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -52,23 +52,36 @@ expect class SignInMethodQueryResult {
     val signInMethods: List<String>
 }
 
-enum class Operation {
-    PasswordReset,
-    VerifyEmail,
-    RecoverEmail,
-    Error,
-    SignInWithEmailLink,
-    VerifyBeforeChangeEmail,
-    RevertSecondFactorAddition
+sealed class Operation {
+    class PasswordReset(result: ActionCodeResult) : Operation() {
+        val email: String = ActionCodeDataType.Email.dataForResult(result)
+    }
+    class VerifyEmail(result: ActionCodeResult) : Operation() {
+        val email: String = ActionCodeDataType.Email.dataForResult(result)
+    }
+    class RecoverEmail(result: ActionCodeResult) : Operation() {
+        val email: String = ActionCodeDataType.Email.dataForResult(result)
+        val previousEmail: String = ActionCodeDataType.PreviousEmail.dataForResult(result)
+    }
+    object Error : Operation()
+    object SignInWithEmailLink : Operation()
+    class VerifyBeforeChangeEmail(result: ActionCodeResult) : Operation() {
+        val email: String = ActionCodeDataType.Email.dataForResult(result)
+        val previousEmail: String = ActionCodeDataType.PreviousEmail.dataForResult(result)
+    }
+    class RevertSecondFactorAddition(result: ActionCodeResult) : Operation() {
+        val email: String = ActionCodeDataType.Email.dataForResult(result)
+        val multiFactorInfo: MultiFactorInfo? = ActionCodeDataType.MultiFactor.dataForResult(result)
+    }
 }
 
-expect sealed class ActionCodeDataType<out T> {
+internal expect sealed class ActionCodeDataType<out T> {
 
-    internal abstract fun dataForResult(result: ActionCodeResult): T?
+    abstract fun dataForResult(result: ActionCodeResult): T
 
     object Email : ActionCodeDataType<String>
     object PreviousEmail : ActionCodeDataType<String>
-    object MultiFactor : ActionCodeDataType<MultiFactorInfo>
+    object MultiFactor : ActionCodeDataType<MultiFactorInfo?>
 }
 
 expect class ActionCodeSettings {

firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -84,28 +84,28 @@ actual class AuthResult internal constructor(val ios: FIRAuthDataResult) {
 actual class ActionCodeResult(val ios: FIRActionCodeInfo) {
     actual val operation: Operation
         get() = when (ios.operation) {
-            FIRActionCodeOperationPasswordReset -> Operation.PasswordReset
-            FIRActionCodeOperationVerifyEmail -> Operation.VerifyEmail
-            FIRActionCodeOperationRecoverEmail -> Operation.RecoverEmail
+            FIRActionCodeOperationPasswordReset -> Operation.PasswordReset(this)
+            FIRActionCodeOperationVerifyEmail -> Operation.VerifyEmail(this)
+            FIRActionCodeOperationRecoverEmail -> Operation.RecoverEmail(this)
             FIRActionCodeOperationUnknown-> Operation.Error
             FIRActionCodeOperationEmailLink -> Operation.SignInWithEmailLink
-            FIRActionCodeOperationVerifyAndChangeEmail -> Operation.VerifyBeforeChangeEmail
-            FIRActionCodeOperationRevertSecondFactorAddition -> Operation.RevertSecondFactorAddition
+            FIRActionCodeOperationVerifyAndChangeEmail -> Operation.VerifyBeforeChangeEmail(this)
+            FIRActionCodeOperationRevertSecondFactorAddition -> Operation.RevertSecondFactorAddition(this)
             else -> Operation.Error
         }
 }
 
-actual sealed class ActionCodeDataType<out T> {
+internal actual sealed class ActionCodeDataType<out T> {
 
-    internal actual abstract fun dataForResult(result: ActionCodeResult): T?
+    actual abstract fun dataForResult(result: ActionCodeResult): T
 
     actual object Email : ActionCodeDataType<String>() {
-        override fun dataForResult(result: ActionCodeResult): String? = result.ios.email
+        override fun dataForResult(result: ActionCodeResult): String = result.ios.email!!
     }
     actual object PreviousEmail : ActionCodeDataType<String>() {
-        override fun dataForResult(result: ActionCodeResult): String? = result.ios.previousEmail
+        override fun dataForResult(result: ActionCodeResult): String = result.ios.previousEmail!!
     }
-    actual object MultiFactor : ActionCodeDataType<MultiFactorInfo>() {
+    actual object MultiFactor : ActionCodeDataType<MultiFactorInfo?>() {
         override fun dataForResult(result: ActionCodeResult): MultiFactorInfo? = null
     }
 }

firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -86,27 +86,27 @@ actual class AuthResult internal constructor(val js: firebase.auth.AuthResult) {
 actual class ActionCodeResult(val js: firebase.auth.ActionCodeInfo) {
     actual val operation: Operation
         get() = when (js.operation) {
-            "PASSWORD_RESET" -> Operation.PasswordReset
-            "VERIFY_EMAIL" -> Operation.VerifyEmail
-            "RECOVER_EMAIL" -> Operation.RecoverEmail
+            "PASSWORD_RESET" -> Operation.PasswordReset(this)
+            "VERIFY_EMAIL" -> Operation.VerifyEmail(this)
+            "RECOVER_EMAIL" -> Operation.RecoverEmail(this)
             "EMAIL_SIGNIN" -> Operation.SignInWithEmailLink
-            "VERIFY_AND_CHANGE_EMAIL" -> Operation.VerifyBeforeChangeEmail
-            "REVERT_SECOND_FACTOR_ADDITION" -> Operation.RevertSecondFactorAddition
+            "VERIFY_AND_CHANGE_EMAIL" -> Operation.VerifyBeforeChangeEmail(this)
+            "REVERT_SECOND_FACTOR_ADDITION" -> Operation.RevertSecondFactorAddition(this)
             else -> Operation.Error
         }
 }
 
-actual sealed class ActionCodeDataType<out T> {
+internal actual sealed class ActionCodeDataType<out T> {
 
-    internal actual abstract fun dataForResult(result: ActionCodeResult): T?
+    actual abstract fun dataForResult(result: ActionCodeResult): T
 
     actual object Email : ActionCodeDataType<String>() {
-        override fun dataForResult(result: ActionCodeResult): String? = result.js.data.email
+        override fun dataForResult(result: ActionCodeResult): String = result.js.data.email!!
     }
     actual object PreviousEmail : ActionCodeDataType<String>() {
-        override fun dataForResult(result: ActionCodeResult): String? = result.js.data.previousEmail
+        override fun dataForResult(result: ActionCodeResult): String = result.js.data.previousEmail!!
     }
-    actual object MultiFactor : ActionCodeDataType<MultiFactorInfo>() {
+    actual object MultiFactor : ActionCodeDataType<MultiFactorInfo?>() {
         override fun dataForResult(result: ActionCodeResult): MultiFactorInfo? = result.js.data.multiFactorInfo?.let { MultiFactorInfo(it) }
     }
 }