leap-capacitor 2.0.7 → 2.0.8

package/LeapCapacitor.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.dependency 'Capacitor'
   s.swift_version = '5.1'
 
-  s.dependency "LeapSDK", "2.0.6"
+  s.dependency "LeapSDK", "2.0.7"
 end

package/README.md

@@ -14,7 +14,7 @@ npx cap sync
 <docgen-index>
 
 * [`start(...)`](#start)
-* [`startWithSelfHostedURL(...)`](#startwithselfhostedurl)
+* [`startWithSelfHostingEnabled(...)`](#startwithselfhostingenabled)
 * [`flushProperties(...)`](#flushproperties)
 * [`setUniqueUserId(...)`](#setuniqueuserid)
 * [`startProject(...)`](#startproject)
@@ -45,15 +45,15 @@ start(options: { apiKey: string; }) => Promise<void>
 --------------------
 
 
-### startWithSelfHostedURL(...)
+### startWithSelfHostingEnabled(...)
 
 ```typescript
-startWithSelfHostedURL(options: { baseURL: string; }) => Promise<void>
+startWithSelfHostingEnabled(options: { apiKey: string; baseUrl: string; }) => Promise<void>
 ```
 
-| Param         | Type                              |
-| ------------- | --------------------------------- |
-| **`options`** | <code>{ baseURL: string; }</code> |
+| Param         | Type                                              |
+| ------------- | ------------------------------------------------- |
+| **`options`** | <code>{ apiKey: string; baseUrl: string; }</code> |
 
 --------------------
 

package/android/build.gradle

@@ -52,7 +52,7 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
-    implementation 'is.leap.android:sdk:2.0.9'
+    implementation 'is.leap.android:sdk:2.0.10'
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"

package/android/src/main/java/is/leap/capacitor/LeapPlugin.java

@@ -43,7 +43,7 @@ import is.leap.android.core.LeapElementActionCallbacks;
 public class LeapPlugin extends Plugin {
 
     public static final String API_KEY = "apiKey";
-    public static final String SELF_HOSTING_BASE_URL = "baseURL";
+    public static final String SELF_HOSTING_BASE_URL = "baseUrl";
     public static final String PROPERTIES = "properties";
     public static final String DATE_TYPE_PREFIX = "Date:";
     public static final String PROJECT_IDS = "projectIds";
@@ -73,77 +73,15 @@ public class LeapPlugin extends Plugin {
     }
 
     @PluginMethod
-    public void startWithSelfHostedURL(PluginCall call) {
+    public void startWithSelfHostingEnabled(PluginCall call) {
+        String apiKey = call.getString(API_KEY);
         String baseURL = call.getString(SELF_HOSTING_BASE_URL);
         Leap.withSelfHostedBuilder()
                 .setBaseUrl(baseURL)
-                .start();
+                .start(apiKey);
         call.resolve();
     }
 
-//    @PluginMethod
-//    public void startWithSelfHostedURLAndProperties(PluginCall call) {
-//        String baseURL = call.getString(SELF_HOSTING_BASE_URL);
-//        JSObject propsObj = call.getObject(PROPERTIES);
-//        Leap.Builder builder = Leap.withSelfHostedBuilder()
-//                .setBaseUrl(baseURL);
-//
-//        if(propsObj == null) {
-//            builder.start();
-//            call.resolve();
-//            return;
-//        }
-//
-//        startWithProperties(propsObj, builder);
-//        call.resolve();
-//    }
-
-
-
-//    @PluginMethod
-//    public void startWithProperties(PluginCall call) {
-//        String apiKey = call.getString(API_KEY);
-//        JSObject propsObj = call.getObject(PROPERTIES);
-//        if(propsObj == null) {
-//            Leap.start(apiKey);
-//            call.resolve();
-//            return;
-//        }
-//        Leap.Builder leapBuilder = Leap.withBuilder(apiKey);
-//        startWithProperties(propsObj, leapBuilder);
-//        call.resolve();
-//    }
-
-//    private void startWithProperties(JSObject propsObj, Leap.Builder leapBuilder) {
-//        Iterator<String> iterator = propsObj.keys();
-//
-//        while (iterator.hasNext()) {
-//            String key = iterator.next();
-//            Object propValue = null;
-//            try {
-//                propValue = propsObj.get(key);
-//            } catch (JSONException e) {
-//
-//            }
-//            if(propValue instanceof  String) {
-//                String valueStr = (String) propValue;
-//                if (valueStr.startsWith(DATE_TYPE_PREFIX)) {
-//                    String[] split = valueStr.split(DATE_TYPE_PREFIX);
-//                    if (split.length != 2) continue;
-//                    String dateValue = split[1];
-//                    Date date = getDate(dateValue);
-//                    if(date != null) leapBuilder.addProperty(key, date);
-//                    continue;
-//                }
-//                leapBuilder.addProperty(key, String.valueOf(propValue));
-//            } else if (propValue instanceof Number) {
-//                leapBuilder.addProperty(key, (long) propValue);
-//            }
-//
-//        }
-//        leapBuilder.start();
-//    }
-
     @PluginMethod
     public void flushProperties(PluginCall call) {
         JSObject propsObj = call.getObject(PROPERTIES);

package/dist/docs.json

@@ -22,20 +22,20 @@
         "slug": "start"
       },
       {
-        "name": "startWithSelfHostedURL",
-        "signature": "(options: { baseURL: string; }) => Promise<void>",
+        "name": "startWithSelfHostingEnabled",
+        "signature": "(options: { apiKey: string; baseUrl: string; }) => Promise<void>",
         "parameters": [
           {
             "name": "options",
             "docs": "",
-            "type": "{ baseURL: string; }"
+            "type": "{ apiKey: string; baseUrl: string; }"
           }
         ],
         "returns": "Promise<void>",
         "tags": [],
         "docs": "",
         "complexTypes": [],
-        "slug": "startwithselfhostedurl"
+        "slug": "startwithselfhostingenabled"
       },
       {
         "name": "flushProperties",

package/dist/esm/definitions.d.ts

@@ -12,8 +12,9 @@ export interface LeapPluginInterface {
     start(options: {
         apiKey: string;
     }): Promise<void>;
-    startWithSelfHostedURL(options: {
-        baseURL: string;
+    startWithSelfHostingEnabled(options: {
+        apiKey: string;
+        baseUrl: string;
     }): Promise<void>;
     flushProperties(options: {
         properties: UserProperty;

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["\nimport type { PluginListenerHandle } from '@capacitor/core';\n\nexport interface UserProperty {\n  [key: string]: string | number\n}\n\nexport interface LeapCallbacks {\n  [key: string]: string\n}\n\nexport interface LeapElementActionCallbacks {\n  [key: string]: any\n}\n\nexport interface LeapPluginInterface {\n  start(options: { apiKey: string }): Promise<void>;\n  // startWithProperties(options: { apiKey: string, properties: UserProperty }): Promise<void>;\n  startWithSelfHostedURL(options:{baseURL: string}):Promise<void>;\n  // startWithSelfHostedURLAndProperties(options:{baseURL:string, properties: UserProperty}):Promise<void>;\n  flushProperties(options: { properties: UserProperty }): Promise<void>;\n  setUniqueUserId(options: { uniqueUserId: string }): Promise<void>;\n  startProject(options: { projectId: string, resetProject?: boolean }): Promise<void>;\n  embedProject(options: { projectId: string }): Promise<void>;\n  offlineSync(options: { projectIds: Array<string> }): Promise<void>;\n  disable(): Promise<void>;\n  logout(): Promise<void>;\n  setAppLocale(options: {localeCode: string}): Promise<void>;\n\n  addListener(\n    eventName: 'leapCallbacks',\n    listenerFunc: (event: LeapCallbacks) => void,\n  ): Promise<PluginListenerHandle> & PluginListenerHandle\n\n  addListener(\n    eventName: 'leapElementActionCallbacks',\n    listenerFunc: (event: LeapElementActionCallbacks) => void,\n  ): Promise<PluginListenerHandle> & PluginListenerHandle\n\n\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["\nimport type { PluginListenerHandle } from '@capacitor/core';\n\nexport interface UserProperty {\n  [key: string]: string | number\n}\n\nexport interface LeapCallbacks {\n  [key: string]: string\n}\n\nexport interface LeapElementActionCallbacks {\n  [key: string]: any\n}\n\nexport interface LeapPluginInterface {\n  start(options: { apiKey: string }): Promise<void>;\n  startWithSelfHostingEnabled(options:{apiKey: string,baseUrl: string}):Promise<void>;\n  flushProperties(options: { properties: UserProperty }): Promise<void>;\n  setUniqueUserId(options: { uniqueUserId: string }): Promise<void>;\n  startProject(options: { projectId: string, resetProject?: boolean }): Promise<void>;\n  embedProject(options: { projectId: string }): Promise<void>;\n  offlineSync(options: { projectIds: Array<string> }): Promise<void>;\n  disable(): Promise<void>;\n  logout(): Promise<void>;\n  setAppLocale(options: {localeCode: string}): Promise<void>;\n\n  addListener(\n    eventName: 'leapCallbacks',\n    listenerFunc: (event: LeapCallbacks) => void,\n  ): Promise<PluginListenerHandle> & PluginListenerHandle\n\n  addListener(\n    eventName: 'leapElementActionCallbacks',\n    listenerFunc: (event: LeapElementActionCallbacks) => void,\n  ): Promise<PluginListenerHandle> & PluginListenerHandle\n\n\n}\n"]}

package/ios/Plugin/LeapPlugin.m

@@ -5,9 +5,7 @@
 // each method the plugin supports using the CAP_PLUGIN_METHOD macro.
 CAP_PLUGIN(LeapPlugin, "LeapPlugin",
            CAP_PLUGIN_METHOD(start, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(startWithProperties, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(startWithSelfHostedURL, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(startWithSelfHostedURLAndProperties, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(startWithSelfHostingEnabled, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(flushProperties, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(startProject, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(embedProject, CAPPluginReturnPromise);

package/ios/Plugin/LeapPlugin.swift

@@ -5,7 +5,7 @@ import LeapSDK
 let API_KEY         = "apiKey"
 let PROPERTIES      = "properties"
 let DATE_PREFIX     = "Date:"
-let BASE_URL        = "baseURL"
+let BASE_URL        = "baseUrl"
 let UNIQUE_USER_ID  = "uniqueUserId"
 let LOCALE_CODE     = "localeCode"
 let PROJECT_ID      = "projectId"
@@ -32,38 +32,16 @@ public class LeapPlugin: CAPPlugin {
         call.resolve()
     }
     
-    @objc public func startWithProperties(_ call: CAPPluginCall) {
-        let apiKey = call.getString(API_KEY) ?? ""
-        let properties:[String:AnyHashable] = call.getObject(PROPERTIES) as? [String:AnyHashable] ?? [:]
-        DispatchQueue.main.async {[weak self] in
-            let leapShared = Leap.shared.withBuilder(apiKey)
-            self?.addProperties(properties: properties)
-            leapShared?.start()
-        }
-        call.resolve()
-    }
-    
-    @objc public func startWithSelfHostedURL(_ call:CAPPluginCall) {
-        if let baseUrl = call.getString(BASE_URL) {
+    @objc public func startWithSelfHostingEnabled(_ call:CAPPluginCall) {
+        if let apiKey = call.getString(API_KEY),
+           let baseUrl = call.getString(BASE_URL) {
             DispatchQueue.main.async {
-                Leap.shared.withSelfHostedBuilder()?.setBaseUrl(baseUrl)?.start()
+                Leap.shared.withSelfHostedBuilder()?.setBaseUrl(baseUrl)?.start(apiKey)
             }
         }
         call.resolve()
     }
-    
-    @objc public func startWithSelfHostedURLAndProperties(_ call:CAPPluginCall) {
-        if let baseUrl = call.getString(BASE_URL) {
-            let properties = call.getObject(PROPERTIES) as? [String:AnyHashable] ?? [:]
-            DispatchQueue.main.async {[weak self] in
-                Leap.shared.withSelfHostedBuilder()?.setBaseUrl(baseUrl)
-                self?.addProperties(properties: properties)
-                Leap.shared.start()
-            }
-        }
-        call.resolve()
-    }
-    
+      
     @objc public func flushProperties(_ call: CAPPluginCall) {
         let properties:[String:AnyHashable] = call.getObject(PROPERTIES) as? [String:AnyHashable] ?? [:]
         DispatchQueue.main.async {[weak self] in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leap-capacitor",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Plugin for Leap",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",