react-native-klarna-inapp-sdk 2.1.11 → 2.1.13

package/.gitattributes

@@ -1,3 +1,3 @@
-# Windows files should use crlf line endings
-# https://help.github.com/articles/dealing-with-line-endings/
+*.pbxproj -text
+# specific for windows script files
 *.bat text eol=crlf

package/.watchmanconfig

@@ -0,0 +1 @@
+{}

package/.yarnrc

@@ -0,0 +1,5 @@
+# Override Yarn command so we can automatically setup the repo on running `yarn`
+
+yarn-path "scripts/bootstrap.js"
+
+registry "https://registry.yarnpkg.com"

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 All notable changes to React Native Klarna In-App SDK will be documented in this file.
 
+### [2.1.13] - 2023-09-19
+- Update Android native SDK version to 2.6.8
+- Update iOS native SDK version to 2.6.10
+- Applied dependabot version updates
+
+### [2.1.12] - 2023-05-11
+- Update Android native SDK version to 2.6.2
+- Applied dependabot version updates
+
 ### [2.1.11] - 2023-05-09
 - Update iOS native SDK version to 2.6.4
 

package/android/build.gradle

@@ -8,8 +8,8 @@ buildscript {
     }
 
     dependencies {
-        // Matches recent template from React Native (0.60)
-        // https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle#L16
+        // Matches recent template from React Native (0.64)
+        // https://github.com/facebook/react-native/blob/0.64-stable/template/android/build.gradle#L16
         classpath("com.android.tools.build:gradle:${safeExtGet('gradlePluginVersion', '4.2.0')}")
     }
 }
@@ -17,11 +17,11 @@ buildscript {
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 
-// Matches values in recent template from React Native (0.59)
-// https://github.com/facebook/react-native/blob/0.59-stable/template/android/build.gradle#L5-L9
+// Matches or updates values in template from React Native (0.64)
+// https://github.com/facebook/react-native/blob/0.64-stable/template/android/build.gradle#L5-L9
 def DEFAULT_COMPILE_SDK_VERSION = 30
 def DEFAULT_BUILD_TOOLS_VERSION = "30.0.2"
-def DEFAULT_MIN_SDK_VERSION = 19
+def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_TARGET_SDK_VERSION = 30
 
 android {
@@ -55,7 +55,7 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactnativeVersion', '+')}"
-    implementation 'com.klarna.mobile:sdk:2.5.0'
+    implementation 'com.klarna.mobile:sdk:2.6.8'
 
     testImplementation "junit:junit:4.13"
     testImplementation 'androidx.test:core:1.2.0'
@@ -115,7 +115,7 @@ afterEvaluate { project ->
     }
 
     task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from android.sourceSets.main.java.srcDirs
         include '**/*.java'
     }

package/android/src/main/java/com/klarna/inapp/sdk/MappableKlarnaPaymentsSDKError.java

@@ -25,6 +25,7 @@ class MappableKlarnaPaymentsSDKError implements Mappable {
                 .put("message", klarnaPaymentsSDKError.getMessage())
                 .put("name", klarnaPaymentsSDKError.getName())
                 .put("invalidFields", klarnaPaymentsSDKError.getInvalidFields())
+                .put("sessionId", klarnaPaymentsSDKError.getSessionId())
                 .build();
     }
 }

package/android/src/test/java/com/klarna/inapp/sdk/MappableKlarnaPaymentsSDKErrorTest.java

@@ -19,7 +19,8 @@ public class MappableKlarnaPaymentsSDKErrorTest {
                 "testMessage",
                 false,
                 "testAction",
-                Collections.singletonList("testInvalidField")
+                Collections.singletonList("testInvalidField"),
+                "testSessionId"
         );
 
         MappableKlarnaPaymentsSDKError writableError = new MappableKlarnaPaymentsSDKError(error);
@@ -39,5 +40,6 @@ public class MappableKlarnaPaymentsSDKErrorTest {
         Assert.assertEquals(1, invalidFields.size());
         Assert.assertEquals("testInvalidField", new ArrayList(invalidFields).get(0));
 
+        Assert.assertEquals("testSessionId", map.get("sessionId"));
     }
 }

package/babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+    presets: ['module:metro-react-native-babel-preset'],
+};

package/ios/Podfile

@@ -8,7 +8,7 @@ target 'KlarnaInAppSDK' do
   # use_frameworks!
 
   # Pods for KlarnaInAppSDK
-  pod 'KlarnaMobileSDK', '2.6.4'
+  pod 'KlarnaMobileSDK', '2.6.10'
   pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
   pod 'FBReactNativeSpec', :path => "../node_modules/react-native/React/FBReactNativeSpec"
   pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "react-native-klarna-inapp-sdk",
-  "title": "React Native Klarna In-App SDK",
-  "version": "2.1.11",
-  "description": "This library wraps Klarna’s In-App SDK and exposes its functionality as React Native components. It currently supports Klarna Payments via a Payment View component.",
-  "main": "index.js",
+  "title": "Klarna Mobile SDK React Native",
+  "version": "2.1.13",
+  "description": "This library wraps Klarna Mobile SDK and exposes its functionality as React Native components.",
+  "main": "src/index",
+  "source": "src/index",
   "scripts": {},
   "repository": {
     "type": "git",
@@ -30,5 +31,8 @@
     "react": "17.0.1",
     "react-native": "0.64.4"
   },
-  "dependencies": {}
+  "dependencies": {},
+  "engines": {
+    "node": ">= 16.0.0"
+  }
 }

package/react-native-klarna-inapp-sdk.podspec

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   end
 
   s.dependency "React"
-  s.dependency 'KlarnaMobileSDK', '2.6.4'
+  s.dependency 'KlarnaMobileSDK', '2.6.10'
   # s.dependency "..."
 
 end

package/scripts/bootstrap.js

@@ -0,0 +1,29 @@
+const os = require('os');
+const path = require('path');
+const child_process = require('child_process');
+
+const root = path.resolve(__dirname, '..');
+const args = process.argv.slice(2);
+const options = {
+    cwd: process.cwd(),
+    env: process.env,
+    stdio: 'inherit',
+    encoding: 'utf-8',
+};
+
+if (os.type() === 'Windows_NT') {
+    options.shell = true;
+}
+
+let result;
+
+if (process.cwd() !== root || args.length) {
+    // We're not in the root of the project, or additional arguments were passed
+    // In this case, forward the command to `yarn`
+    result = child_process.spawnSync('yarn', args, options);
+} else {
+    // If `yarn` is run without arguments, perform bootstrap
+    result = child_process.spawnSync('yarn', ['bootstrap'], options);
+}
+
+process.exitCode = result.status;

package/Jenkinsfile

@@ -1,156 +0,0 @@
-def currentSdkVersion = ""
-def gitCommit = ""
-
-pipeline {
-
-    agent {
-        label 'mac-mini'
-    }
-
-    stages {
-        stage('Initialize') {
-            steps {
-                script {
-                    gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
-                    echo "gitCommit: ${gitCommit}"
-                    currentSdkVersion = sdkVersion()
-                    echo "currentSdkVersion: ${currentSdkVersion}"
-                }
-                withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'msdk-aws-mac-user', usernameVariable: 'MSDK_USER', passwordVariable: 'MSDK_PASSWORD']]) {
-                    sh 'security unlock-keychain -p $MSDK_PASSWORD login.keychain'
-                }
-            }
-        }
-        
-        stage('Yarn Install Lib') {
-            steps {
-                sh "yarn install"
-            }
-        }
-
-        stage('Bundle Install Lib') {
-            steps {
-                bash 'bundle install'
-            }
-        }
-        
-        stage('Pod Install Lib') {
-            steps {
-                sh "cd ios && pod install && cd .."
-            }
-        }
-
-        stage('Android Native Unit Tests') {
-            steps {
-                sh 'cd android && ./gradlew clean && ./gradlew testDebugUnitTest && cd ..'
-                junit 'android/build/test-results/testDebugUnitTest/*.xml'
-            }
-        }
-
-        stage('iOS Native Unit Tests') {
-            steps {
-                bash 'bundle exec fastlane ios run_lib_tests'
-            }
-        }
-
-        stage('Yarn Install TestApp') {
-            steps {
-                sh 'cd TestApp && yarn install && cd ..'
-            }
-        }
-
-        stage('Pod Install TestApp') {
-            steps {
-                bash 'cd TestApp/ios && pod install --repo-update && pod update KlarnaMobileSDK && cd ../..'
-            }
-        }
-
-        stage('Build Android TestApp') {
-            steps {
-                sh 'cd TestApp/android && ./gradlew clean && ./gradlew app:assembleDebug && cd ../..'
-                // apk location: TestApp/android/app/build/outputs/apk/debug/app-debug.apk
-                // TODO : Upload apk
-            }
-        }
-
-        stage('Build iOS TestApp') {
-            steps {
-                bash 'bundle exec fastlane ios build_test_app_release'
-            }
-        }
-
-        stage('Upload Test Apps') {
-            when {
-                expression { isPullRequest() }
-            }
-            steps {
-                script {
-                    withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'BrowserStack', usernameVariable: 'BROWSERSTACK_USER', passwordVariable: 'BROWSERSTACK_PASSWORD']]) {
-                        sh 'curl -u ' + "$BROWSERSTACK_USER" + ":" + "$BROWSERSTACK_PASSWORD" + ' -X POST https://api-cloud.browserstack.com/app-automate/upload -F file=@TestApp/android/app/build/outputs/apk/debug/app-debug.apk -F "data={\\"custom_id\\":\\"INAPP_RN_SDK_ANDROID_TEST_APP\\"}"'
-                        sh 'curl -u ' + "$BROWSERSTACK_USER" + ":" + "$BROWSERSTACK_PASSWORD" + ' -X POST https://api-cloud.browserstack.com/app-automate/upload -F file=@TestApp/build/TestApp.ipa -F "data={\\"custom_id\\":\\"INAPP_RN_SDK_IOS_TEST_APP\\"}"'
-                    }
-                }
-            }
-        }
-
-        stage('Android Integration Tests') {
-            when {
-                expression { isPullRequest() }
-            }
-            steps {
-                script {
-                    try {
-                        withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'BrowserStack', usernameVariable: 'BROWSERSTACK_USER', passwordVariable: 'BROWSERSTACK_PASSWORD']]) {
-                            sh './integration-tests/gradlew -p integration-tests :test --tests TestSuite -Dbrowserstack.username="' + "$BROWSERSTACK_USER" + '" -Dbrowserstack.password="' + "$BROWSERSTACK_PASSWORD" + '" -Dbuild.name="' + "${env.BRANCH_NAME}@${gitCommit}" + '" -Dbuild.platform="Android"'
-                        }
-                    } finally {
-                        // Add the test results for statistics
-                        junit 'integration-tests/build/test-results/test/*.xml'
-                    }
-                }
-            }
-        }
-
-        // Enable after iOS tests are fixed
-        /* stage('iOS Integration Tests') {
-            when {
-                expression { isPullRequest() }
-            }
-            steps {
-                script {
-                    try {
-                        withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'BrowserStack', usernameVariable: 'BROWSERSTACK_USER', passwordVariable: 'BROWSERSTACK_PASSWORD']]) {
-                            sh './integration-tests/gradlew -p integration-tests :test --tests TestSuite -Dbrowserstack.username="' + "$BROWSERSTACK_USER" + '" -Dbrowserstack.password="' + "$BROWSERSTACK_PASSWORD" + '" -Dbuild.name="' + "${env.BRANCH_NAME}@${gitCommit}" + '" -Dbuild.platform="iOS"'
-                        }
-                    } finally {
-                        // Add the test results for statistics
-                        junit 'integration-tests/build/test-results/test *//*.xml'
-                    }
-                }
-            }
-        } */
-
-        stage('Reset Directory') {
-            steps {
-                script {
-                    sh 'git reset --hard'
-                    //sh 'git clean -d -x -f'
-                }
-            }
-        }
-        
-    }
-}
-
-String sdkVersion() {
-    return sh(returnStdout: true, script: "sed -n -e '/\"version\"/ s/.*\\: *//p' package.json").trim().replaceAll("\"", "").replaceAll(",", "")
-}
-
-def bash(custom) {
-    sh '''#!/bin/bash -l
-    ''' + custom
-}
-
-boolean isPullRequest() {
- return env.JOB_BASE_NAME.startsWith('PR') && env.JOB_BASE_NAME.endsWith('merge')
-}

package/scripts/examples_postinstall.js

@@ -1,111 +0,0 @@
-#!/usr/bin/env node
-
-  /*
-   * Using libraries within examples and linking them within packages.json like:
-   * "react-native-library-name": "file:../"
-   * will cause problems with the metro bundler if the example will run via
-   * `react-native run-[ios|android]`. This will result in an error as the metro
-   * bundler will find multiple versions for the same module while resolving it.
-   * The reason for that is that if the library is installed it also copies in the
-   * example folder itself as well as the node_modules folder of the library
-   * although their are defined in .npmignore and should be ignored in theory.
-   *
-   * This postinstall script removes the node_modules folder as well as all
-   * entries from the libraries .npmignore file within the examples node_modules
-   * folder after the library was installed. This should resolve the metro
-   * bundler issue mentioned above.
-   *
-   * It is expected this scripts lives in the libraries root folder within a
-   * scripts folder. As first parameter the relative path to the libraries
-   * folder within the example's node_modules folder may be provided.
-   * This script will determine the path from this project's package.json file
-   * if no such relative path is provided.
-   * An example's package.json entry could look like:
-   * "postinstall": "node ../scripts/examples_postinstall.js node_modules/react-native-library-name/"
-   */
-
-  'use strict';
-
-  const fs = require('fs');
-  const path = require('path');
-
-  /// Delete all files and directories for the given path
-  const removeFileDirectoryRecursively = fileDirPath => {
-    // Remove file
-    if (!fs.lstatSync(fileDirPath).isDirectory()) {
-      fs.unlinkSync(fileDirPath);
-      return;
-    }
-
-    // Go down the directory an remove each file / directory recursively
-    fs.readdirSync(fileDirPath).forEach(entry => {
-      const entryPath = path.join(fileDirPath, entry);
-      removeFileDirectoryRecursively(entryPath);
-    });
-    fs.rmdirSync(fileDirPath);
-  };
-
-  /// Remove TestApp/node_modules/react-native-library-name/node_modules directory
-  const removeLibraryNodeModulesPath = (libraryNodeModulesPath) => {
-    const nodeModulesPath = path.resolve(libraryNodeModulesPath, 'node_modules')
-
-    if (!fs.existsSync(nodeModulesPath)) {
-      console.log(`No node_modules path found at ${nodeModulesPath}. Skipping delete.`)
-      return;
-    }
-
-    console.log(`Deleting: ${nodeModulesPath}`)
-    try {
-      removeFileDirectoryRecursively(nodeModulesPath);
-      console.log(`Successfully deleted: ${nodeModulesPath}`)
-    } catch (err) {
-      console.log(`Error deleting ${nodeModulesPath}: ${err.message}`);
-    }
-  };
-
-  /// Remove all entries from the .npmignore within  TestApp/node_modules/react-native-library-name/
-  const removeLibraryNpmIgnorePaths = (npmIgnorePath, libraryNodeModulesPath) => {
-    if (!fs.existsSync(npmIgnorePath)) {
-      console.log(`No .npmignore path found at ${npmIgnorePath}. Skipping deleting content.`);
-      return;
-    }
-
-    fs.readFileSync(npmIgnorePath, 'utf8').split(/\r?\n/).forEach(entry => {
-      if (entry.length === 0) {
-        return
-      }
-
-      const npmIgnoreLibraryNodeModulesEntryPath = path.resolve(libraryNodeModulesPath, entry);
-      if (!fs.existsSync(npmIgnoreLibraryNodeModulesEntryPath)) {
-        return;
-      }
-
-      console.log(`Deleting: ${npmIgnoreLibraryNodeModulesEntryPath}`)
-      try {
-        removeFileDirectoryRecursively(npmIgnoreLibraryNodeModulesEntryPath);
-        console.log(`Successfully deleted: ${npmIgnoreLibraryNodeModulesEntryPath}`)
-      } catch (err) {
-        console.log(`Error deleting ${npmIgnoreLibraryNodeModulesEntryPath}: ${err.message}`);
-      }
-    });
-  };
-
-  // Main start sweeping process
-  (() => {
-    // Read out dir of example project
-    const exampleDir = process.cwd();
-
-    console.log(`Starting postinstall cleanup for ${exampleDir}`);
-
-    // Resolve the React Native library's path within the example's node_modules directory
-    const libraryNodeModulesPath = process.argv.length > 2
-      ? path.resolve(exampleDir, process.argv[2])
-      : path.resolve(exampleDir, 'node_modules', require('../package.json').name);
-
-    console.log(`Removing unwanted artifacts for ${libraryNodeModulesPath}`);
-
-    removeLibraryNodeModulesPath(libraryNodeModulesPath);
-
-    const npmIgnorePath = path.resolve(__dirname, '../.npmignore');
-    removeLibraryNpmIgnorePaths(npmIgnorePath, libraryNodeModulesPath);
-  })();