Add jwt in some backend services and operation executors

Author: jinliu9508

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

@@ -7,7 +7,9 @@
 import androidx.annotation.Nullable;
 import androidx.multidex.MultiDexApplication;
 
+import com.onesignal.IUserJwtInvalidatedListener;
 import com.onesignal.OneSignal;
+import com.onesignal.UserJwtInvalidatedEvent;
 import com.onesignal.inAppMessages.IInAppMessageClickListener;
 import com.onesignal.inAppMessages.IInAppMessageClickEvent;
 import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent;
@@ -126,6 +128,13 @@ public void onUserStateChange(@NonNull UserChangedState state) {
             }
         });
 
+        OneSignal.addUserJwtInvalidatedListner(new IUserJwtInvalidatedListener() {
+            @Override
+            public void onUserJwtInvalidated(@NonNull UserJwtInvalidatedEvent event) {
+                Log.v(Tag.LOG_TAG, "onUserJwtInvalidated fired with ID:" + event.getExternal_id());
+            }
+        });
+
         OneSignal.getInAppMessages().setPaused(true);
         OneSignal.getLocation().setShared(false);
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/IHttpClient.kt

@@ -18,6 +18,7 @@ interface IHttpClient {
     suspend fun post(
         url: String,
         body: JSONObject,
+        jwt: String? = null
     ): HttpResponse
 
     /**
@@ -34,6 +35,7 @@ interface IHttpClient {
     suspend fun get(
         url: String,
         cacheKey: String? = null,
+        jwt: String? = null
     ): HttpResponse
 
     /**
@@ -47,6 +49,7 @@ interface IHttpClient {
     suspend fun put(
         url: String,
         body: JSONObject,
+        jwt: String? = null
     ): HttpResponse
 
     /**
@@ -60,6 +63,7 @@ interface IHttpClient {
     suspend fun patch(
         url: String,
         body: JSONObject,
+        jwt: String? = null
     ): HttpResponse
 
     /**
@@ -69,7 +73,10 @@ interface IHttpClient {
      *
      * @return The response returned.
      */
-    suspend fun delete(url: String): HttpResponse
+    suspend fun delete(
+        url: String,
+        jwt: String? = null
+    ): HttpResponse
 }
 
 /**

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/http/impl/HttpClient.kt

@@ -33,33 +33,40 @@ internal class HttpClient(
     override suspend fun post(
         url: String,
         body: JSONObject,
+        jwt: String?,
     ): HttpResponse {
-        return makeRequest(url, "POST", body, _configModelStore.model.httpTimeout, null)
+        return makeRequest(url, "POST", body, _configModelStore.model.httpTimeout, null, jwt)
     }
 
     override suspend fun get(
         url: String,
         cacheKey: String?,
+        jwt: String?,
     ): HttpResponse {
-        return makeRequest(url, null, null, _configModelStore.model.httpGetTimeout, cacheKey)
+        return makeRequest(url, null, null, _configModelStore.model.httpGetTimeout, cacheKey, jwt)
     }
 
     override suspend fun put(
         url: String,
         body: JSONObject,
+        jwt: String?,
     ): HttpResponse {
-        return makeRequest(url, "PUT", body, _configModelStore.model.httpTimeout, null)
+        return makeRequest(url, "PUT", body, _configModelStore.model.httpTimeout, null, jwt)
     }
 
     override suspend fun patch(
         url: String,
         body: JSONObject,
+        jwt: String?,
     ): HttpResponse {
-        return makeRequest(url, "PATCH", body, _configModelStore.model.httpTimeout, null)
+        return makeRequest(url, "PATCH", body, _configModelStore.model.httpTimeout, null, jwt)
     }
 
-    override suspend fun delete(url: String): HttpResponse {
-        return makeRequest(url, "DELETE", null, _configModelStore.model.httpTimeout, null)
+    override suspend fun delete(
+        url: String,
+        jwt: String?,
+    ): HttpResponse {
+        return makeRequest(url, "DELETE", null, _configModelStore.model.httpTimeout, null, jwt)
     }
 
     private suspend fun makeRequest(
@@ -68,6 +75,7 @@ internal class HttpClient(
         jsonBody: JSONObject?,
         timeout: Int,
         cacheKey: String?,
+        jwt: String? = null
     ): HttpResponse {
         // If privacy consent is required but not yet given, any non-GET request should be blocked.
         if (method != null && _configModelStore.model.consentRequired == true && _configModelStore.model.consentGiven != true) {
@@ -79,7 +87,7 @@ internal class HttpClient(
 
         try {
             return withTimeout(getThreadTimeout(timeout).toLong()) {
-                return@withTimeout makeRequestIODispatcher(url, method, jsonBody, timeout, cacheKey)
+                return@withTimeout makeRequestIODispatcher(url, method, jsonBody, timeout, cacheKey, jwt)
             }
         } catch (e: TimeoutCancellationException) {
             Logging.error("HttpClient: Request timed out: $url", e)
@@ -96,6 +104,7 @@ internal class HttpClient(
         jsonBody: JSONObject?,
         timeout: Int,
         cacheKey: String?,
+        jwt: String? = null
     ): HttpResponse {
         var retVal: HttpResponse? = null
 
@@ -126,6 +135,10 @@ internal class HttpClient(
                     con.readTimeout = timeout
                     con.setRequestProperty("SDK-Version", "onesignal/android/" + OneSignalUtils.SDK_VERSION)
 
+                    if (jwt != null) {
+                        con.setRequestProperty("Authentication", jwt)
+                    }
+
                     if (OneSignalWrapper.sdkType != null && OneSignalWrapper.sdkVersion != null) {
                         con.setRequestProperty("SDK-Wrapper", "onesignal/${OneSignalWrapper.sdkType}/${OneSignalWrapper.sdkVersion}")
                     }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/results/IOperationResult.kt

@@ -448,8 +448,11 @@ internal class OneSignalImp : IOneSignal, IServiceProvider {
     }
 
     override fun updateUserJwt(externalId: String, token: String) {
-        if (identityModelStore!!.model.externalId.equals(externalId))
-            identityModelStore!!.model.jwtToken = token;
+        if (!identityModelStore!!.model.externalId.equals(externalId))
+            return
+
+        identityModelStore!!.model.jwtToken = token
+        // TODO: update OperationRepo with new JWT
     }
 
     override fun addUserJwtInvalidatedListner(listener: IUserJwtInvalidatedListener) {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/results/impl/OperationResultFailed.kt

@@ -40,12 +40,6 @@ interface IUserManager {
      */
     val externalId: String
 
-    /**
-     * A JWT token generated on your server and given to a OneSignal Client SDK so it can manage
-     * a specific User, their Subscriptions, and Identities (AKA add/remove Aliases).
-     */
-    val jwtToken: String
-
     /**
      * Set the 2-character language either as a detected language or explicitly set for this user. See
      * See [Supported Languages | OneSignal](https://documentation.onesignal.com/docs/language-localization#what-languages-are-supported)

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/results/impl/OperationResultRetrying.kt

@@ -1,6 +1,7 @@
 package com.onesignal.user.internal
 
 import com.onesignal.IUserJwtInvalidatedListener
+import com.onesignal.OneSignal
 import com.onesignal.UserJwtInvalidatedEvent
 import com.onesignal.common.IDManager
 import com.onesignal.common.OneSignalUtils
@@ -35,9 +36,6 @@ internal open class UserManager(
     override val externalId: String
         get() = _identityModel.externalId ?: ""
 
-    override val jwtToken: String
-        get() = _identityModel.jwtToken ?: ""
-
     val aliases: Map<String, String>
         get() = _identityModel.filter { it.key != IdentityModel::id.name }.toMap()
 
@@ -279,7 +277,9 @@ internal open class UserManager(
             }
             IdentityConstants.JWT_TOKEN -> {
                 // Fire the event when the JWT has been invalidated.
-                if (args.newValue == null) {
+                val oldJwt = args.oldValue.toString()
+                val newJwt = args.newValue.toString()
+                if (OneSignal.isIdentityVerificationEnabled && oldJwt == newJwt && newJwt.isBlank()) {
                     jwtInvalidatedCallback.fire {
                         it.onUserJwtInvalidated(UserJwtInvalidatedEvent((externalId)))
                     }