mirror of
https://github.com/openMF/mobile-wallet.git
synced 2026-02-06 07:56:58 +00:00
Fix: update instance to mifos-bank-2 (#1944)
This commit is contained in:
parent
ce5b653fa5
commit
3e5f56fbcf
@ -1,4 +1,4 @@
|
||||
package: name='org.mifospay' versionCode='1' versionName='2025.10.5-beta.0.1' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
|
||||
package: name='org.mifospay' versionCode='1' versionName='2025.10.5-beta.0.4' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
|
||||
minSdkVersion:'26'
|
||||
targetSdkVersion:'34'
|
||||
uses-permission: name='android.permission.INTERNET'
|
||||
|
||||
@ -20,6 +20,7 @@ import org.mifospay.core.network.InterBankApiManager
|
||||
import org.mifospay.core.network.KtorfitClient
|
||||
import org.mifospay.core.network.SelfServiceApiManager
|
||||
import org.mifospay.core.network.utils.BaseURL
|
||||
import org.mifospay.core.network.utils.BaseURL.FINERACT_PLATFORM_TENANT_ID
|
||||
import org.mifospay.core.network.utils.FlowConverterFactory
|
||||
import org.mifospay.core.network.utils.KtorInterceptor
|
||||
import kotlin.io.encoding.ExperimentalEncodingApi
|
||||
@ -34,7 +35,7 @@ val NetworkModule = module {
|
||||
client = httpClient(
|
||||
config = setupDefaultHttpClient(
|
||||
baseUrl = BaseURL.selfServiceUrl,
|
||||
loggableHosts = listOf("mifos-bank-1.mifos.community"),
|
||||
loggableHosts = listOf("mifos-bank-2.mifos.community"),
|
||||
),
|
||||
).config {
|
||||
install(KtorInterceptor) {
|
||||
@ -61,11 +62,11 @@ val NetworkModule = module {
|
||||
)
|
||||
},
|
||||
defaultHeaders = mapOf(
|
||||
"Fineract-Platform-TenantId" to "mifos-bank-1",
|
||||
"Fineract-Platform-TenantId" to FINERACT_PLATFORM_TENANT_ID,
|
||||
"Content-Type" to "application/json",
|
||||
"Accept" to "application/json",
|
||||
),
|
||||
loggableHosts = listOf("mifos-bank-1.mifos.community", "apis.flexcore.mx"),
|
||||
loggableHosts = listOf("mifos-bank-2.mifos.community", "apis.flexcore.mx"),
|
||||
),
|
||||
),
|
||||
)
|
||||
@ -84,7 +85,7 @@ val NetworkModule = module {
|
||||
config = setupDefaultHttpClient(
|
||||
baseUrl = BaseURL.interBankUrl,
|
||||
defaultHeaders = mapOf(
|
||||
"Fineract-Platform-TenantId" to BaseURL.FINERACT_PLATFORM_TENANT_ID,
|
||||
"Fineract-Platform-TenantId" to FINERACT_PLATFORM_TENANT_ID,
|
||||
"Content-Type" to "application/json",
|
||||
"Accept" to "application/json",
|
||||
),
|
||||
|
||||
@ -11,11 +11,11 @@ package org.mifospay.core.network.utils
|
||||
|
||||
object BaseURL {
|
||||
private const val PROTOCOL_HTTPS = "https://"
|
||||
private const val API_ENDPOINT = "mifos-bank-1.mifos.community"
|
||||
private const val API_ENDPOINT = "mifos-bank-2.mifos.community"
|
||||
private const val API_PATH = "/fineract-provider/api/v1/"
|
||||
|
||||
// self service url
|
||||
private const val API_ENDPOINT_SELF = "mifos-bank-1.mifos.community"
|
||||
private const val API_ENDPOINT_SELF = "mifos-bank-2.mifos.community"
|
||||
private const val API_PATH_SELF = "/fineract-provider/api/v1/self/"
|
||||
|
||||
const val HEADER_TENANT = "Fineract-Platform-TenantId"
|
||||
@ -25,7 +25,7 @@ object BaseURL {
|
||||
const val API_ENDPOINT_INTERBANK = "apis.flexcore.mx"
|
||||
const val API_PATH_INTERBANK = "/v1.0/vnext1/"
|
||||
|
||||
const val FINERACT_PLATFORM_TENANT_ID = "mifos-bank-1"
|
||||
const val FINERACT_PLATFORM_TENANT_ID = "mifos-bank-2"
|
||||
|
||||
val url: String
|
||||
get() = PROTOCOL_HTTPS + API_ENDPOINT + API_PATH
|
||||
|
||||
@ -18,6 +18,7 @@ import io.ktor.http.HttpStatusCode
|
||||
import io.ktor.util.AttributeKey
|
||||
import org.mifospay.core.common.GlobalAuthManager
|
||||
import org.mifospay.core.datastore.UserPreferencesRepository
|
||||
import org.mifospay.core.network.utils.BaseURL.FINERACT_PLATFORM_TENANT_ID
|
||||
|
||||
class KtorInterceptor(
|
||||
private val getToken: () -> String?,
|
||||
@ -25,7 +26,6 @@ class KtorInterceptor(
|
||||
companion object Plugin : HttpClientPlugin<Config, KtorInterceptor> {
|
||||
private const val HEADER_TENANT = "Fineract-Platform-TenantId"
|
||||
private const val HEADER_AUTH = "Authorization"
|
||||
private const val DEFAULT = "mifos-bank-1"
|
||||
|
||||
override val key: AttributeKey<KtorInterceptor> = AttributeKey("KtorInterceptor")
|
||||
|
||||
@ -33,7 +33,7 @@ class KtorInterceptor(
|
||||
scope.requestPipeline.intercept(HttpRequestPipeline.State) {
|
||||
context.header("Content-Type", "application/json")
|
||||
context.header("Accept", "application/json")
|
||||
context.header(HEADER_TENANT, DEFAULT)
|
||||
context.header(HEADER_TENANT, FINERACT_PLATFORM_TENANT_ID)
|
||||
|
||||
plugin.getToken()?.let { token ->
|
||||
if (token.isNotEmpty()) {
|
||||
@ -67,7 +67,6 @@ class KtorInterceptorRe(
|
||||
companion object Plugin : HttpClientPlugin<ConfigRe, KtorInterceptorRe> {
|
||||
private const val HEADER_TENANT = "Fineract-Platform-TenantId"
|
||||
private const val HEADER_AUTH = "Authorization"
|
||||
private const val DEFAULT = "venus"
|
||||
|
||||
override val key: AttributeKey<KtorInterceptorRe> = AttributeKey("KtorInterceptorRe")
|
||||
|
||||
@ -77,7 +76,7 @@ class KtorInterceptorRe(
|
||||
scope.requestPipeline.intercept(HttpRequestPipeline.State) {
|
||||
context.header("Content-Type", "application/json")
|
||||
context.header("Accept", "application/json")
|
||||
context.header(HEADER_TENANT, DEFAULT)
|
||||
context.header(HEADER_TENANT, FINERACT_PLATFORM_TENANT_ID)
|
||||
|
||||
token?.let { token ->
|
||||
if (token.isNotEmpty()) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user