Prepare release 1.1.1

CHANGELOG.md

@@ -8,6 +8,36 @@ The changes documented here do not include those from the original repository.
 
 ## [Unreleased]
 
+### 03-10-2023
+- Fix: [iOS] Fixes path, removing duplicate string (https://outsystemsrd.atlassian.net/browse/RMET-2855).
+
+### 13-07-2023
+- Feat: Update hook to consider new resources paths (https://outsystemsrd.atlassian.net/browse/RMET-2477)
+
+### 10-02-2023
+- Feat: [iOS] Make library available as `xcframework` (https://outsystemsrd.atlassian.net/browse/RMET-2280).
+
+## 06-01-2023
+- Feat: [iOS] Add access token to Full Payment Process (https://outsystemsrd.atlassian.net/browse/RMET-2147).
+
+## 04-01-2023
+Android - Add extra parameter for accessToken (https://outsystemsrd.atlassian.net/browse/RMET-2089)
+
+## 28-12-2022
+Android - update dependency to PaymentsLib-Android (https://outsystemsrd.atlassian.net/browse/RMET-2120)
+
+## 16-12-2022
+Android - remove dependency to jcenter (https://outsystemsrd.atlassian.net/browse/RMET-2036)
+
+## 07-12-2022
+Android - implemented payment processing using Stripe (https://outsystemsrd.atlassian.net/browse/RMET-2079)
+
+- Fix: [Android] Use fixed versions instead of dynamic ones. (https://outsystemsrd.atlassian.net/browse/RMET-2045)
+
+### 2022-12-02
+- Chore: [iOS] Remove all the `OSPaymentsLib` files and replace them by the new `OSPaymentsPluginLib` pod.
+- Feat: [iOS] Update hook so that it checks if Stripe's is configured as the Payment Service Provider and update `plist` file accordingly (https://outsystemsrd.atlassian.net/browse/RMET-2078).
+
 - Fix: [Android] Use fixed versions instead of dynamic ones. (https://outsystemsrd.atlassian.net/browse/RMET-2045)
 
 ## [Version 1.0.1]

hooks/android/androidCopyPreferences.js

@@ -5,27 +5,40 @@ const fs = require('fs');
 module.exports = function (context) {
 
     const ServiceEnum = Object.freeze({"ApplePay":"1", "GooglePay":"2"})
-    const configFileName = 'www/json-config/PaymentsPluginConfiguration.json';
-
-    var merchant_name = "";
-    var merchant_country_code = "";
-    var payment_allowed_networks = [];
-    var payment_supported_capabilities = [];
-    var payment_supported_card_countries = [];
-    var shipping_supported_contacts = [];
-    var shipping_country_codes = [];
-    var billing_supported_contacts = [];
-    var tokenization = "";
-    var hasGooglePay = false;
-
-
-    var projectRoot = context.opts.cordova.project ? context.opts.cordova.project.root : context.opts.projectRoot;
+    const configFileName = 'json-config/PaymentsPluginConfiguration.json';
+    let projectRoot = context.opts.cordova.project ? context.opts.cordova.project.root : context.opts.projectRoot;
+
+    let hasGooglePay = false;
+
+    let merchant_name = "";
+    let merchant_country_code = "";
+    let payment_allowed_networks = [];
+    let payment_supported_capabilities = [];
+    let payment_supported_card_countries = [];
+    let shipping_supported_contacts = [];
+    let shipping_country_codes = [];
+    let billing_supported_contacts = [];
+    let gateway = "";
+    let backend_url = "";
+    //only for PSPs other than Stripe
+    let gateway_merchant_id = "";
+    //only for stripe
+    let stripe_version = "";
+    let stripe_pub_key = "";
+
+    let wwwFolder = "www";
+    let platformPath = path.join(projectRoot, `platforms/android/www`);
+
+    if(!fs.existsSync(platformPath)){
+        platformPath = path.join(projectRoot, wwwFolder);
+    }
 
-    var jsonConfig = "";
+    let jsonConfig = "";
+    let jsonParsed;
     try {
-        jsonConfig = path.join(projectRoot, configFileName);
-        var jsonConfigFile = fs.readFileSync(jsonConfig).toString();
-        var jsonParsed = JSON.parse(jsonConfigFile);
+        jsonConfig = path.join(platformPath, configFileName);
+        let jsonConfigFile = fs.readFileSync(jsonConfig).toString();
+        jsonParsed = JSON.parse(jsonConfigFile);
     }
     catch {
         throw new Error("Missing configuration file or error trying to obtain the configuration.");
@@ -81,7 +94,15 @@ module.exports = function (context) {
             }
 
             if(configItem.tokenization){
-                tokenization = JSON.stringify(configItem.tokenization);
+                gateway = configItem.tokenization.gateway;
+                backend_url = configItem.tokenization.requestURL;
+                if(gateway.toUpperCase() == "STRIPE"){
+                    stripe_version = configItem.tokenization.stripeVersion;
+                    stripe_pub_key = configItem.tokenization.stripePublishableKey;
+                }
+                else{
+                    gateway_merchant_id = configItem.tokenization.gatewayMerchantId;
+                }
             }
             else{
                 error_list.push('PSP information');
@@ -95,56 +116,76 @@ module.exports = function (context) {
     });
 
     if(hasGooglePay){
-        var stringsXmlPath = path.join(projectRoot, 'platforms/android/app/src/main/res/values/strings.xml');
-        var stringsXmlContents = fs.readFileSync(stringsXmlPath).toString();
-        var etreeStrings = et.parse(stringsXmlContents);
+        let stringsXmlPath = path.join(projectRoot, 'platforms/android/app/src/main/res/values/strings.xml');
+        let stringsXmlContents = fs.readFileSync(stringsXmlPath).toString();
+        let etreeStrings = et.parse(stringsXmlContents);
 
-        var merchantNameTags = etreeStrings.findall('./string[@name="merchant_name"]');
-        for (var i = 0; i < merchantNameTags.length; i++) {
+        let merchantNameTags = etreeStrings.findall('./string[@name="merchant_name"]');
+        for (let i = 0; i < merchantNameTags.length; i++) {
             merchantNameTags[i].text = merchant_name;
         }
 
-        var merchantCountryTags = etreeStrings.findall('./string[@name="merchant_country_code"]');
-        for (var i = 0; i < merchantCountryTags.length; i++) {
+        let merchantCountryTags = etreeStrings.findall('./string[@name="merchant_country_code"]');
+        for (let i = 0; i < merchantCountryTags.length; i++) {
             merchantCountryTags[i].text = merchant_country_code;
         }
 
-        var allowedNetworksTags = etreeStrings.findall('./string[@name="payment_allowed_networks"]');
-        for (var i = 0; i < allowedNetworksTags.length; i++) {
+        let allowedNetworksTags = etreeStrings.findall('./string[@name="payment_allowed_networks"]');
+        for (let i = 0; i < allowedNetworksTags.length; i++) {
             allowedNetworksTags[i].text = payment_allowed_networks;
         }
 
-        var supportedCapabilitiesTags = etreeStrings.findall('./string[@name="payment_supported_capabilities"]');
-        for (var i = 0; i < supportedCapabilitiesTags.length; i++) {
+        let supportedCapabilitiesTags = etreeStrings.findall('./string[@name="payment_supported_capabilities"]');
+        for (let i = 0; i < supportedCapabilitiesTags.length; i++) {
             supportedCapabilitiesTags[i].text = payment_supported_capabilities;
         }
 
-        var supportedCardCountriesTags = etreeStrings.findall('./string[@name="payment_supported_card_countries"]');
-        for (var i = 0; i < supportedCardCountriesTags.length; i++) {
+        let supportedCardCountriesTags = etreeStrings.findall('./string[@name="payment_supported_card_countries"]');
+        for (let i = 0; i < supportedCardCountriesTags.length; i++) {
             supportedCardCountriesTags[i].text = payment_supported_card_countries;
         }
 
-        var shippingContactsTags = etreeStrings.findall('./string[@name="shipping_supported_contacts"]');
-        for (var i = 0; i < shippingContactsTags.length; i++) {
+        let shippingContactsTags = etreeStrings.findall('./string[@name="shipping_supported_contacts"]');
+        for (let i = 0; i < shippingContactsTags.length; i++) {
             shippingContactsTags[i].text = shipping_supported_contacts;
         }
 
-        var shippingCountriesTags = etreeStrings.findall('./string[@name="shipping_country_codes"]');
-        for (var i = 0; i < shippingCountriesTags.length; i++) {
+        let shippingCountriesTags = etreeStrings.findall('./string[@name="shipping_country_codes"]');
+        for (let i = 0; i < shippingCountriesTags.length; i++) {
             shippingCountriesTags[i].text = shipping_country_codes;
         }
 
-        var billingContactsTags = etreeStrings.findall('./string[@name="billing_supported_contacts"]');
-        for (var i = 0; i < billingContactsTags.length; i++) {
+        let billingContactsTags = etreeStrings.findall('./string[@name="billing_supported_contacts"]');
+        for (let i = 0; i < billingContactsTags.length; i++) {
             billingContactsTags[i].text = billing_supported_contacts;
         }
 
-        var tokenizationTags = etreeStrings.findall('./string[@name="tokenization"]');
-        for (var i = 0; i < tokenizationTags.length; i++) {
-            tokenizationTags[i].text = tokenization;
+        let gatewayTags = etreeStrings.findall('./string[@name="gateway"]');
+        for (let i = 0; i < gatewayTags.length; i++) {
+            gatewayTags[i].text = gateway;
+        }
+
+        let backendUrlTags = etreeStrings.findall('./string[@name="backend_url"]');
+        for (let i = 0; i < backendUrlTags.length; i++) {
+            backendUrlTags[i].text = backend_url;
+        }
+
+        let gatewayMerchantIdTags = etreeStrings.findall('./string[@name="gateway_merchant_id"]');
+        for (let i = 0; i < gatewayMerchantIdTags.length; i++) {
+            gatewayMerchantIdTags[i].text = gateway_merchant_id;
+        }
+
+        let stripeVersionTags = etreeStrings.findall('./string[@name="stripe_version"]');
+        for (let i = 0; i < stripeVersionTags.length; i++) {
+            stripeVersionTags[i].text = stripe_version;
+        }
+
+        let stripePubKeyTags = etreeStrings.findall('./string[@name="stripe_pub_key"]');
+        for (let i = 0; i < stripePubKeyTags.length; i++) {
+            stripePubKeyTags[i].text = stripe_pub_key;
         }
 
-        var resultXmlStrings = etreeStrings.write();
+        let resultXmlStrings = etreeStrings.write();
         fs.writeFileSync(stringsXmlPath, resultXmlStrings);
     }
 

hooks/ios/iOSCopyPreferences.js

@@ -3,34 +3,41 @@ const path = require('path');
 const fs = require('fs');
 const plist = require('plist');
 const { ConfigParser } = require('cordova-common');
-const { Console } = require('console');
 
 module.exports = function (context) {
 
     const ServiceEnum = Object.freeze({"ApplePay":"1", "GooglePay":"2"})
-    var projectRoot = context.opts.cordova.project ? context.opts.cordova.project.root : context.opts.projectRoot;
-
-    var merchant_id = "";
-    var merchant_name = "";
-    var merchant_country_code = "";
-    var payment_allowed_networks = [];
-    var payment_supported_capabilities = [];
-    var payment_supported_card_countries = [];
-    var shipping_supported_contacts = [];
-    var billing_supported_contacts = [];
-
-    var appNamePath = path.join(projectRoot, 'config.xml');
-    var appNameParser = new ConfigParser(appNamePath);
-    var appName = appNameParser.name();
+    let projectRoot = context.opts.cordova.project ? context.opts.cordova.project.root : context.opts.projectRoot;
+
+    let merchant_id = "";
+    let merchant_name = "";
+    let merchant_country_code = "";
+    let payment_allowed_networks = [];
+    let payment_supported_capabilities = [];
+    let payment_supported_card_countries = [];
+    let shipping_supported_contacts = [];
+    let billing_supported_contacts = [];
+    let payment_gateway = "";
+    let payment_request_url = "";
+    let stripe_publishable_key = "";
+
+    let appNamePath = path.join(projectRoot, 'config.xml');
+    let appNameParser = new ConfigParser(appNamePath);
+    let appName = appNameParser.name();
 
     let platformPath = path.join(projectRoot, 'platforms/ios');
+    let resourcesPath = path.join(projectRoot, `platforms/ios/${appName}/Resources/www`);   
+    if(!fs.existsSync(resourcesPath)){
+        resourcesPath = platformPath + "/www";
+    }
 
     //read json config file
-    var jsonConfig = "";
+    let jsonConfig = "";
+    let jsonParsed;
     try {
-        jsonConfig = path.join(platformPath, 'www/json-config/PaymentsPluginConfiguration.json');
-        var jsonConfigFile = fs.readFileSync(jsonConfig, 'utf8');
-        var jsonParsed = JSON.parse(jsonConfigFile);
+        jsonConfig = path.join(resourcesPath, 'json-config/PaymentsPluginConfiguration.json');
+        let jsonConfigFile = fs.readFileSync(jsonConfig, 'utf8');
+        jsonParsed = JSON.parse(jsonConfigFile);
     } catch {
         throw new Error("Missing configuration file or error trying to obtain the configuration.");
     }
@@ -71,7 +78,27 @@ module.exports = function (context) {
 
             shipping_supported_contacts = configItem.shipping_supported_contacts;
             billing_supported_contacts = configItem.billing_supported_contacts;
-            payment_supported_card_countries = configItem.payment_supported_card_countries;                    
+            payment_supported_card_countries = configItem.payment_supported_card_countries;
+
+            if (configItem.tokenization != null) {
+                if (configItem.tokenization.gateway != null && configItem.tokenization.gateway !== "") {
+                    payment_gateway = configItem.tokenization.gateway;
+                } else {
+                    error_list.push('Payment Gateway Name');
+                }
+
+                if (configItem.tokenization.requestURL != null && configItem.tokenization.requestURL !== "") {
+                    payment_request_url = configItem.tokenization.requestURL;
+                } else {
+                    error_list.push('Payment Request URL');
+                }
+
+                if (configItem.tokenization.stripePublishableKey != null && configItem.tokenization.stripePublishableKey !== "") {
+                    stripe_publishable_key = configItem.tokenization.stripePublishableKey;
+                } else if (payment_gateway.toLowerCase() === "stripe") {
+                    error_list.push('Stripe\'s Publishable Key');
+                }
+            }                   
 
             if (error_list.length > 0) {
                 throw new Error("Configuration is missing the following fields: " + error_list);
@@ -83,9 +110,9 @@ module.exports = function (context) {
 
 
     //Change info.plist
-    var infoPlistPath = path.join(platformPath, appName + '/'+ appName +'-info.plist');
-    var infoPlistFile = fs.readFileSync(infoPlistPath, 'utf8');
-    var infoPlist = plist.parse(infoPlistFile);
+    let infoPlistPath = path.join(platformPath, appName + '/'+ appName +'-info.plist');
+    let infoPlistFile = fs.readFileSync(infoPlistPath, 'utf8');
+    let infoPlist = plist.parse(infoPlistFile);
 
     infoPlist['ApplePayMerchantID'] = merchant_id;
     infoPlist['ApplePayMerchantName'] = merchant_name;
@@ -95,21 +122,34 @@ module.exports = function (context) {
     infoPlist['ApplePayPaymentSupportedCardCountries'] = payment_supported_card_countries;
     infoPlist['ApplePayShippingSupportedContacts'] = shipping_supported_contacts;
     infoPlist['ApplePayBillingSupportedContacts'] = billing_supported_contacts;
+    if (payment_gateway !== "") {
+        infoPlist['ApplePayPaymentGateway']['ApplePayPaymentGatewayName'] = payment_gateway;    
+
+        if (payment_request_url !== "") {
+            infoPlist['ApplePayPaymentGateway']['ApplePayRequestURL'] = payment_request_url;    
+        }
+
+        if (stripe_publishable_key !== "") {
+            infoPlist['ApplePayPaymentGateway']['ApplePayStripePublishableKey'] = stripe_publishable_key;    
+        }
+    } else {
+        delete infoPlist['ApplePayPaymentGateway'];
+    }
 
     fs.writeFileSync(infoPlistPath, plist.build(infoPlist, { indent: '\t' }));
 
     // Change Entitlements files
-    var debugEntitlementsPath = path.join(platformPath, appName + '/'+ 'Entitlements-Debug.plist');
-    var debugEntitlementsFile = fs.readFileSync(debugEntitlementsPath, 'utf8');
-    var debugEntitlements = plist.parse(debugEntitlementsFile);
+    let debugEntitlementsPath = path.join(platformPath, appName + '/'+ 'Entitlements-Debug.plist');
+    let debugEntitlementsFile = fs.readFileSync(debugEntitlementsPath, 'utf8');
+    let debugEntitlements = plist.parse(debugEntitlementsFile);
 
     debugEntitlements['com.apple.developer.in-app-payments'] = [merchant_id];
 
     fs.writeFileSync(debugEntitlementsPath, plist.build(debugEntitlements, { indent: '\t' }));
 
-    var releaseEntitlementsPath = path.join(platformPath, appName + '/' + 'Entitlements-Release.plist');
-    var releaseEntitlementsFile = fs.readFileSync(releaseEntitlementsPath, 'utf8');
-    var releaseEntitlements = plist.parse(releaseEntitlementsFile);
+    let releaseEntitlementsPath = path.join(platformPath, appName + '/' + 'Entitlements-Release.plist');
+    let releaseEntitlementsFile = fs.readFileSync(releaseEntitlementsPath, 'utf8');
+    let releaseEntitlements = plist.parse(releaseEntitlementsFile);
 
     releaseEntitlements['com.apple.developer.in-app-payments'] = [merchant_id];