@grouplinknetwork/rn-grouplink-sdk 2.0.2 → 2.1.1

package/android/src/main/java/com/grouplinksdk/GrouplinkSdkModule.java

@@ -54,7 +54,7 @@ public class GrouplinkSdkModule extends ReactContextBaseJavaModule implements Li
             promise.resolve(userId);
         }catch(Exception e){
             e.printStackTrace();
-            promise.resolve("not registered");
+            promise.reject("not registered");
         }
     }
 

package/ios/GrouplinkSdk.m

@@ -2,9 +2,7 @@
 
 @interface RCT_EXTERN_MODULE(RNGroupLinkSDK, NSObject)
 
-RCT_EXTERN_METHOD(startIOS:(NSString)withToken)
 RCT_EXTERN_METHOD(startBluetoothIOS)
-RCT_EXTERN_METHOD(checkBluetoothIOS)
 RCT_EXTERN_METHOD(startLocationIOS)
 RCT_EXTERN_METHOD(setDevicePushToken:(NSString)withPushToken)
 RCT_EXTERN_METHOD(getUserID:

package/ios/GrouplinkSdk.swift

@@ -18,14 +18,17 @@ class RNGroupLinkSDK: NSObject {
   func startLocationIOS() -> Void {
     GroupLinkSDK.startLocation()
   }
-  
-  @objc(checkBluetoothIOS)
-  func checkBluetoothIOS() -> Void {
-    GroupLinkSDK.checkBluetooth()
-  }
 
   @objc(getUserID:rejecter:)
   func getUserID(_ resolve: RCTPromiseResolveBlock, rejecter reject:RCTPromiseRejectBlock) -> Void {
+      if GroupLinkSDK.getUserID() != nil {
+          reject("NO_USER_ID", "Could not get userID at this moment", SDK_ERROR.NO_USER_ID)
+      } else {
         resolve(GroupLinkSDK.getUserID())
+      }
   }
 }
+
+enum SDK_ERROR: Error {
+    case NO_USER_ID
+}

package/lib/commonjs/index.js

@@ -24,14 +24,24 @@ function startGrouplinkAndroid(token, debbugable) {
     startAndroid(token, debbugable);
   }
 }
-function getUserId() {
+async function getUserId() {
   if (isAndroid()) {
-    return RNGroupLinkSDK.getUserIdAndroid();
+    const userID = await RNGroupLinkSDK.getUserIdAndroid();
+    if (userID != "User not registered yet.") {
+      return Promise.resolve(userID);
+    } else {
+      return Promise.reject("UserID not registered yet");
+    }
   }
   if (isiOS()) {
-    return RNGroupLinkSDK.getUserID();
+    const userID = await RNGroupLinkSDK.getUserID();
+    if (userID != null) {
+      return Promise.resolve(userID);
+    } else {
+      return Promise.reject("UserID not registered yet");
+    }
   }
-  return Promise.resolve(null);
+  return Promise.reject("Internal Error");
 }
 function setFirebaseToken(token) {
   if (isAndroid()) {
@@ -66,9 +76,6 @@ function startAndroid(withToken, debbugable) {
   console.log('Group Link SDK (Android) - Start with token: ', withToken);
   return RNGroupLinkSDK.startAndroid(withToken, debbugable);
 }
-// function getUserIdAndroid(success: (userId: string) => void) {
-//   RNGroupLinkSDK.getUserIdAndroid(success);
-// }
 
 // function getUserIDiOS(success: (userId: string) => void) {
 //   RNGroupLinkSDK.getUserID(success);

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","RNGroupLinkSDK","NativeModules","Proxy","get","Error","startGrouplinkAndroid","token","debbugable","isAndroid","startAndroid","getUserId","getUserIdAndroid","isiOS","getUserID","Promise","resolve","setFirebaseToken","console","log","startBluetoothIOS","setDevicePushTokenIOS","setDevicePushToken","startLocationIOS","OS","withToken"],"sources":["index.tsx"],"sourcesContent":["import { NativeModules, Platform } from 'react-native';\n\nconst LINKING_ERROR =\n  `The package 'grouplink-sdk' doesn't seem to be linked. Make sure: \\n\\n` +\n  Platform.select({ ios: \"- You have run 'pod install'\\n\", default: '' }) +\n  '- You rebuilt the app after installing the package\\n' +\n  '- You are not using Expo managed workflow\\n';\n\nconst RNGroupLinkSDK = NativeModules.RNGroupLinkSDK\n  ? NativeModules.RNGroupLinkSDK\n  : new Proxy(\n      {},\n      {\n        get() {\n          throw new Error(LINKING_ERROR);\n        },\n      }\n    );\n\nexport function startGrouplinkAndroid(token: string, debbugable: boolean) {\n  if (isAndroid()) {\n    startAndroid(token, debbugable);\n  }\n}\n\nexport function getUserId(): Promise<number | null> {\n  if (isAndroid()) {\n    return RNGroupLinkSDK.getUserIdAndroid();\n  }\n  if (isiOS()) {\n    return RNGroupLinkSDK.getUserID();\n  }\n  return Promise.resolve(null);\n}\n\nexport function setFirebaseToken(token: string) {\n  if (isAndroid()) {\n    console.log('Android: setting firebase token');\n    RNGroupLinkSDK.setFirebaseToken(token);\n  }\n}\n\nexport function startBluetoothIOS() {\n  if (isiOS()) {\n    console.log('Group Link SDK (iOS) - Start Bluetooth Stack');\n    return RNGroupLinkSDK.startBluetoothIOS();\n  }\n  return;\n}\n\nexport function setDevicePushTokenIOS(token: string) {\n  return RNGroupLinkSDK.setDevicePushToken(token);\n}\n\nexport function startLocationIOS() {\n  if (isiOS()) {\n    console.log('Group Link SDK (iOS) - Start Location Stack');\n    return RNGroupLinkSDK.startLocationIOS();\n  }\n  return;\n}\n\nfunction isAndroid() {\n  return Platform.OS == 'android';\n}\n\nfunction isiOS() {\n  return Platform.OS == 'ios';\n}\n\nfunction startAndroid(withToken: string, debbugable: boolean) {\n  console.log('Group Link SDK (Android) - Start with token: ', withToken);\n  return RNGroupLinkSDK.startAndroid(withToken, debbugable);\n}\n// function getUserIdAndroid(success: (userId: string) => void) {\n//   RNGroupLinkSDK.getUserIdAndroid(success);\n// }\n\n// function getUserIDiOS(success: (userId: string) => void) {\n//   RNGroupLinkSDK.getUserID(success);\n// }\n\n// function success(userId: string): void {\n//   throw new Error('Function not implemented.');\n// }\n"],"mappings":";;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,aAAa,GAChB,wEAAuE,GACxEC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,6CAA6C;AAE/C,MAAMC,cAAc,GAAGC,0BAAa,CAACD,cAAc,GAC/CC,0BAAa,CAACD,cAAc,GAC5B,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEE,SAASU,qBAAqBA,CAACC,KAAa,EAAEC,UAAmB,EAAE;EACxE,IAAIC,SAAS,CAAC,CAAC,EAAE;IACfC,YAAY,CAACH,KAAK,EAAEC,UAAU,CAAC;EACjC;AACF;AAEO,SAASG,SAASA,CAAA,EAA2B;EAClD,IAAIF,SAAS,CAAC,CAAC,EAAE;IACf,OAAOR,cAAc,CAACW,gBAAgB,CAAC,CAAC;EAC1C;EACA,IAAIC,KAAK,CAAC,CAAC,EAAE;IACX,OAAOZ,cAAc,CAACa,SAAS,CAAC,CAAC;EACnC;EACA,OAAOC,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;AAC9B;AAEO,SAASC,gBAAgBA,CAACV,KAAa,EAAE;EAC9C,IAAIE,SAAS,CAAC,CAAC,EAAE;IACfS,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;IAC9ClB,cAAc,CAACgB,gBAAgB,CAACV,KAAK,CAAC;EACxC;AACF;AAEO,SAASa,iBAAiBA,CAAA,EAAG;EAClC,IAAIP,KAAK,CAAC,CAAC,EAAE;IACXK,OAAO,CAACC,GAAG,CAAC,8CAA8C,CAAC;IAC3D,OAAOlB,cAAc,CAACmB,iBAAiB,CAAC,CAAC;EAC3C;EACA;AACF;AAEO,SAASC,qBAAqBA,CAACd,KAAa,EAAE;EACnD,OAAON,cAAc,CAACqB,kBAAkB,CAACf,KAAK,CAAC;AACjD;AAEO,SAASgB,gBAAgBA,CAAA,EAAG;EACjC,IAAIV,KAAK,CAAC,CAAC,EAAE;IACXK,OAAO,CAACC,GAAG,CAAC,6CAA6C,CAAC;IAC1D,OAAOlB,cAAc,CAACsB,gBAAgB,CAAC,CAAC;EAC1C;EACA;AACF;AAEA,SAASd,SAASA,CAAA,EAAG;EACnB,OAAOZ,qBAAQ,CAAC2B,EAAE,IAAI,SAAS;AACjC;AAEA,SAASX,KAAKA,CAAA,EAAG;EACf,OAAOhB,qBAAQ,CAAC2B,EAAE,IAAI,KAAK;AAC7B;AAEA,SAASd,YAAYA,CAACe,SAAiB,EAAEjB,UAAmB,EAAE;EAC5DU,OAAO,CAACC,GAAG,CAAC,+CAA+C,EAAEM,SAAS,CAAC;EACvE,OAAOxB,cAAc,CAACS,YAAY,CAACe,SAAS,EAAEjB,UAAU,CAAC;AAC3D;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA"}
+{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","RNGroupLinkSDK","NativeModules","Proxy","get","Error","startGrouplinkAndroid","token","debbugable","isAndroid","startAndroid","getUserId","userID","getUserIdAndroid","Promise","resolve","reject","isiOS","getUserID","setFirebaseToken","console","log","startBluetoothIOS","setDevicePushTokenIOS","setDevicePushToken","startLocationIOS","OS","withToken"],"sources":["index.tsx"],"sourcesContent":["import { NativeModules, Platform } from 'react-native';\n\nconst LINKING_ERROR =\n  `The package 'grouplink-sdk' doesn't seem to be linked. Make sure: \\n\\n` +\n  Platform.select({ ios: \"- You have run 'pod install'\\n\", default: '' }) +\n  '- You rebuilt the app after installing the package\\n' +\n  '- You are not using Expo managed workflow\\n';\n\nconst RNGroupLinkSDK = NativeModules.RNGroupLinkSDK\n  ? NativeModules.RNGroupLinkSDK\n  : new Proxy(\n      {},\n      {\n        get() {\n          throw new Error(LINKING_ERROR);\n        },\n      }\n    );\n\nexport function startGrouplinkAndroid(token: string, debbugable: boolean) {\n  if (isAndroid()) {\n    startAndroid(token, debbugable);\n  }\n}\n\nexport async function getUserId(): Promise<string | null> {\n  if (isAndroid()) {\n    const userID: string = await RNGroupLinkSDK.getUserIdAndroid();\n    if(userID != \"User not registered yet.\") {\n      return Promise.resolve(userID);  \n    } else {\n      return Promise.reject(\"UserID not registered yet\")\n    }\n  }\n  if (isiOS()) {\n    const userID: string = await RNGroupLinkSDK.getUserID();\n    if(userID != null) {\n      return Promise.resolve(userID);  \n    } else {\n      return Promise.reject(\"UserID not registered yet\")\n    }\n  }\n  return Promise.reject(\"Internal Error\");\n}\n\nexport function setFirebaseToken(token: string) {\n  if (isAndroid()) {\n    console.log('Android: setting firebase token');\n    RNGroupLinkSDK.setFirebaseToken(token);\n  }\n}\n\nexport function startBluetoothIOS() {\n  if (isiOS()) {\n    console.log('Group Link SDK (iOS) - Start Bluetooth Stack');\n    return RNGroupLinkSDK.startBluetoothIOS();\n  }\n  return;\n}\n\nexport function setDevicePushTokenIOS(token: string) {\n  return RNGroupLinkSDK.setDevicePushToken(token);\n}\n\nexport function startLocationIOS() {\n  if (isiOS()) {\n    console.log('Group Link SDK (iOS) - Start Location Stack');\n    return RNGroupLinkSDK.startLocationIOS();\n  }\n  return;\n}\n\nfunction isAndroid() {\n  return Platform.OS == 'android';\n}\n\nfunction isiOS() {\n  return Platform.OS == 'ios';\n}\n\nfunction startAndroid(withToken: string, debbugable: boolean) {\n  console.log('Group Link SDK (Android) - Start with token: ', withToken);\n  return RNGroupLinkSDK.startAndroid(withToken, debbugable);\n}\n\n// function getUserIDiOS(success: (userId: string) => void) {\n//   RNGroupLinkSDK.getUserID(success);\n// }\n\n// function success(userId: string): void {\n//   throw new Error('Function not implemented.');\n// }\n"],"mappings":";;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,aAAa,GAChB,wEAAuE,GACxEC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,6CAA6C;AAE/C,MAAMC,cAAc,GAAGC,0BAAa,CAACD,cAAc,GAC/CC,0BAAa,CAACD,cAAc,GAC5B,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEE,SAASU,qBAAqBA,CAACC,KAAa,EAAEC,UAAmB,EAAE;EACxE,IAAIC,SAAS,CAAC,CAAC,EAAE;IACfC,YAAY,CAACH,KAAK,EAAEC,UAAU,CAAC;EACjC;AACF;AAEO,eAAeG,SAASA,CAAA,EAA2B;EACxD,IAAIF,SAAS,CAAC,CAAC,EAAE;IACf,MAAMG,MAAc,GAAG,MAAMX,cAAc,CAACY,gBAAgB,CAAC,CAAC;IAC9D,IAAGD,MAAM,IAAI,0BAA0B,EAAE;MACvC,OAAOE,OAAO,CAACC,OAAO,CAACH,MAAM,CAAC;IAChC,CAAC,MAAM;MACL,OAAOE,OAAO,CAACE,MAAM,CAAC,2BAA2B,CAAC;IACpD;EACF;EACA,IAAIC,KAAK,CAAC,CAAC,EAAE;IACX,MAAML,MAAc,GAAG,MAAMX,cAAc,CAACiB,SAAS,CAAC,CAAC;IACvD,IAAGN,MAAM,IAAI,IAAI,EAAE;MACjB,OAAOE,OAAO,CAACC,OAAO,CAACH,MAAM,CAAC;IAChC,CAAC,MAAM;MACL,OAAOE,OAAO,CAACE,MAAM,CAAC,2BAA2B,CAAC;IACpD;EACF;EACA,OAAOF,OAAO,CAACE,MAAM,CAAC,gBAAgB,CAAC;AACzC;AAEO,SAASG,gBAAgBA,CAACZ,KAAa,EAAE;EAC9C,IAAIE,SAAS,CAAC,CAAC,EAAE;IACfW,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;IAC9CpB,cAAc,CAACkB,gBAAgB,CAACZ,KAAK,CAAC;EACxC;AACF;AAEO,SAASe,iBAAiBA,CAAA,EAAG;EAClC,IAAIL,KAAK,CAAC,CAAC,EAAE;IACXG,OAAO,CAACC,GAAG,CAAC,8CAA8C,CAAC;IAC3D,OAAOpB,cAAc,CAACqB,iBAAiB,CAAC,CAAC;EAC3C;EACA;AACF;AAEO,SAASC,qBAAqBA,CAAChB,KAAa,EAAE;EACnD,OAAON,cAAc,CAACuB,kBAAkB,CAACjB,KAAK,CAAC;AACjD;AAEO,SAASkB,gBAAgBA,CAAA,EAAG;EACjC,IAAIR,KAAK,CAAC,CAAC,EAAE;IACXG,OAAO,CAACC,GAAG,CAAC,6CAA6C,CAAC;IAC1D,OAAOpB,cAAc,CAACwB,gBAAgB,CAAC,CAAC;EAC1C;EACA;AACF;AAEA,SAAShB,SAASA,CAAA,EAAG;EACnB,OAAOZ,qBAAQ,CAAC6B,EAAE,IAAI,SAAS;AACjC;AAEA,SAAST,KAAKA,CAAA,EAAG;EACf,OAAOpB,qBAAQ,CAAC6B,EAAE,IAAI,KAAK;AAC7B;AAEA,SAAShB,YAAYA,CAACiB,SAAiB,EAAEnB,UAAmB,EAAE;EAC5DY,OAAO,CAACC,GAAG,CAAC,+CAA+C,EAAEM,SAAS,CAAC;EACvE,OAAO1B,cAAc,CAACS,YAAY,CAACiB,SAAS,EAAEnB,UAAU,CAAC;AAC3D;;AAEA;AACA;AACA;;AAEA;AACA;AACA"}

package/lib/module/index.js

@@ -13,14 +13,24 @@ export function startGrouplinkAndroid(token, debbugable) {
     startAndroid(token, debbugable);
   }
 }
-export function getUserId() {
+export async function getUserId() {
   if (isAndroid()) {
-    return RNGroupLinkSDK.getUserIdAndroid();
+    const userID = await RNGroupLinkSDK.getUserIdAndroid();
+    if (userID != "User not registered yet.") {
+      return Promise.resolve(userID);
+    } else {
+      return Promise.reject("UserID not registered yet");
+    }
   }
   if (isiOS()) {
-    return RNGroupLinkSDK.getUserID();
+    const userID = await RNGroupLinkSDK.getUserID();
+    if (userID != null) {
+      return Promise.resolve(userID);
+    } else {
+      return Promise.reject("UserID not registered yet");
+    }
   }
-  return Promise.resolve(null);
+  return Promise.reject("Internal Error");
 }
 export function setFirebaseToken(token) {
   if (isAndroid()) {
@@ -55,9 +65,6 @@ function startAndroid(withToken, debbugable) {
   console.log('Group Link SDK (Android) - Start with token: ', withToken);
   return RNGroupLinkSDK.startAndroid(withToken, debbugable);
 }
-// function getUserIdAndroid(success: (userId: string) => void) {
-//   RNGroupLinkSDK.getUserIdAndroid(success);
-// }
 
 // function getUserIDiOS(success: (userId: string) => void) {
 //   RNGroupLinkSDK.getUserID(success);

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","RNGroupLinkSDK","Proxy","get","Error","startGrouplinkAndroid","token","debbugable","isAndroid","startAndroid","getUserId","getUserIdAndroid","isiOS","getUserID","Promise","resolve","setFirebaseToken","console","log","startBluetoothIOS","setDevicePushTokenIOS","setDevicePushToken","startLocationIOS","OS","withToken"],"sources":["index.tsx"],"sourcesContent":["import { NativeModules, Platform } from 'react-native';\n\nconst LINKING_ERROR =\n  `The package 'grouplink-sdk' doesn't seem to be linked. Make sure: \\n\\n` +\n  Platform.select({ ios: \"- You have run 'pod install'\\n\", default: '' }) +\n  '- You rebuilt the app after installing the package\\n' +\n  '- You are not using Expo managed workflow\\n';\n\nconst RNGroupLinkSDK = NativeModules.RNGroupLinkSDK\n  ? NativeModules.RNGroupLinkSDK\n  : new Proxy(\n      {},\n      {\n        get() {\n          throw new Error(LINKING_ERROR);\n        },\n      }\n    );\n\nexport function startGrouplinkAndroid(token: string, debbugable: boolean) {\n  if (isAndroid()) {\n    startAndroid(token, debbugable);\n  }\n}\n\nexport function getUserId(): Promise<number | null> {\n  if (isAndroid()) {\n    return RNGroupLinkSDK.getUserIdAndroid();\n  }\n  if (isiOS()) {\n    return RNGroupLinkSDK.getUserID();\n  }\n  return Promise.resolve(null);\n}\n\nexport function setFirebaseToken(token: string) {\n  if (isAndroid()) {\n    console.log('Android: setting firebase token');\n    RNGroupLinkSDK.setFirebaseToken(token);\n  }\n}\n\nexport function startBluetoothIOS() {\n  if (isiOS()) {\n    console.log('Group Link SDK (iOS) - Start Bluetooth Stack');\n    return RNGroupLinkSDK.startBluetoothIOS();\n  }\n  return;\n}\n\nexport function setDevicePushTokenIOS(token: string) {\n  return RNGroupLinkSDK.setDevicePushToken(token);\n}\n\nexport function startLocationIOS() {\n  if (isiOS()) {\n    console.log('Group Link SDK (iOS) - Start Location Stack');\n    return RNGroupLinkSDK.startLocationIOS();\n  }\n  return;\n}\n\nfunction isAndroid() {\n  return Platform.OS == 'android';\n}\n\nfunction isiOS() {\n  return Platform.OS == 'ios';\n}\n\nfunction startAndroid(withToken: string, debbugable: boolean) {\n  console.log('Group Link SDK (Android) - Start with token: ', withToken);\n  return RNGroupLinkSDK.startAndroid(withToken, debbugable);\n}\n// function getUserIdAndroid(success: (userId: string) => void) {\n//   RNGroupLinkSDK.getUserIdAndroid(success);\n// }\n\n// function getUserIDiOS(success: (userId: string) => void) {\n//   RNGroupLinkSDK.getUserID(success);\n// }\n\n// function success(userId: string): void {\n//   throw new Error('Function not implemented.');\n// }\n"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAEtD,MAAMC,aAAa,GAChB,wEAAuE,GACxED,QAAQ,CAACE,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,6CAA6C;AAE/C,MAAMC,cAAc,GAAGN,aAAa,CAACM,cAAc,GAC/CN,aAAa,CAACM,cAAc,GAC5B,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACP,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEL,OAAO,SAASQ,qBAAqBA,CAACC,KAAa,EAAEC,UAAmB,EAAE;EACxE,IAAIC,SAAS,CAAC,CAAC,EAAE;IACfC,YAAY,CAACH,KAAK,EAAEC,UAAU,CAAC;EACjC;AACF;AAEA,OAAO,SAASG,SAASA,CAAA,EAA2B;EAClD,IAAIF,SAAS,CAAC,CAAC,EAAE;IACf,OAAOP,cAAc,CAACU,gBAAgB,CAAC,CAAC;EAC1C;EACA,IAAIC,KAAK,CAAC,CAAC,EAAE;IACX,OAAOX,cAAc,CAACY,SAAS,CAAC,CAAC;EACnC;EACA,OAAOC,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;AAC9B;AAEA,OAAO,SAASC,gBAAgBA,CAACV,KAAa,EAAE;EAC9C,IAAIE,SAAS,CAAC,CAAC,EAAE;IACfS,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;IAC9CjB,cAAc,CAACe,gBAAgB,CAACV,KAAK,CAAC;EACxC;AACF;AAEA,OAAO,SAASa,iBAAiBA,CAAA,EAAG;EAClC,IAAIP,KAAK,CAAC,CAAC,EAAE;IACXK,OAAO,CAACC,GAAG,CAAC,8CAA8C,CAAC;IAC3D,OAAOjB,cAAc,CAACkB,iBAAiB,CAAC,CAAC;EAC3C;EACA;AACF;AAEA,OAAO,SAASC,qBAAqBA,CAACd,KAAa,EAAE;EACnD,OAAOL,cAAc,CAACoB,kBAAkB,CAACf,KAAK,CAAC;AACjD;AAEA,OAAO,SAASgB,gBAAgBA,CAAA,EAAG;EACjC,IAAIV,KAAK,CAAC,CAAC,EAAE;IACXK,OAAO,CAACC,GAAG,CAAC,6CAA6C,CAAC;IAC1D,OAAOjB,cAAc,CAACqB,gBAAgB,CAAC,CAAC;EAC1C;EACA;AACF;AAEA,SAASd,SAASA,CAAA,EAAG;EACnB,OAAOZ,QAAQ,CAAC2B,EAAE,IAAI,SAAS;AACjC;AAEA,SAASX,KAAKA,CAAA,EAAG;EACf,OAAOhB,QAAQ,CAAC2B,EAAE,IAAI,KAAK;AAC7B;AAEA,SAASd,YAAYA,CAACe,SAAiB,EAAEjB,UAAmB,EAAE;EAC5DU,OAAO,CAACC,GAAG,CAAC,+CAA+C,EAAEM,SAAS,CAAC;EACvE,OAAOvB,cAAc,CAACQ,YAAY,CAACe,SAAS,EAAEjB,UAAU,CAAC;AAC3D;AACA;AACA;AACA;;AAEA;AACA;AACA;;AAEA;AACA;AACA"}
+{"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","RNGroupLinkSDK","Proxy","get","Error","startGrouplinkAndroid","token","debbugable","isAndroid","startAndroid","getUserId","userID","getUserIdAndroid","Promise","resolve","reject","isiOS","getUserID","setFirebaseToken","console","log","startBluetoothIOS","setDevicePushTokenIOS","setDevicePushToken","startLocationIOS","OS","withToken"],"sources":["index.tsx"],"sourcesContent":["import { NativeModules, Platform } from 'react-native';\n\nconst LINKING_ERROR =\n  `The package 'grouplink-sdk' doesn't seem to be linked. Make sure: \\n\\n` +\n  Platform.select({ ios: \"- You have run 'pod install'\\n\", default: '' }) +\n  '- You rebuilt the app after installing the package\\n' +\n  '- You are not using Expo managed workflow\\n';\n\nconst RNGroupLinkSDK = NativeModules.RNGroupLinkSDK\n  ? NativeModules.RNGroupLinkSDK\n  : new Proxy(\n      {},\n      {\n        get() {\n          throw new Error(LINKING_ERROR);\n        },\n      }\n    );\n\nexport function startGrouplinkAndroid(token: string, debbugable: boolean) {\n  if (isAndroid()) {\n    startAndroid(token, debbugable);\n  }\n}\n\nexport async function getUserId(): Promise<string | null> {\n  if (isAndroid()) {\n    const userID: string = await RNGroupLinkSDK.getUserIdAndroid();\n    if(userID != \"User not registered yet.\") {\n      return Promise.resolve(userID);  \n    } else {\n      return Promise.reject(\"UserID not registered yet\")\n    }\n  }\n  if (isiOS()) {\n    const userID: string = await RNGroupLinkSDK.getUserID();\n    if(userID != null) {\n      return Promise.resolve(userID);  \n    } else {\n      return Promise.reject(\"UserID not registered yet\")\n    }\n  }\n  return Promise.reject(\"Internal Error\");\n}\n\nexport function setFirebaseToken(token: string) {\n  if (isAndroid()) {\n    console.log('Android: setting firebase token');\n    RNGroupLinkSDK.setFirebaseToken(token);\n  }\n}\n\nexport function startBluetoothIOS() {\n  if (isiOS()) {\n    console.log('Group Link SDK (iOS) - Start Bluetooth Stack');\n    return RNGroupLinkSDK.startBluetoothIOS();\n  }\n  return;\n}\n\nexport function setDevicePushTokenIOS(token: string) {\n  return RNGroupLinkSDK.setDevicePushToken(token);\n}\n\nexport function startLocationIOS() {\n  if (isiOS()) {\n    console.log('Group Link SDK (iOS) - Start Location Stack');\n    return RNGroupLinkSDK.startLocationIOS();\n  }\n  return;\n}\n\nfunction isAndroid() {\n  return Platform.OS == 'android';\n}\n\nfunction isiOS() {\n  return Platform.OS == 'ios';\n}\n\nfunction startAndroid(withToken: string, debbugable: boolean) {\n  console.log('Group Link SDK (Android) - Start with token: ', withToken);\n  return RNGroupLinkSDK.startAndroid(withToken, debbugable);\n}\n\n// function getUserIDiOS(success: (userId: string) => void) {\n//   RNGroupLinkSDK.getUserID(success);\n// }\n\n// function success(userId: string): void {\n//   throw new Error('Function not implemented.');\n// }\n"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAEtD,MAAMC,aAAa,GAChB,wEAAuE,GACxED,QAAQ,CAACE,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,6CAA6C;AAE/C,MAAMC,cAAc,GAAGN,aAAa,CAACM,cAAc,GAC/CN,aAAa,CAACM,cAAc,GAC5B,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACP,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEL,OAAO,SAASQ,qBAAqBA,CAACC,KAAa,EAAEC,UAAmB,EAAE;EACxE,IAAIC,SAAS,CAAC,CAAC,EAAE;IACfC,YAAY,CAACH,KAAK,EAAEC,UAAU,CAAC;EACjC;AACF;AAEA,OAAO,eAAeG,SAASA,CAAA,EAA2B;EACxD,IAAIF,SAAS,CAAC,CAAC,EAAE;IACf,MAAMG,MAAc,GAAG,MAAMV,cAAc,CAACW,gBAAgB,CAAC,CAAC;IAC9D,IAAGD,MAAM,IAAI,0BAA0B,EAAE;MACvC,OAAOE,OAAO,CAACC,OAAO,CAACH,MAAM,CAAC;IAChC,CAAC,MAAM;MACL,OAAOE,OAAO,CAACE,MAAM,CAAC,2BAA2B,CAAC;IACpD;EACF;EACA,IAAIC,KAAK,CAAC,CAAC,EAAE;IACX,MAAML,MAAc,GAAG,MAAMV,cAAc,CAACgB,SAAS,CAAC,CAAC;IACvD,IAAGN,MAAM,IAAI,IAAI,EAAE;MACjB,OAAOE,OAAO,CAACC,OAAO,CAACH,MAAM,CAAC;IAChC,CAAC,MAAM;MACL,OAAOE,OAAO,CAACE,MAAM,CAAC,2BAA2B,CAAC;IACpD;EACF;EACA,OAAOF,OAAO,CAACE,MAAM,CAAC,gBAAgB,CAAC;AACzC;AAEA,OAAO,SAASG,gBAAgBA,CAACZ,KAAa,EAAE;EAC9C,IAAIE,SAAS,CAAC,CAAC,EAAE;IACfW,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;IAC9CnB,cAAc,CAACiB,gBAAgB,CAACZ,KAAK,CAAC;EACxC;AACF;AAEA,OAAO,SAASe,iBAAiBA,CAAA,EAAG;EAClC,IAAIL,KAAK,CAAC,CAAC,EAAE;IACXG,OAAO,CAACC,GAAG,CAAC,8CAA8C,CAAC;IAC3D,OAAOnB,cAAc,CAACoB,iBAAiB,CAAC,CAAC;EAC3C;EACA;AACF;AAEA,OAAO,SAASC,qBAAqBA,CAAChB,KAAa,EAAE;EACnD,OAAOL,cAAc,CAACsB,kBAAkB,CAACjB,KAAK,CAAC;AACjD;AAEA,OAAO,SAASkB,gBAAgBA,CAAA,EAAG;EACjC,IAAIR,KAAK,CAAC,CAAC,EAAE;IACXG,OAAO,CAACC,GAAG,CAAC,6CAA6C,CAAC;IAC1D,OAAOnB,cAAc,CAACuB,gBAAgB,CAAC,CAAC;EAC1C;EACA;AACF;AAEA,SAAShB,SAASA,CAAA,EAAG;EACnB,OAAOZ,QAAQ,CAAC6B,EAAE,IAAI,SAAS;AACjC;AAEA,SAAST,KAAKA,CAAA,EAAG;EACf,OAAOpB,QAAQ,CAAC6B,EAAE,IAAI,KAAK;AAC7B;AAEA,SAAShB,YAAYA,CAACiB,SAAiB,EAAEnB,UAAmB,EAAE;EAC5DY,OAAO,CAACC,GAAG,CAAC,+CAA+C,EAAEM,SAAS,CAAC;EACvE,OAAOzB,cAAc,CAACQ,YAAY,CAACiB,SAAS,EAAEnB,UAAU,CAAC;AAC3D;;AAEA;AACA;AACA;;AAEA;AACA;AACA"}

package/lib/typescript/index.d.ts

@@ -1,5 +1,5 @@
 export declare function startGrouplinkAndroid(token: string, debbugable: boolean): void;
-export declare function getUserId(): Promise<number | null>;
+export declare function getUserId(): Promise<string | null>;
 export declare function setFirebaseToken(token: string): void;
 export declare function startBluetoothIOS(): any;
 export declare function setDevicePushTokenIOS(token: string): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grouplinknetwork/rn-grouplink-sdk",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/index.tsx

@@ -23,14 +23,24 @@ export function startGrouplinkAndroid(token: string, debbugable: boolean) {
   }
 }
 
-export function getUserId(): Promise<number | null> {
+export async function getUserId(): Promise<string | null> {
   if (isAndroid()) {
-    return RNGroupLinkSDK.getUserIdAndroid();
+    const userID: string = await RNGroupLinkSDK.getUserIdAndroid();
+    if(userID != "User not registered yet.") {
+      return Promise.resolve(userID);  
+    } else {
+      return Promise.reject("UserID not registered yet")
+    }
   }
   if (isiOS()) {
-    return RNGroupLinkSDK.getUserID();
+    const userID: string = await RNGroupLinkSDK.getUserID();
+    if(userID != null) {
+      return Promise.resolve(userID);  
+    } else {
+      return Promise.reject("UserID not registered yet")
+    }
   }
-  return Promise.resolve(null);
+  return Promise.reject("Internal Error");
 }
 
 export function setFirebaseToken(token: string) {
@@ -72,9 +82,6 @@ function startAndroid(withToken: string, debbugable: boolean) {
   console.log('Group Link SDK (Android) - Start with token: ', withToken);
   return RNGroupLinkSDK.startAndroid(withToken, debbugable);
 }
-// function getUserIdAndroid(success: (userId: string) => void) {
-//   RNGroupLinkSDK.getUserIdAndroid(success);
-// }
 
 // function getUserIDiOS(success: (userId: string) => void) {
 //   RNGroupLinkSDK.getUserID(success);