[PIMOB-4287]: adding base url prefix to Frames SDK for multi-region (#302)

* PIMOB-4287: add subdomain prefix to base url for multi region support

* PIMOB-4287: rename base url prefix var, include global subdomain in config, add updated public keys

* PIMOB-4287: update kdoc

* PIMOB-4287: add & fix unit tests, rename variable name for baseurl prefix, add validator extension function

* PIMOB-4287: lint format check

* PIMOB-4287: remove unused secret key

* PIMOB-4287: add kdoc for cvv component, update test file to include annotation

* PIMOB-4287 ktlint formating

* PIMOB-4287: ktlint format

* PIMOB-4287: hide secret keys

* PIMOB-4287: fix ci/cd + build prefix url from constants

* PIMOB-4287: fix local prop keys parsing for both app run configurations + ci

* PIMOB-4287: edit kdocs and remove nullable extension type

Author: zane-smith-cko

.github/workflows/gradle-task.yml

@@ -43,6 +43,13 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+
+      - name: Create local.properties
+        run: |
+            touch local.properties
+            echo "sandbox.components.public_key=${{ secrets.COMPONENTS_SANDBOX_PUBLIC_KEY }}" >> local.properties
+            echo "sandbox.components.secret_key=${{ secrets.COMPONENTS_SANDBOX_SECRET_KEY }}" >> local.properties
+
       - name: Run ${{ inputs.task }} with Gradle
         run: ./gradlew :${{ inputs.module }}:${{ inputs.task }}
 

app/build.gradle

@@ -45,6 +45,22 @@ android {
     lint {
         baseline = file('lint-baseline.xml')
     }
+
+    def localProps = new Properties()
+    def localPropsFile = rootProject.file("local.properties")
+    if (localPropsFile.exists()) {
+        localProps.load(localPropsFile.newDataInputStream())
+    }
+
+    defaultConfig {
+        buildConfigField "String", "SANDBOX_PUBLIC_KEY", "\"${localProps.getProperty("sandbox.components.public_key") ?: ""}\""
+        buildConfigField "String", "SANDBOX_SECRET_KEY", "\"${localProps.getProperty("sandbox.components.secret_key") ?: ""}\""
+        buildConfigField "String", "SANDBOX_PROCESSING_CHANNEL_ID", "\"${localProps.getProperty("sandbox.components.processing_channel_id") ?: ""}\""
+
+        buildFeatures {
+            buildConfig true
+        }
+    }
 }
 
 dependencies {

app/src/main/java/checkout/checkout_android/CVVTokenizationActivity.java

@@ -1,6 +1,6 @@
 package checkout.checkout_android;
 
-import static checkout.checkout_android.Constants.PUBLIC_KEY_CVV_TOKENIZATION;
+import static checkout.checkout_android.Constants.REGIONAL_SUBDOMAIN;
 
 import android.app.AlertDialog;
 import android.os.Bundle;
@@ -51,7 +51,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 		setupObservers();
 
 		// Create cvvComponentApi
-		CVVComponentApi cvvComponentApi = CVVComponentApiFactory.create(PUBLIC_KEY_CVV_TOKENIZATION, Environment.SANDBOX, this);
+		CVVComponentApi cvvComponentApi = CVVComponentApiFactory.create(BuildConfig.SANDBOX_PUBLIC_KEY, Environment.SANDBOX, this, REGIONAL_SUBDOMAIN);
 
 		// initialise CVVTokenizationResultHandler for tokenization
 		resultHandler = result -> {

app/src/main/java/checkout/checkout_android/Constants.java

@@ -7,19 +7,11 @@ public class Constants {
 	 * Target platform environment
 	 */
 	public static final Environment ENVIRONMENT = Environment.SANDBOX;
-	/**
-	 * Replace with public key from Hub in Sandbox Environment
-	 */
-	public static final String PUBLIC_KEY = "pk_test_b37b8b6b-fc9a-483f-a77e-3386b606f90e";
 
-	/**
-	 * Replace with public key from Hub in Sandbox Environment, testing key for CVV Tokenization
-	 */
-	public static final String PUBLIC_KEY_CVV_TOKENIZATION = "pk_6b30805a-1f3b-4c63-8b75-eb3030109173";
-	/**
-	 * Replace with Secret key from Hub in Sandbox Environment
-	 */
-	public static final String SECRET_KEY = "sk_test_568e6077-a08f-4692-9237-cc6c48dcf6aa";
+    /**
+     * Replace with subdomain value, testing key for base url regional subdomain prefix
+     */
+    public static final  String REGIONAL_SUBDOMAIN = "global";
 	/**
 	 * Replace with Success/Failure Urls from Hub in Sandbox Environment
 	 */

app/src/main/java/checkout/checkout_android/DemoActivity.java

@@ -1,5 +1,7 @@
 package checkout.checkout_android;
 
+import static checkout.checkout_android.Constants.REGIONAL_SUBDOMAIN;
+
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.os.Bundle;
@@ -18,6 +20,8 @@
 import com.checkout.threedsecure.model.ThreeDSResult;
 import com.checkout.tokenization.model.TokenDetails;
 
+import java.util.Collections;
+
 import checkout.checkout_android.utils.PaymentUtil;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -89,11 +93,15 @@ public void onBackPressed() {
 
     private PaymentFormConfig providePaymentFormConfig() {
         return new PaymentFormConfig(
-                Constants.PUBLIC_KEY,
+                BuildConfig.SANDBOX_PUBLIC_KEY,
                 this,
                 Constants.ENVIRONMENT,
                 new PaymentFormStyle(),
-                mPaymentFlowHandler);
+                mPaymentFlowHandler,
+                Collections.emptyList(),
+                null,
+                REGIONAL_SUBDOMAIN
+        );
     }
 
     private void displayMessage(String title, String message, boolean exitScreen) {

app/src/main/java/checkout/checkout_android/utils/PaymentUtil.java

@@ -11,6 +11,7 @@
 
 import java.io.IOException;
 
+import checkout.checkout_android.BuildConfig;
 import checkout.checkout_android.Constants;
 import okhttp3.Call;
 import okhttp3.MediaType;
@@ -47,7 +48,7 @@ public static void createPayment(String token, Callback callback) {
         RequestBody requestBody = buildPaymentRequestBody(token);
         Request paymentRequest = new Request.Builder()
                 .url("https://api.sandbox.checkout.com/payments")
-                .addHeader("Authorization", "Bearer "+Constants.SECRET_KEY)
+                .addHeader("Authorization", "Bearer "+ BuildConfig.SANDBOX_SECRET_KEY)
                 .post(requestBody)
                 .build();
 

checkout/src/main/java/com/checkout/CheckoutApiServiceFactory.kt

@@ -7,6 +7,7 @@ import com.checkout.base.model.Environment
 import com.checkout.logging.EventLoggerProvider
 import com.checkout.logging.Logger
 import com.checkout.logging.model.LoggingEvent
+import com.checkout.logging.utils.toBaseUrl
 import com.checkout.network.OkHttpProvider
 import com.checkout.risk.FramesOptions
 import com.checkout.threedsecure.Executor
@@ -40,6 +41,7 @@ public object CheckoutApiServiceFactory {
         publicKey: String,
         environment: Environment,
         context: Context,
+        baseUrlPrefix: String? = null,
     ): CheckoutApiService {
         val logger = EventLoggerProvider.provide()
         logger.setup(context, environment)
@@ -51,7 +53,7 @@ public object CheckoutApiServiceFactory {
         )
 
         return CheckoutApiClient(
-            provideTokenRepository(context, publicKey, environment),
+            provideTokenRepository(context, publicKey, environment, baseUrlPrefix),
             provideThreeDSExecutor(logger),
         )
     }
@@ -60,8 +62,9 @@ public object CheckoutApiServiceFactory {
         context: Context,
         publicKey: String,
         environment: Environment,
+        baseUrlPrefix: String?,
     ): TokenRepository = TokenRepositoryImpl(
-        networkApiClient = provideNetworkApiClient(publicKey, environment.url),
+        networkApiClient = provideNetworkApiClient(publicKey, environment.toBaseUrl(baseUrlPrefix)),
         cardToTokenRequestMapper = CardToTokenRequestMapper(),
         cvvToTokenNetworkRequestMapper = CVVToTokenNetworkRequestMapper(),
         cardTokenizationNetworkDataMapper = CardTokenizationNetworkDataMapper(),
@@ -77,7 +80,13 @@ public object CheckoutApiServiceFactory {
         logger = TokenizationEventLogger(EventLoggerProvider.provide()),
         publicKey = publicKey,
         cvvTokenizationNetworkDataMapper = CVVTokenizationNetworkDataMapper(),
-        riskSdkUseCase = RiskSdkUseCase(environment, context, publicKey, riskSDKFramesOptions, RiskInstanceProvider),
+        riskSdkUseCase = RiskSdkUseCase(
+            environment,
+            context,
+            publicKey,
+            riskSDKFramesOptions,
+            RiskInstanceProvider,
+        ),
     )
 
     private fun provideNetworkApiClient(

checkout/src/main/java/com/checkout/base/model/Environment.kt

@@ -1,8 +1,6 @@
 package com.checkout.base.model
 
-import com.checkout.base.util.EnvironmentConstants
-
-public enum class Environment(public val url: String) {
-    PRODUCTION(EnvironmentConstants.PRODUCTION_SERVER_URL),
-    SANDBOX(EnvironmentConstants.SANDBOX_SERVER_URL),
+public enum class Environment {
+    PRODUCTION,
+    SANDBOX,
 }

checkout/src/main/java/com/checkout/base/util/CommonConstants.kt

@@ -14,3 +14,8 @@ internal const val ZIP_LENGTH = 50
  */
 internal const val PHONE_MIN_LENGTH = 6
 internal const val PHONE_MAX_LENGTH = 25
+
+/**
+ * Constant for HTTPS protocol prefix, used when constructing environments' base URLs for network communication.
+ */
+internal const val HTTPS_PROTOCOL: String = "https://"

checkout/src/main/java/com/checkout/base/util/EnvironmentConstants.kt

@@ -3,4 +3,6 @@ package com.checkout.base.util
 internal object EnvironmentConstants {
     internal const val SANDBOX_SERVER_URL = "https://api.sandbox.checkout.com/tokens"
     internal const val PRODUCTION_SERVER_URL = "https://api.checkout.com/tokens"
+    internal const val PRODUCTION_LOGGING = "production"
+    internal const val SANDBOX_LOGGING = "sandbox"
 }