leap-capacitor 1.2.0 → 1.3.1

package/README.md

@@ -23,6 +23,7 @@ npx cap sync
 * [`embedProject(...)`](#embedproject)
 * [`offlineSync(...)`](#offlinesync)
 * [`disable()`](#disable)
+* [`logout()`](#logout)
 * [`setAppLocale(...)`](#setapplocale)
 * [`addListener('leapCallbacks', ...)`](#addlistenerleapcallbacks)
 * [`addListener('leapElementActionCallbacks', ...)`](#addlistenerleapelementactioncallbacks)
@@ -159,6 +160,15 @@ disable() => Promise<void>
 --------------------
 
 
+### logout()
+
+```typescript
+logout() => Promise<void>
+```
+
+--------------------
+
+
 ### setAppLocale(...)
 
 ```typescript

package/android/build.gradle

@@ -51,7 +51,7 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
-    implementation 'is.leap.android:sdk:1.7.0'
+    implementation 'is.leap.android:sdk:1.8.6'
     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

@@ -59,7 +59,6 @@ public class LeapPlugin extends Plugin {
     private static final String FORMAT_SDF = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
     private static final String TIMEZONE_GMT = "GMT";
     public static final String LOCALE_CODE = "localeCode";
-    public static final String WFX_CLIENT_UNIQUE_ID = "wfx_user_id";
 
     public LeapPlugin() {
         setLeapEventEmitter();
@@ -120,11 +119,6 @@ public class LeapPlugin extends Plugin {
 
         while (iterator.hasNext()) {
             String key = iterator.next();
-            if(WFX_CLIENT_UNIQUE_ID.equals(key)) {
-                String uniqueId = propsObj.getString(key);
-                leapBuilder.addUniqueId(uniqueId);
-                continue;
-            }
             Object propValue = null;
             try {
                 propValue = propsObj.get(key);
@@ -187,6 +181,12 @@ public class LeapPlugin extends Plugin {
         call.resolve();
     }
 
+    @PluginMethod
+    public static void logout(PluginCall call) {
+        Leap.logout();
+        call.resolve();
+    }
+
     @PluginMethod
     public static void startProject(PluginCall call) {
         String projectID = call.getString(PROJECT_ID);
@@ -229,8 +229,9 @@ public class LeapPlugin extends Plugin {
     }
 
     @PluginMethod
-    public void disable() {
+    public void disable(PluginCall call) {
         Leap.disable();
+        call.resolve();
     }
 
     @PluginMethod

package/dist/docs.json

@@ -167,6 +167,16 @@
         "complexTypes": [],
         "slug": "disable"
       },
+      {
+        "name": "logout",
+        "signature": "() => Promise<void>",
+        "parameters": [],
+        "returns": "Promise<void>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "logout"
+      },
       {
         "name": "setAppLocale",
         "signature": "(options: { localeCode: string; }) => Promise<void>",

package/dist/esm/definitions.d.ts

@@ -40,6 +40,7 @@ export interface LeapPluginInterface {
         projectIds: Array<string>;
     }): Promise<void>;
     disable(): Promise<void>;
+    logout(): Promise<void>;
     setAppLocale(options: {
         localeCode: string;
     }): Promise<void>;

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  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  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"]}

package/ios/Plugin/LeapPlugin.m

@@ -15,4 +15,5 @@ CAP_PLUGIN(LeapPlugin, "LeapPlugin",
            CAP_PLUGIN_METHOD(setAppLocale, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(offlineSync, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(disable, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(logout, CAPPluginReturnPromise);
 )

package/ios/Plugin/LeapPlugin.swift

@@ -14,7 +14,6 @@ let PROJECT_IDS     = "projectIds"
 let DATE_FORMAT     = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
 let DATE_LOCALE     = "en_US_POSIX"
 let LEAP_CALLBACKS  = "leapCallbacks"
-let WFX_UNIQUE_ID   = "wfx_user_id"
 
 /**
  * Please read the Capacitor iOS Plugin Development Guide
@@ -38,7 +37,6 @@ public class LeapPlugin: CAPPlugin {
         let properties:[String:AnyHashable] = call.getObject(PROPERTIES) as? [String:AnyHashable] ?? [:]
         DispatchQueue.main.async {[weak self] in
             let leapShared = Leap.shared.withBuilder(apiKey)
-            if let wfxId = properties[WFX_UNIQUE_ID] as? String { Leap.shared.addUniqueUserId(wfxId) }
             self?.addProperties(properties: properties)
             leapShared?.start()
         }
@@ -59,7 +57,6 @@ public class LeapPlugin: CAPPlugin {
             let properties = call.getObject(PROPERTIES) as? [String:AnyHashable] ?? [:]
             DispatchQueue.main.async {[weak self] in
                 Leap.shared.withSelfHostedBuilder()?.setBaseUrl(baseUrl)
-                if let wfxId = properties[WFX_UNIQUE_ID] as? String { Leap.shared.addUniqueUserId(wfxId) }
                 self?.addProperties(properties: properties)
                 Leap.shared.start()
             }
@@ -125,21 +122,26 @@ public class LeapPlugin: CAPPlugin {
         call.resolve()
     }
     
+    @objc public func logout(_  call: CAPPluginCall) {
+        DispatchQueue.main.async {
+            Leap.shared.logout()
+        }
+        call.resolve()
+    }
+    
     func addProperties(properties:[String:AnyHashable]) {
         properties.forEach { key, value in
-            if key != WFX_UNIQUE_ID {
-                if let stringValue = value as? String {
-                    if stringValue.hasPrefix(DATE_PREFIX) {
-                        let dateValue = stringValue.components(separatedBy: DATE_PREFIX).last ?? ""
-                        if let date = self.getDateFromISOString(dateString: dateValue) {
-                            Leap.shared.addProperty(key, dateValue: date)
-                        }
-                    } else {
-                        Leap.shared.addProperty(key, stringValue: stringValue)
+            if let stringValue = value as? String {
+                if stringValue.hasPrefix(DATE_PREFIX) {
+                    let dateValue = stringValue.components(separatedBy: DATE_PREFIX).last ?? ""
+                    if let date = self.getDateFromISOString(dateString: dateValue) {
+                        Leap.shared.addProperty(key, dateValue: date)
                     }
-                } else if let intValue = value as? Int {
-                    Leap.shared.addProperty(key, intValue: intValue)
+                } else {
+                    Leap.shared.addProperty(key, stringValue: stringValue)
                 }
+            } else if let intValue = value as? Int {
+                Leap.shared.addProperty(key, intValue: intValue)
             }
         }
     }

package/package.json

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