-
Notifications
You must be signed in to change notification settings - Fork 990
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MBL-1776: When getting a new Push Token from Firebase, register it on…
… the backend endpoint again (#2148)
- Loading branch information
Showing
3 changed files
with
198 additions
and
81 deletions.
There are no files selected for viewing
81 changes: 0 additions & 81 deletions
81
app/src/main/java/com/kickstarter/services/firebase/MessageService.java
This file was deleted.
Oops, something went wrong.
122 changes: 122 additions & 0 deletions
122
app/src/main/java/com/kickstarter/services/firebase/MessageService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
package com.kickstarter.services.firebase | ||
|
||
import android.text.TextUtils | ||
import com.google.firebase.crashlytics.FirebaseCrashlytics | ||
import com.google.firebase.messaging.FirebaseMessagingService | ||
import com.google.firebase.messaging.RemoteMessage | ||
import com.google.gson.Gson | ||
import com.kickstarter.KSApplication | ||
import com.kickstarter.R | ||
import com.kickstarter.libs.PushNotifications | ||
import com.kickstarter.libs.braze.RemotePushClientType | ||
import com.kickstarter.models.pushdata.Activity | ||
import com.kickstarter.models.pushdata.GCM | ||
import com.kickstarter.services.ApiClientTypeV2 | ||
import com.kickstarter.services.ApiException | ||
import com.kickstarter.services.apiresponses.PushNotificationEnvelope | ||
import com.kickstarter.services.apiresponses.PushNotificationEnvelope.Companion.builder | ||
import com.kickstarter.services.apiresponses.PushNotificationEnvelope.ErroredPledge | ||
import com.kickstarter.services.apiresponses.PushNotificationEnvelope.Survey | ||
import timber.log.Timber | ||
import javax.inject.Inject | ||
|
||
interface RefreshPushToken { | ||
companion object { | ||
val OK_MESSAGE = "Push Token refreshed onNewToken: " | ||
val KO_MESSAGE = "Failed to register Push Token: " | ||
} | ||
fun invoke(apiClient: ApiClientTypeV2, newToken: String, gson: Gson, successCallback: (String) -> Unit, errorCallback: (String) -> Unit) { | ||
try { | ||
val response = apiClient.registerPushToken(newToken).blockingSingle() | ||
val message = "$OK_MESSAGE $response" | ||
successCallback.invoke(message) | ||
} catch (exception: ApiException) { | ||
val errorMessage = "$KO_MESSAGE ${ | ||
exception.errorEnvelope().errorMessage() | ||
}" | ||
if (exception.errorEnvelope().httpCode() != 401) // else OAuth token not authorized | ||
errorCallback.invoke(errorMessage) | ||
} | ||
} | ||
} | ||
|
||
class MessageService : FirebaseMessagingService() { | ||
|
||
@Inject | ||
lateinit var pushNotifications: PushNotifications | ||
|
||
@Inject | ||
lateinit var remotePushClientType: RemotePushClientType | ||
|
||
@Inject | ||
lateinit var apiClient: ApiClientTypeV2 | ||
|
||
@Inject | ||
lateinit var gson: Gson | ||
|
||
override fun onNewToken(s: String) { | ||
super.onNewToken(s) | ||
val refreshHandler = object : RefreshPushToken {} | ||
refreshHandler.invoke( | ||
apiClient = apiClient, | ||
newToken = s, | ||
gson = gson, | ||
successCallback = { message -> FirebaseCrashlytics.getInstance().log(message) }, | ||
errorCallback = { errorMessage -> FirebaseCrashlytics.getInstance().recordException(Exception(errorMessage)) } | ||
) | ||
} | ||
|
||
override fun onCreate() { | ||
super.onCreate() | ||
(applicationContext as KSApplication).component().inject(this) | ||
} | ||
|
||
/** | ||
* Called when a message is received from Firebase. | ||
* - If the message comes from braze it will be handle on: | ||
* - @see RemotePushClientType#handleRemoteMessages(android.content.Context, com.google.firebase.messaging.RemoteMessage) | ||
* - If the message is from Kickstarter it will be process here | ||
* | ||
* @param remoteMessage Object containing message information. | ||
*/ | ||
override fun onMessageReceived(remoteMessage: RemoteMessage) { | ||
super.onMessageReceived(remoteMessage) | ||
val isBrazeMessage = | ||
remotePushClientType.handleRemoteMessages(this, remoteMessage) | ||
|
||
if (!isBrazeMessage) { | ||
val senderId = getString(R.string.gcm_defaultSenderId) | ||
val from = remoteMessage.from | ||
if (!TextUtils.equals(from, senderId)) { | ||
Timber.e("Received a message from %s, expecting %s", from, senderId) | ||
return | ||
} | ||
|
||
val data = remoteMessage.data | ||
|
||
val envelope = builder() | ||
.activity( | ||
gson.fromJson( | ||
data["activity"], Activity::class.java | ||
) | ||
) | ||
.erroredPledge(gson.fromJson(data["errored_pledge"], ErroredPledge::class.java)) | ||
.gcm(gson.fromJson(data["gcm"], GCM::class.java)) | ||
.message( | ||
gson.fromJson( | ||
data["message"], PushNotificationEnvelope.Message::class.java | ||
) | ||
) | ||
.project( | ||
gson.fromJson( | ||
data["project"], PushNotificationEnvelope.Project::class.java | ||
) | ||
) | ||
.survey(gson.fromJson(data["survey"], Survey::class.java)) | ||
.build() | ||
|
||
Timber.d("Received message: %s", envelope.toString()) | ||
pushNotifications.add(envelope) | ||
} | ||
} | ||
} |
76 changes: 76 additions & 0 deletions
76
app/src/test/java/com/kickstarter/services/RegisterPushTokenTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
package com.kickstarter.services | ||
|
||
import com.google.gson.Gson | ||
import com.google.gson.JsonObject | ||
import com.kickstarter.KSRobolectricTestCase | ||
import com.kickstarter.mock.factories.ApiExceptionFactory | ||
import com.kickstarter.mock.services.MockApiClientV2 | ||
import com.kickstarter.services.firebase.RefreshPushToken | ||
import com.kickstarter.services.firebase.RefreshPushToken.Companion.KO_MESSAGE | ||
import com.kickstarter.services.firebase.RefreshPushToken.Companion.OK_MESSAGE | ||
import io.reactivex.Observable | ||
import org.junit.Test | ||
|
||
class RegisterPushTokenTest : KSRobolectricTestCase() { | ||
|
||
@Test | ||
fun `test with successful response for registerPushToken api call`() { | ||
val jObj = JsonObject() | ||
|
||
val apiClient = object : MockApiClientV2() { | ||
override fun registerPushToken(token: String): Observable<JsonObject> { | ||
jObj.addProperty("token", token) | ||
return Observable.just(jObj) | ||
} | ||
} | ||
|
||
val refreshPushToken = object : RefreshPushToken {} | ||
|
||
var successMessage = "" | ||
var error = "" | ||
refreshPushToken.invoke( | ||
apiClient = apiClient, | ||
newToken = "a new Token!!", | ||
gson = Gson(), | ||
successCallback = { message -> | ||
successMessage = message | ||
}, | ||
errorCallback = { errorMessage -> | ||
error = errorMessage | ||
} | ||
) | ||
|
||
assertTrue(error.isEmpty()) | ||
assert(successMessage == "$OK_MESSAGE $jObj") | ||
} | ||
|
||
@Test | ||
fun `test with errored response for registerPushToken api call`() { | ||
|
||
val apiClient = object : MockApiClientV2() { | ||
override fun registerPushToken(token: String): Observable<JsonObject> { | ||
return Observable.error(ApiExceptionFactory.badRequestException()) | ||
} | ||
} | ||
|
||
val refreshPushToken = object : RefreshPushToken {} | ||
|
||
var successMessage = "" | ||
var error = "" | ||
refreshPushToken.invoke( | ||
apiClient = apiClient, | ||
newToken = "a new Token!!", | ||
gson = Gson(), | ||
successCallback = { message -> | ||
successMessage = message | ||
}, | ||
errorCallback = { errorMessage -> | ||
error = errorMessage | ||
} | ||
) | ||
|
||
assertTrue(successMessage.isEmpty()) | ||
val messageToAssert = "$KO_MESSAGE ${ApiExceptionFactory.badRequestException().errorEnvelope().errorMessage()}" | ||
assertEquals(error, messageToAssert) | ||
} | ||
} |