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

package/android/build.gradle

@@ -1,51 +1,100 @@
 buildscript {
-    ext.safeExtGet = {prop, fallback ->
-        rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+    ext.getExtOrFallback = { name, fallback ->
+        rootProject.ext.has(name) ? rootProject.ext.get(name) : fallback
     }
+
+    ext.getExtOrDefault = { name ->
+        getExtOrFallback(name, project.properties["lib_" + name])
+    }
+
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        // 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')}")
+        classpath "com.android.tools.build:gradle:${getExtOrDefault('gradlePluginVersion')}"
     }
 }
 
+def isNewArchitectureEnabled() {
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
 apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
+apply plugin: 'kotlin-android'
+
+def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
+
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
+}
+
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["lib_" + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["lib_" + name]).toInteger()
+}
+
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  if (major == 7 && minor >= 3) {
+    return true
+  }
 
-// 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 = 21
-def DEFAULT_TARGET_SDK_VERSION = 30
+  return major >= 8
+}
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+    if (supportsNamespace()) {
+        namespace "com.klarna.mobile.sdk.reactnative"
+
+        sourceSets {
+            main {
+              manifest.srcFile "src/main/AndroidManifestNew.xml"
+            }
+        }
+     }
+    compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
+        minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+        targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
         versionCode 1
         versionName "1.0"
     }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
     lintOptions {
         abortOnError false
+        disable "GradleCompatible"
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ["src/newarch/java"]
+            } else {
+                java.srcDirs += ["src/oldarch/java"]
+            }
+        }
     }
 }
 
 repositories {
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        // Matches recent template from React Native (0.59)
-        // https://github.com/facebook/react-native/blob/0.59-stable/template/android/build.gradle#L30
-        url "$projectDir/../node_modules/react-native/android"
-    }
     mavenCentral()
     google()
     maven {
@@ -54,7 +103,11 @@ repositories {
 }
 
 dependencies {
-    implementation "com.facebook.react:react-native:${safeExtGet('reactnativeVersion', '+')}"
+    // For < 0.71, this will be from the local maven repo
+    // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:${getExtOrFallback('reactnativeVersion', '+')}"
+
     implementation 'com.klarna.mobile:sdk:2.6.8'
 
     testImplementation "junit:junit:4.13"
@@ -69,87 +122,12 @@ dependencies {
     testImplementation "org.powermock:powermock-classloading-xstream:2.0.7"
 }
 
-def configureReactNativePom(def pom) {
-    def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.klarna"
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-
-        developers {
-            developer {
-                id packageJson.author.username
-                name packageJson.author.name
-            }
-        }
-    }
-}
-
-afterEvaluate { project ->
-
-    task androidJavadocs(type: Javadoc) {
-	    source = android.sourceSets.main.java.srcDirs
-	    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-	    android.libraryVariants.all { variant ->
-            if (variant.name == 'release') {
-                owner.classpath += variant.javaCompileProvider.get().classpath
-            }
-        }
-    }
-
-    task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-        archiveClassifier.set('javadoc')
-        from androidJavadocs.destinationDir
-    }
-
-    task androidSourcesJar(type: Jar) {
-        archiveClassifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        task "jar${name}"(type: Jar, dependsOn: variant.javaCompile) {
-            from variant.javaCompile.destinationDir
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocsJar
-    }
-
-    publishing {
-        publications {
-            sdkDefaultRelease(MavenPublication) {
-                def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
-                groupId "com.klarna"
-                artifactId packageJson.name
-                version packageJson.version
-                description packageJson.description
-
-                artifact(androidSourcesJar)
-                artifact(androidJavadocsJar)
-            }
-        }
-
-        repositories {
-            maven {
-                url = uri("file://${projectDir}/../android/maven")
-            }
-        }
-    }
+// removed from the docs but we can keep it
+// https://reactnative.dev/docs/0.71/new-architecture-library-intro
+if (isNewArchitectureEnabled()) {
+  react {
+    jsRootDir = file("../src/specs")
+    libraryName = "RNKlarnaMobileSDK"
+    codegenJavaPackageName = "com.klarna.mobile.sdk.reactnative"
+  }
 }

package/android/gradle.properties

@@ -15,3 +15,10 @@ org.gradle.jvmargs=-Xmx1536m
 kotlin.code.style=official
 android.useAndroidX=true
 android.enableJetifier=true
+
+lib_gradlePluginVersion=7.2.1
+lib_kotlinVersion=1.7.0
+lib_minSdkVersion=21
+lib_targetSdkVersion=31
+lib_compileSdkVersion=31
+lib_ndkVersion=21.4.7075529

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.klarna.inapp.sdk">
+          package="com.klarna.mobile.sdk.reactnative">
 
+    <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <uses-permission android:name="android.permission.INTERNET" />
+</manifest>

package/android/src/main/java/com/klarna/mobile/sdk/reactnative/KlarnaMobileSDKPackage.java

@@ -0,0 +1,33 @@
+package com.klarna.mobile.sdk.reactnative;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+import com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentViewManager;
+import com.klarna.mobile.sdk.reactnative.standalonewebview.KlarnaStandaloneWebViewManager;
+
+import java.util.Collections;
+import java.util.List;
+
+public class KlarnaMobileSDKPackage implements ReactPackage {
+
+    @NonNull
+    @Override
+    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+
+    @NonNull
+    @Override
+    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+        return List.of(
+                new KlarnaPaymentViewManager(reactContext, (Application) reactContext.getApplicationContext()),
+                new KlarnaStandaloneWebViewManager(reactContext, (Application) reactContext.getApplicationContext())
+        );
+    }
+}

package/android/src/main/java/com/klarna/mobile/sdk/reactnative/common/ArgumentsUtil.java

@@ -0,0 +1,62 @@
+package com.klarna.mobile.sdk.reactnative.common;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+
+import java.util.List;
+import java.util.Map;
+
+public class ArgumentsUtil {
+
+    public static WritableMap createMap(Map<String, Object> sourceMap) {
+        WritableMap map = Arguments.createMap();
+        for (Map.Entry<String, Object> entry : sourceMap.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            if (value == null) {
+                map.putNull(key);
+            } else if (value instanceof Boolean) {
+                map.putBoolean(key, (Boolean) value);
+            } else if (value instanceof String) {
+                map.putString(key, (String) value);
+            } else if (value instanceof Integer) {
+                map.putInt(key, (Integer) value);
+            } else if (value instanceof Double) {
+                map.putDouble(key, (Double) value);
+            } else if (value instanceof ReadableArray) {
+                map.putArray(key, (ReadableArray) value);
+            } else if (value instanceof ReadableMap) {
+                map.putMap(key, (ReadableMap) value);
+            }
+        }
+        return map;
+    }
+
+    public static WritableArray createArray(List<?> sourceList) {
+        WritableArray array = Arguments.createArray();
+        if (sourceList != null && sourceList.size() > 0) {
+            for (int i = 0; i < sourceList.size(); i++) {
+                Object value = sourceList.get(i);
+                if (value == null) {
+                    array.pushNull();
+                } else if (value instanceof Boolean) {
+                    array.pushBoolean((Boolean) value);
+                } else if (value instanceof String) {
+                    array.pushString((String) value);
+                } else if (value instanceof Integer) {
+                    array.pushInt((Integer) value);
+                } else if (value instanceof Double) {
+                    array.pushDouble((Double) value);
+                } else if (value instanceof ReadableArray) {
+                    array.pushArray((ReadableArray) value);
+                } else if (value instanceof ReadableMap) {
+                    array.pushMap((ReadableMap) value);
+                }
+            }
+        }
+        return array;
+    }
+}

package/android/src/main/java/com/klarna/mobile/sdk/reactnative/common/WebViewResizeObserver.java

@@ -0,0 +1,100 @@
+package com.klarna.mobile.sdk.reactnative.common;
+
+import android.os.Build;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebView;
+
+import java.lang.ref.WeakReference;
+
+public class WebViewResizeObserver {
+    /**
+     * The interface between the wrapper and listener class
+     * to send the updated height values
+     */
+    public interface WebViewResizeObserverCallback {
+        void onResized(int value);
+    }
+
+    private static final String JS_INTERFACE_NAME = "NativeResizeObserver";
+    private final WeakReference<WebViewResizeObserverCallback> callback;
+
+    public WebViewResizeObserver(WebViewResizeObserverCallback callback) {
+        this.callback = new WeakReference<>(callback);
+    }
+
+    public void addInterface(WebView webView) {
+        webView.addJavascriptInterface(this, JS_INTERFACE_NAME);
+    }
+
+    public void injectListener(WebView webView) {
+        injectScript(webView, initScript());
+    }
+
+    /**
+     * The javascript interface method that is called when there's a
+     * 'resize' event
+     *
+     * @param value The height value which is sent from the 'resize' listener
+     */
+    @JavascriptInterface
+    public void onResized(int value) {
+        sendHeightValue(value);
+    }
+
+    /**
+     * Unwraps and null checks the callback object and sends
+     * the height value to wrapper through this callback
+     *
+     * @param value The updated height value to send to wrapper
+     */
+    private void sendHeightValue(int value) {
+        WebViewResizeObserverCallback callbackInstance = callback.get();
+        if (callbackInstance != null) {
+            callbackInstance.onResized(value);
+        }
+    }
+
+    private void injectScript(WebView webView, String script) {
+        String tryCatchScript = "try {\n" +
+                "    " + script + "\n" +
+                "} catch (error) {\n" +
+                "    console.error(\"inject failed\")\n" +
+                "}";
+        evaluateJSCompat(webView, tryCatchScript);
+    }
+
+    /**
+     * Evaluates a script inside a web view in a backward-compatible manner
+     *
+     * @param webView The web view to evaluate the script
+     * @param script  The script to be evaluated
+     */
+    private void evaluateJSCompat(WebView webView, String script) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            webView.evaluateJavascript(script, null);
+        } else {
+            webView.loadUrl("javascript:" + script);
+        }
+    }
+
+    private String initScript() {
+        return "const container = document.querySelector('#payment-container');\n" +
+                "const resizeObserver = new ResizeObserver((entries) => {\n" +
+                "    for (let entry of entries) {\n" +
+                "        console.log('New dimensions found: ', entry);\n" +
+                "        if (entry.contentRect) {\n" +
+                "            const height = entry.contentRect.height;\n" +
+                "            const listener = window.NativeResizeObserver;\n" +
+                "            if (listener != null) {\n" +
+                "                listener.onResized(height);\n" +
+                "            }\n" +
+                "        }\n" +
+                "    }\n" +
+                "    console.log('Container size changed');\n" +
+                "});\n" +
+                "if (container != null) {\n" +
+                "    resizeObserver.observe(container);\n" +
+                "}\n" +
+                "console.log('Resize observer initialized');";
+    }
+}

package/android/src/main/java/com/klarna/{inapp/sdk → mobile/sdk/reactnative/payments}/KlarnaPaymentEvent.java

@@ -1,4 +1,4 @@
-package com.klarna.inapp.sdk;
+package com.klarna.mobile.sdk.reactnative.payments;
 
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
@@ -7,14 +7,10 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * A `KlarnaPaymentEvent` builds the event that will be eventually sent via `on<event>`.
- *
+ * <p>
  * It consists of a flat JSON object with a single `name` parameter for the event name as well as
  * other, optional parameters depending on the function that was called.
  */
@@ -27,14 +23,15 @@ public class KlarnaPaymentEvent extends Event<KlarnaPaymentEvent> {
     public static final String EVENT_NAME_ON_REAUTHORIZE = "onReauthorized";
     public static final String EVENT_NAME_ON_FINALIZE = "onFinalized";
     public static final String EVENT_NAME_ON_ERROR = "onError";
+    public static final String EVENT_NAME_ON_RESIZED = "onResized";
 
     @NonNull
     private final String eventName;
 
     @Nullable
-    private final Map<String, Object> additionalParams;
+    private final WritableMap additionalParams;
 
-    public KlarnaPaymentEvent(@IdRes int viewId, @NonNull String eventName, @Nullable Map<String, Object> additionalParams) {
+    public KlarnaPaymentEvent(@IdRes int viewId, @NonNull String eventName, @Nullable WritableMap additionalParams) {
         super(viewId);
         this.eventName = eventName;
         this.additionalParams = additionalParams;
@@ -45,19 +42,12 @@ public class KlarnaPaymentEvent extends Event<KlarnaPaymentEvent> {
         return eventName;
     }
 
-    /**
-     * Composes and sends the event JSON object being sent up to JS.
-     * @param rctEventEmitter
-     */
+    @Nullable
     @Override
-    public void dispatch(RCTEventEmitter rctEventEmitter) {
-        Map<String, Object> map = new HashMap<>();
-
+    protected WritableMap getEventData() {
         if (additionalParams != null) {
-            map.putAll(additionalParams);
+            return additionalParams;
         }
-
-        WritableMap eventData = Arguments.makeNativeMap(map);
-        rctEventEmitter.receiveEvent(getViewTag(), getEventName(), eventData);
+        return Arguments.createMap();
     }
 }