Merge pull request #584 from bcgov/feature/HAPP-1905

HAPP-1905

Author: PINAKIN-KANSARA-EY

.gitignore

@@ -53,6 +53,8 @@ captures/
 .idea/androidTestResultsUserPreferences.xml
 .idea/kotlinc.xml
 .idea/migrations.xml
+.idea/deploymentTargetSelector.xml
+.idea/other.xml
 # Android Studio 3 in .gitignore file.
 .idea/caches
 .idea/modules.xml

data/src/main/java/ca/bc/gov/data/datasource/remote/api/HealthGatewayMobileConfigApi.kt

@@ -11,7 +11,7 @@ import retrofit2.http.Query
 interface HealthGatewayMobileConfigApi {
 
     companion object {
-        private const val MOBILE_CONFIGURATION = "MobileConfiguration"
+        private const val MOBILE_CONFIGURATION = "mobileconfiguration"
     }
 
     @GET(MOBILE_CONFIGURATION)

data/src/main/java/ca/bc/gov/data/datasource/remote/model/response/MobileConfigurationResponse.kt

@@ -37,4 +37,10 @@ data class AuthenticationResponse(
 
     @SerializedName("clientId")
     val clientId: String,
+
+    @SerializedName("androidClientId")
+    val androidClientId: String,
+
+    @SerializedName("iosClientId")
+    val iosClientId: String
 )

repository/src/main/java/ca/bc/gov/repository/worker/MobileConfigRepository.kt

@@ -56,7 +56,7 @@ class MobileConfigRepository @Inject constructor(
         encryptedPreferenceStorage.apply {
             baseUrl = response.baseUrl
             authenticationEndpoint = response.authentication.endpoint
-            clientId = response.authentication.clientId
+            clientId = response.authentication.androidClientId
             identityProviderId = response.authentication.identityProviderId
             baseUrlIsOnline = response.online ?: false
             patientDataFeatureFlag = response.patientDataSets.toSet()

scripts/versions.gradle

@@ -6,8 +6,8 @@ versions.targetSdkVersion = 33
 versions.compileSdkVersion = 33
 
 //App
-versions.versionName = '2.2.0'
-versions.versionCode = 240
+versions.versionName = '2.2.1'
+versions.versionCode = 241
 versions.localApiVersion = 3
 
 //Tools & Libs