feat: Verify email with app (#2037)

Author: liveHarshit

app/build.gradle

@@ -37,17 +37,15 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             buildConfigField "String", "DEFAULT_BASE_URL", '"https://api.eventyay.com/v1/"'
-            buildConfigField "String", "FRONTEND_URL", '"https://eventyay.com/"'
             buildConfigField "String", "MAPBOX_KEY", '"'+MAPBOX_KEY+'"'
             buildConfigField "String", "STRIPE_API_KEY", '"'+STRIPE_API_TOKEN+'"'
             resValue "string",  "FRONTEND_HOST", "eventyay.com"
         }
         debug {
             buildConfigField "String", "DEFAULT_BASE_URL", '"https://open-event-api-dev.herokuapp.com/v1/"'
-            buildConfigField "String", "FRONTEND_URL", '"https://fossasia.github.io/open-event-frontend/"'
             buildConfigField "String", "MAPBOX_KEY", '"'+MAPBOX_KEY+'"'
             buildConfigField "String", "STRIPE_API_KEY", '"'+STRIPE_API_TOKEN+'"'
-            resValue "string", "FRONTEND_HOST", "fossasia.github.io/open-event-frontend"
+            resValue "string", "FRONTEND_HOST", "open-event-fe.netlify.com"
         }
     }
 

app/src/main/AndroidManifest.xml

@@ -34,8 +34,7 @@
 
                 <data
                     android:scheme="https"
-                    android:host="@string/FRONTEND_HOST"
-                    android:pathPrefix="/e/" />
+                    android:host="@string/FRONTEND_HOST"/>
             </intent-filter>
         </activity>
         <provider
@@ -45,7 +44,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_provider"/>
+                android:resource="@xml/file_provider" />
         </provider>
         <service
             android:name="org.fossasia.openevent.general.order.invoice.DownloadInvoiceService"

app/src/main/java/org/fossasia/openevent/general/MainActivity.kt

@@ -20,6 +20,9 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 
 const val PLAY_STORE_BUILD_FLAVOR = "playStore"
 const val EVENT_IDENTIFIER = "eventIdentifier"
+const val VERIFICATION_TOKEN = "verificationToken"
+private const val VERIFY = "verify"
+private const val TOKEN = "token"
 
 class MainActivity : AppCompatActivity() {
     private lateinit var navController: NavController
@@ -52,8 +55,13 @@ class MainActivity : AppCompatActivity() {
         val appLinkData = intent?.data
         if (appLinkData != null) {
             val bundle = Bundle()
-            bundle.putString(EVENT_IDENTIFIER, appLinkData.lastPathSegment)
-            navController.navigate(R.id.eventDetailsFragment, bundle)
+            if (appLinkData.lastPathSegment == VERIFY) {
+                bundle.putString(VERIFICATION_TOKEN, appLinkData.getQueryParameter(TOKEN))
+                navController.navigate(R.id.profileFragment, bundle)
+            } else {
+                bundle.putString(EVENT_IDENTIFIER, appLinkData.lastPathSegment)
+                navController.navigate(R.id.eventDetailsFragment, bundle)
+            }
         }
     }
 

app/src/main/java/org/fossasia/openevent/general/auth/AuthApi.kt

@@ -39,5 +39,8 @@ interface AuthApi {
     fun checkEmail(@Body email: Email): Single<CheckEmailResponse>
 
     @POST("auth/resend-verification-email")
-    fun resendVerificationEmail(@Body requestToken: RequestToken): Single<ResendVerificationEmailResponse>
+    fun resendVerificationEmail(@Body requestToken: RequestToken): Single<EmailVerificationResponse>
+
+    @POST("auth/verify-email")
+    fun verifyEmail(@Body requestEmailVerification: RequestEmailVerification): Single<EmailVerificationResponse>
 }

app/src/main/java/org/fossasia/openevent/general/auth/AuthService.kt

@@ -98,7 +98,11 @@ class AuthService(
         return authApi.checkEmail(Email(email))
     }
 
-    fun resendVerificationEmail(email: String): Single<ResendVerificationEmailResponse> {
+    fun resendVerificationEmail(email: String): Single<EmailVerificationResponse> {
         return authApi.resendVerificationEmail(RequestToken(Email(email)))
     }
+
+    fun verifyEmail(token: String): Single<EmailVerificationResponse> {
+        return authApi.verifyEmail(RequestEmailVerification(Token(token)))
+    }
 }

app/src/main/java/org/fossasia/openevent/general/auth/ResendVerificationEmailResponse.kt renamed to app/src/main/java/org/fossasia/openevent/general/auth/EmailVerificationResponse.kt

@@ -1,5 +1,5 @@
 package org.fossasia.openevent.general.auth
 
-class ResendVerificationEmailResponse(
+class EmailVerificationResponse(
     val message: String? = null
 )

app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt

@@ -40,6 +40,7 @@ import org.fossasia.openevent.general.CircleTransform
 import org.fossasia.openevent.general.PLAY_STORE_BUILD_FLAVOR
 import org.fossasia.openevent.general.R
 import org.fossasia.openevent.general.BottomIconDoubleClick
+import org.fossasia.openevent.general.VERIFICATION_TOKEN
 import org.fossasia.openevent.general.utils.Utils
 import org.fossasia.openevent.general.utils.Utils.requireDrawable
 import org.fossasia.openevent.general.utils.extensions.nonNull
@@ -92,6 +93,10 @@ class ProfileFragment : Fragment(), BottomIconDoubleClick {
             profileViewModel.syncProfile()
         }
 
+        val token = arguments?.getString(VERIFICATION_TOKEN)
+        if (token != null)
+            profileViewModel.verifyProfile(token)
+
         val progressDialog = progressDialog(context, getString(R.string.loading_message))
         profileViewModel.progress
             .nonNull()

app/src/main/java/org/fossasia/openevent/general/auth/ProfileViewModel.kt

@@ -95,6 +95,22 @@ class ProfileViewModel(private val authService: AuthService, private val resourc
             }
     }
 
+    fun verifyProfile(token: String) {
+        compositeDisposable += authService.verifyEmail(token)
+            .withDefaultSchedulers()
+            .doOnSubscribe {
+                mutableProgress.value = true
+            }.doFinally {
+                mutableProgress.value = false
+            }.subscribe({
+                mutableMessage.value = it.message
+                syncProfile()
+            }) {
+                Timber.e(it, "Error in verifying email")
+                mutableMessage.value = resource.getString(R.string.verification_error_message)
+            }
+    }
+
     override fun onCleared() {
         super.onCleared()
         compositeDisposable.clear()

app/src/main/java/org/fossasia/openevent/general/auth/RequestEmailVerification.kt

@@ -0,0 +1,3 @@
+package org.fossasia.openevent.general.auth
+
+data class RequestEmailVerification(val data: Token)

app/src/main/java/org/fossasia/openevent/general/auth/Token.kt

@@ -0,0 +1,3 @@
+package org.fossasia.openevent.general.auth
+
+data class Token(val token: String)