Infrastructure change around JWT: models, model stores

Author: jinliu9508

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

@@ -13,6 +13,7 @@ public enum FieldType {
         ALIAS("Alias"),
         EMAIL("Email"),
         SMS("SMS"),
+        JWT("JWT"),
         EXTERNAL_USER_ID("External User Id"),
 
         TAG("Tags"),
@@ -97,6 +98,10 @@ public static boolean isSMSValid(TextInputLayout smsTextInputLayout) {
         return true;
     }
 
+    private static boolean isJWTValid(TextInputLayout jwtTextInputLayout) {
+        return !jwtTextInputLayout.getEditText().toString().isEmpty();
+    }
+
     private static boolean isExternalUserIdValid(TextInputLayout externalUserIdTextInputLayout) {
         externalUserIdTextInputLayout.setErrorEnabled(false);
         if (externalUserIdTextInputLayout.getEditText() != null) {
@@ -137,6 +142,8 @@ static boolean isContentValid(FieldType field, TextInputLayout alertDialogTextIn
                 return isEmailValid(alertDialogTextInputLayout);
             case SMS:
                 return isSMSValid(alertDialogTextInputLayout);
+            case JWT:
+                return isJWTValid(alertDialogTextInputLayout);
             case EXTERNAL_USER_ID:
                 return isExternalUserIdValid(alertDialogTextInputLayout);
             case TAG:

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

@@ -1,6 +1,8 @@
 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
 
@@ -319,6 +321,20 @@ 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) }
+    }
 }
 
 /**
@@ -425,3 +441,7 @@ 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,7 @@ 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,6 +105,7 @@ 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!")

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/identity/IdentityModel.kt

@@ -1,6 +1,7 @@
 package com.onesignal.user.internal.identity
 
 import com.onesignal.common.modeling.MapModel
+import com.onesignal.common.modeling.ModelChangeTags
 import com.onesignal.user.internal.backend.IdentityConstants
 
 /**
@@ -29,4 +30,14 @@ class IdentityModel : MapModel<String>() {
         set(value) {
             setOptStringProperty(IdentityConstants.EXTERNAL_ID, value)
         }
+
+    /**
+     * 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).
+     */
+    var jwtToken: String?
+        get() = getOptStringProperty(IdentityConstants.JWT_TOKEN)
+        set(value) {
+            setOptStringProperty(IdentityConstants.JWT_TOKEN, value, ModelChangeTags.NO_PROPOGATE)
+        }
 }

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/identity/IdentityModelStore.kt

@@ -6,4 +6,8 @@ import com.onesignal.core.internal.preferences.IPreferencesService
 
 open class IdentityModelStore(prefs: IPreferencesService) : SingletonModelStore<IdentityModel>(
     SimpleModelStore({ IdentityModel() }, "identity", prefs),
-)
+) {
+    fun invalidateJwt() {
+        model.jwtToken = ""
+    }
+}