fixup: identity verification improvement

Author: jinliu9508

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

@@ -66,7 +66,7 @@ public void onCreate() {
         // This will reproduce result similar to Kotlin CouroutineScope.launch{}, which may potentially crash the app
         ExecutorService executor = Executors.newSingleThreadExecutor();
         @SuppressLint({"NewApi", "LocalSuppress"}) CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
-            //OneSignal.getNotifications().requestPermission(true, Continue.none());
+            OneSignal.getNotifications().requestPermission(true, Continue.none());
         }, executor);
         future.join(); // Waits for the task to complete
         executor.shutdown();
@@ -144,9 +144,6 @@ public void onUserStateChange(@NonNull UserChangedState state) {
         OneSignal.addUserJwtInvalidatedListner(new IUserJwtInvalidatedListener() {
             @Override
             public void onUserJwtInvalidated(@NonNull UserJwtInvalidatedEvent event) {
-                // !!! For manual testing only
-                String jwt = "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIwMTM5YmQ2Zi00NTFmLTQzOGMtODg4Ni00ZTBmMGZlM2EwODUiLCJleHAiOjE3MjczNjkyMjIsImlkZW50aXR5Ijp7ImV4dGVybmFsX2lkIjoiamluIn0sInN1YnNjcmlwdGlvbnMiOlt7InR5cGUiOiJFbWFpbCIsInRva2VuIjoidGVzdEBkb21haW4uY29tIn0seyJ0eXBlIjoiU01TIiwidG9rZW4iOiIrMTIzNDU2NzgifSx7InR5cGUiOiJBbmRyb2lkUHVzaCIsImlkIjoiMTIzZTQ1NjctZTg5Yi0xMmQzLWE0NTYtNDI2NjE0MTc0MDAwIn1dfQ.6XF7wRF4lLOvKr5Gd3MHv9j7U151hcBjmqSyk6nI6JVYUgt6q0YRp2j1aSJcg8VmaejzP1DouN1DpWUT_JTRXA";
-                OneSignal.updateUserJwt(event.getExternalId(), jwt);
                 Log.v(Tag.LOG_TAG, "onUserJwtInvalidated fired with ID:" + event.getExternalId());
             }
         });

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java

@@ -411,8 +411,7 @@ private void setupAppLayout() {
                 @Override
                 public void onSuccess(String update) {
                     if (update != null && !update.isEmpty()) {
-                        String jwt = "InitialJWT";
-                        OneSignal.login(update, jwt);
+                        OneSignal.login(update);
                         refreshState();
                     }
                 }
@@ -450,8 +449,6 @@ private void setupJWTLayout() {
                 public void onSuccess(String update) {
                     if (update != null && !update.isEmpty()) {
                         OneSignal.updateUserJwt(OneSignal.getUser().getExternalId(), update);
-                        //String jwt = "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiIxNjg4ZDhmMi1kYTdmLTQ4MTUtOGVlMy05ZDEzNzg4NDgyYzgiLCJpYXQiOjE3MTQwODA4MTMsImlkZW50aXR5Ijp7ImV4dGVybmFsX2lkIjoiMjAyNDA0MjUtYWxleDQyIn0sInN1YnNjcmlwdGlvbiI6W3sidHlwZSI6IiIsImlkIjoiMmRlZGU3MzItMTEyNi00MTlkLTk5M2UtNDIzYWQyYTZiZGU5In1dfQ.rzZ-HaDm1EwxbMxd8937bWzPhPSQDDSqSzaASgZZc5A5v8g6ZQHizN9CljOmoQ4lTLm7noD6rOmR07tlZdrI5w";
-                        //OneSignal.login(update, jwt);
                         refreshState();
                     }
                 }

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/SharedPreferenceUtil.java

@@ -24,7 +24,7 @@ public static boolean exists(Context context, String key) {
     }
 
     public static String getOneSignalAppId(Context context) {
-        return getSharedPreference(context).getString(OS_APP_ID_SHARED_PREF, "0139bd6f-451f-438c-8886-4e0f0fe3a085");
+        return getSharedPreference(context).getString(OS_APP_ID_SHARED_PREF, "77e32082-ea27-42e3-a898-c72e141824ef");
     }
 
     public static boolean getUserPrivacyConsent(Context context) {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/IOneSignal.kt

@@ -19,11 +19,6 @@ interface IOneSignal {
      */
     val isInitialized: Boolean
 
-    /**
-     * Whether the security feature to authenticate your external user ids is enabled
-     */
-    val useIdentityVerification: Boolean
-
     /**
      * The user manager for accessing user-scoped
      * management.

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/IUserJwtInvalidatedListener.kt

@@ -1,10 +1,10 @@
 package com.onesignal
 
-/** TODO: complete the comment part for this listener
+/**
  * Implement this interface and provide an instance to [OneSignal.addUserJwtInvalidatedListner]
  * in order to receive control when the JWT for the current user is invalidated.
  *
- * @see [User JWT Invalidated Event | OneSignal Docs](https://documentation.onesignal.com/docs/)
+ * @see [User JWT Invalidated Event | OneSignal Docs](https://documentation.onesignal.com/docs/identity-verification)
  */
 interface IUserJwtInvalidatedListener {
     /**

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/OneSignal.kt

@@ -29,13 +29,6 @@ object OneSignal {
     val isInitialized: Boolean
         get() = oneSignal.isInitialized
 
-    /**
-     * Whether the security feature to authenticate your external user ids is enabled
-     */
-    @JvmStatic
-    val useIdentityVerification: Boolean
-        get() = oneSignal.useIdentityVerification
-
     /**
      * The current SDK version as a string.
      */

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/UserJwtInvalidatedEvent.kt

@@ -1,9 +1,10 @@
 package com.onesignal
 
-/** TODO: jwt documentation
+/**
  * The event passed into [IUserJwtInvalidatedListener.onUserJwtInvalidated], it provides access
  * to the external ID whose JWT has just been invalidated.
  *
+ * For more information https://documentation.onesignal.com/docs/identity-verification#4-handle-jwt-lifecycle-events
  */
 class UserJwtInvalidatedEvent(
     val externalId: String,

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/CoreModule.kt

@@ -31,6 +31,7 @@ import com.onesignal.core.internal.preferences.IPreferencesService
 import com.onesignal.core.internal.preferences.impl.PreferencesService
 import com.onesignal.core.internal.purchases.impl.TrackAmazonPurchase
 import com.onesignal.core.internal.purchases.impl.TrackGooglePurchase
+import com.onesignal.core.internal.startup.IBootstrapService
 import com.onesignal.core.internal.startup.IStartableService
 import com.onesignal.core.internal.time.ITime
 import com.onesignal.core.internal.time.impl.Time
@@ -40,6 +41,7 @@ import com.onesignal.location.ILocationManager
 import com.onesignal.location.internal.MisconfiguredLocationManager
 import com.onesignal.notifications.INotificationsManager
 import com.onesignal.notifications.internal.MisconfiguredNotificationsManager
+import com.onesignal.user.internal.service.IdentityVerificationService
 
 internal class CoreModule : IModule {
     override fun register(builder: ServiceBuilder) {
@@ -59,6 +61,7 @@ internal class CoreModule : IModule {
         builder.register<ConfigModelStore>().provides<ConfigModelStore>()
         builder.register<ParamsBackendService>().provides<IParamsBackendService>()
         builder.register<ConfigModelStoreListener>().provides<IStartableService>()
+        builder.register<IdentityVerificationService>().provides<IBootstrapService>()
 
         // Operations
         builder.register<OperationModelStore>().provides<OperationModelStore>()

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/ConfigModel.kt

@@ -1,8 +1,6 @@
 package com.onesignal.core.internal.config
 
-import com.onesignal.common.events.EventProducer
 import com.onesignal.common.modeling.Model
-import com.onesignal.core.internal.backend.ParamsObject
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -321,20 +319,6 @@ class ConfigModel : Model() {
 
         return null
     }
-
-    var fetchParamsNotifier = EventProducer<FetchParamsObserver>()
-
-    fun addFetchParamsObserver(observer: FetchParamsObserver) {
-        fetchParamsNotifier.subscribe(observer)
-    }
-
-    fun removeFetchParamsObserver(observer: FetchParamsObserver) {
-        fetchParamsNotifier.unsubscribe(observer)
-    }
-
-    fun notifyFetchParams(params: ParamsObject) {
-        fetchParamsNotifier.fire { it.onParamsFetched(params) }
-    }
 }
 
 /**
@@ -441,7 +425,3 @@ class FCMConfigModel(parentModel: Model, parentProperty: String) : Model(parentM
             setOptStringProperty(::apiKey.name, value)
         }
 }
-
-interface FetchParamsObserver {
-    fun onParamsFetched(params: ParamsObject)
-}

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/config/impl/ConfigModelStoreListener.kt

@@ -72,7 +72,6 @@ internal class ConfigModelStoreListener(
                     // copy current model into new model, then override with what comes down.
                     val config = ConfigModel()
                     config.initializeFromModel(null, _configModelStore.model)
-                    config.fetchParamsNotifier = _configModelStore.model.fetchParamsNotifier
                     config.isInitializedWithRemote = true
 
                     // these are always copied from the backend params
@@ -105,7 +104,6 @@ internal class ConfigModelStoreListener(
 
                     _configModelStore.replace(config, ModelChangeTags.HYDRATE)
                     success = true
-                    config.notifyFetchParams(params)
                 } catch (ex: BackendException) {
                     if (ex.statusCode == HttpURLConnection.HTTP_FORBIDDEN) {
                         Logging.fatal("403 error getting OneSignal params, omitting further retries!")