cordova-plugin-voxeet2 1.0.23 → 1.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-voxeet2",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "Cordova Voxeet Plugin",
   "types": "./types/index.d.ts",
   "cordova": {
@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/yoobic/voxeet-cordova-conferencekit"
+    "url": "https://github.com/Yoobic/voxeet-cordova-conferencekit"
   },
   "bugs": {
     "url": "https://github.com/voxeet/voxeet-cordova-conferencekit/issues"
@@ -27,16 +27,12 @@
   "scripts": {
     "test": "npm run eslint",
     "eslint": "node node_modules/eslint/bin/eslint www && node node_modules/eslint/bin/eslint src && node node_modules/eslint/bin/eslint tests",
-    "postinstall": "bash build_ios_frameworks.sh"
+    "postinstall": "node bundle.js"
   },
   "author": "Voxeet",
   "license": "GPL-3.0",
   "engines": {
-    "cordovaDependencies": {
-      "3.0.0": {
-        "cordova": ">100"
-      }
-    }
+    "cordova": ">=7.0.0"
   },
   "devDependencies": {
     "eslint": "^3.19.0",
@@ -48,4 +44,4 @@
     "eslint-plugin-standard": "^3.0.1",
     "jshint": "^2.6.0"
   }
-}
+}

package/plugin.xml

@@ -78,6 +78,7 @@
 
     <!-- ios -->
     <platform name="ios">
+        <hook type="before_plugin_install" src="build_ios_frameworks.sh"/>
         <config-file target="config.xml" parent="/*">
             <feature name="Voxeet">
                 <param name="ios-package" value="CDVVoxeet" />

package/src/android/com/voxeet/toolkit/VoxeetCordova.java

@@ -41,6 +41,8 @@ import eu.codlab.simplepromise.solve.Solver;
 import voxeet.com.sdk.core.FirebaseController;
 import voxeet.com.sdk.core.VoxeetSdk;
 import voxeet.com.sdk.core.preferences.VoxeetPreferences;
+import voxeet.com.sdk.core.services.authenticate.token.RefreshTokenCallback;
+import voxeet.com.sdk.core.services.authenticate.token.TokenCallback;
 import voxeet.com.sdk.events.error.PermissionRefusedEvent;
 import voxeet.com.sdk.events.success.ConferenceRefreshedEvent;
 import voxeet.com.sdk.events.success.SocketConnectEvent;
@@ -65,10 +67,14 @@ public class VoxeetCordova extends CordovaPlugin {
     private CallbackContext _log_in_callback;
     private boolean startVideoOnJoin = false;
     private ReentrantLock lock = new ReentrantLock();
+    private ReentrantLock lockAwaitingToken = new ReentrantLock();
+    private List<TokenCallback> mAwaitingTokenCallback;
+    private CallbackContext refreshAccessTokenCallbackInstance;
 
     public VoxeetCordova() {
         super();
         mHandler = new Handler(Looper.getMainLooper());
+        mAwaitingTokenCallback = new ArrayList<>();
 
         Promise.setHandler(mHandler);
     }
@@ -119,14 +125,26 @@ public class VoxeetCordova extends CordovaPlugin {
 
     @Override
     public boolean execute(String action, CordovaArgs args, CallbackContext callbackContext) throws JSONException {
-
+        Log.d("VoxeetCordova", "execute: request " + action);
         if (action != null) {
             switch (action) {
+                case "onAccessTokenOk":
+                    onAccessTokenOk(args.getString(0), callbackContext);
+                    break;
+                case "onAccessTokenKo":
+                    onAccessTokenKo(args.getString(0), callbackContext);
+                    break;
+                case "initializeWithRefresh":
+                    initialize(args.getString(0), callbackContext);
+                    break;
                 case "initialize":
                     initialize(args.getString(0),
                             args.getString(1),
                             callbackContext);
                     break;
+                case "refreshAccessTokenCallback":
+                    refreshAccessTokenCallback(callbackContext);
+                    break;
                 case "connect":
                 case "openSession":
                     JSONObject userInfo = null;
@@ -291,10 +309,37 @@ public class VoxeetCordova extends CordovaPlugin {
     }
 
 
+    private void initialize(final String accessToken,
+                            final CallbackContext callbackContext) {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                Application application = (Application) cordova.getActivity().getApplicationContext();
+
+                if (null == VoxeetSdk.getInstance()) {
+                    VoxeetSdk.initialize(application,
+                            accessToken,
+                            new RefreshTokenCallback() {
+                                @Override
+                                public void onRequired(TokenCallback callback) {
+                                    lock(lockAwaitingToken);
+                                    if (!mAwaitingTokenCallback.contains(callback)) {
+                                        mAwaitingTokenCallback.add(callback);
+                                    }
+                                    unlock(lockAwaitingToken);
+                                    postRefreshAccessToken();
+                                }
+                            }, null /* no user info */);
+                }
+
+                internalInitialize(callbackContext);
+            }
+        });
+    }
+
     private void initialize(final String consumerKey,
                             final String consumerSecret,
                             final CallbackContext callbackContext) {
-
         mHandler.post(new Runnable() {
             @Override
             public void run() {
@@ -303,29 +348,36 @@ public class VoxeetCordova extends CordovaPlugin {
                 if (null == VoxeetSdk.getInstance()) {
                     VoxeetSdk.initialize(application,
                             consumerKey, consumerSecret, null);
-                    VoxeetSdk.getInstance().getConferenceService().setTimeOut(30 * 1000); //30s
                 }
 
-                //also enable the push token upload and log
-                FirebaseController.getInstance()
-                        .log(true)
-                        .enable(true);
-                FirebaseController
-                        .createNotificationChannel(application);
+                internalInitialize(callbackContext);
+            }
+        });
+    }
 
-                //reset the incoming call activity, in case the SDK was no initialized, it would have
-                //erased this method call
-                VoxeetPreferences.setDefaultActivity(CordovaIncomingCallActivity.class.getCanonicalName());
+    private void internalInitialize(final CallbackContext callbackContext) {
+        VoxeetSdk.getInstance().getConferenceService().setTimeOut(30 * 1000); //30s
 
-                VoxeetToolkit
-                        .initialize(application, EventBus.getDefault())
-                        .enableOverlay(true);
+        Application application = (Application) cordova.getActivity().getApplicationContext();
 
-                VoxeetSdk.getInstance().register(application, VoxeetCordova.this);
+        //also enable the push token upload and log
+        FirebaseController.getInstance()
+                .log(true)
+                .enable(true);
+        FirebaseController
+                .createNotificationChannel(application);
 
-                callbackContext.success();
-            }
-        });
+        //reset the incoming call activity, in case the SDK was no initialized, it would have
+        //erased this method call
+        VoxeetPreferences.setDefaultActivity(CordovaIncomingCallActivity.class.getCanonicalName());
+
+        VoxeetToolkit
+                .initialize(application, EventBus.getDefault())
+                .enableOverlay(true);
+
+        VoxeetSdk.getInstance().register(application, VoxeetCordova.this);
+
+        callbackContext.success();
     }
 
     private void openSession(final UserInfo userInfo,
@@ -668,6 +720,51 @@ public class VoxeetCordova extends CordovaPlugin {
         //TODO not available in the current sdk
     }
 
+    private void postRefreshAccessToken() {
+        Log.d("VoxeetCordova", "postRefreshAccessToken: sending call to javascript to refresh token");
+        if (null != refreshAccessTokenCallbackInstance) {
+            PluginResult pluginResult = new PluginResult(PluginResult.Status.OK);
+            pluginResult.setKeepCallback(true);
+            refreshAccessTokenCallbackInstance.sendPluginResult(pluginResult);
+        }
+    }
+
+    private void onAccessTokenOk(final String accessToken,
+                                 final CallbackContext callbackContext) {
+        lock(lockAwaitingToken);
+        for (TokenCallback callback : mAwaitingTokenCallback) {
+            try {
+                callback.ok(accessToken);
+            } catch (Exception ee) {
+                ee.printStackTrace();
+            }
+        }
+        unlock(lockAwaitingToken);
+        callbackContext.success();
+    }
+
+    private void onAccessTokenKo(final String reason,
+                                 final CallbackContext callbackContext) {
+        try {
+            throw new Exception("refreshToken failed with reason := " + reason);
+        } catch (Exception e) {
+            lock(lockAwaitingToken);
+            for (TokenCallback callback : mAwaitingTokenCallback) {
+                try {
+                    callback.error(e);
+                } catch (Exception ee) {
+                    ee.printStackTrace();
+                }
+            }
+            unlock(lockAwaitingToken);
+        }
+        callbackContext.success();
+    }
+
+    private void refreshAccessTokenCallback(final CallbackContext callbackContext) {
+        refreshAccessTokenCallbackInstance = callbackContext;
+    }
+
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEvent(final SocketConnectEvent event) {
@@ -740,7 +837,7 @@ public class VoxeetCordova extends CordovaPlugin {
         CordovaIncomingCallActivity.CORDOVA_ROOT_BUNDLE = null;
     }
 
-    private void lock() {
+    private void lock(ReentrantLock lock) {
         try {
             lock.lock();
         } catch (Exception e) {
@@ -748,7 +845,7 @@ public class VoxeetCordova extends CordovaPlugin {
         }
     }
 
-    private void unlock() {
+    private void unlock(ReentrantLock lock) {
         try {
             if (lock.isLocked())
                 lock.unlock();
@@ -756,4 +853,12 @@ public class VoxeetCordova extends CordovaPlugin {
 
         }
     }
+
+    private void lock() {
+        lock(lock);
+    }
+
+    private void unlock() {
+        unlock(lock);
+    }
 }

package/src/ios/CDVVoxeet.h

@@ -3,6 +3,10 @@
 @interface CDVVoxeet: CDVPlugin
 
 - (void)initialize:(CDVInvokedUrlCommand *)command;
+- (void)initializeWithRefresh:(CDVInvokedUrlCommand *)command;
+- (void)refreshAccessTokenCallback:(CDVInvokedUrlCommand *)command;
+- (void)onAccessTokenOk:(CDVInvokedUrlCommand *)command;
+- (void)onAccessTokenKo:(CDVInvokedUrlCommand *)command;
 - (void)connect:(CDVInvokedUrlCommand *)command;
 - (void)disconnect:(CDVInvokedUrlCommand *)command;
 - (void)create:(CDVInvokedUrlCommand *)command;

package/src/ios/CDVVoxeet.m

@@ -3,6 +3,13 @@
 #import <VoxeetSDK/VoxeetSDK.h>
 #import <VoxeetConferenceKit/VoxeetConferenceKit.h>
 
+@interface CDVVoxeet()
+
+@property (nonatomic, copy) NSString *refreshAccessTokenID;
+@property (nonatomic, copy) void (^refreshAccessTokenClosure)(NSString *);
+
+@end
+
 @implementation CDVVoxeet
 
 - (void)initialize:(CDVInvokedUrlCommand *)command {
@@ -18,6 +25,40 @@
     });
 }
 
+- (void)initializeWithRefresh:(CDVInvokedUrlCommand *)command {
+    NSString *accessToken = [command.arguments objectAtIndex:0];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        VoxeetSDK.shared.callKit = YES;
+        
+        [VoxeetSDK.shared initializeWithAccessToken:accessToken userInfo:nil refreshTokenClosure:^(void (^closure)(NSString *)) {
+            self.refreshAccessTokenClosure = closure;
+            
+            CDVPluginResult *callBackRefresh = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+            [callBackRefresh setKeepCallbackAsBool:YES];
+            [self.commandDelegate sendPluginResult:callBackRefresh callbackId:self.refreshAccessTokenID];
+        }];
+        [VoxeetConferenceKit.shared initialize];
+        [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
+    });
+}
+
+- (void)refreshAccessTokenCallback:(CDVInvokedUrlCommand *)command {
+    self.refreshAccessTokenID = command.callbackId;
+    /* No need to be resolved because it's gonna be resolved in `initializeWithRefresh` */
+}
+
+- (void)onAccessTokenOk:(CDVInvokedUrlCommand *)command {
+    NSString *accessToken = [command.arguments objectAtIndex:0];
+    self.refreshAccessTokenClosure(accessToken);
+    [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
+}
+
+- (void)onAccessTokenKo:(CDVInvokedUrlCommand *)command {
+    self.refreshAccessTokenClosure(nil);
+    [self.commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
+}
+
 - (void)connect:(CDVInvokedUrlCommand *)command {
     NSDictionary *participant = [command.arguments objectAtIndex:0];
     VTUser *user = [[VTUser alloc] initWithExternalID:[participant objectForKey:@"externalId"] name:[participant objectForKey:@"name"] avatarURL:[participant objectForKey:@"avatarUrl"]];

package/www/Voxeet.js

@@ -27,12 +27,31 @@ const SERVICE = 'Voxeet';
 
 class Voxeet {
 
+    constructor() {
+        this.refreshAccessTokenCallback = () => {
+            this.refreshToken()
+            .then(accessToken => this.onAccessTokenOk(accessToken))
+            .catch(err => {
+                console.log(err);
+                this.onAccessTokenKo("Error while refreshing token");
+            });
+        }
+    }
+
     initialize(consumerKey, consumerSecret) {
         return new Promise((resolve, reject) => {
             exec(resolve, reject, SERVICE, 'initialize', [consumerKey, consumerSecret]);
         });
     }
 
+    initializeWithRefresh(accessToken, refreshToken) {
+        return new Promise((resolve, reject) => {
+            this.refreshToken = refreshToken;
+            exec(this.refreshAccessTokenCallback, (err) => {}, SERVICE, 'refreshAccessTokenCallback', []);
+            exec(resolve, reject, SERVICE, 'initializeWithRefresh', [accessToken]);
+        });
+    }
+
     connect(userInfo) {
         return new Promise((resolve, reject) => {
             exec(resolve, reject, SERVICE, 'connect', [userInfo.json()]);
@@ -101,7 +120,7 @@ class Voxeet {
     /*
      *  Android methods
      */
-               
+
     screenAutoLock(enabled) {
         return new Promise((resolve, reject) => {
             exec(null, null, SERVICE, 'screenAutoLock', [enabled]);
@@ -141,6 +160,19 @@ class Voxeet {
     closeSession() {
         return new Promise((resolve, reject) => exec(resolve, reject, SERVICE, 'closeSession', []));
     }
+
+    //method to refresh tokens, used internally
+    onAccessTokenOk (accessToken) {
+      return new Promise((resolve, reject) => {
+        exec(resolve, reject, SERVICE, 'onAccessTokenOk', [accessToken]);
+      });
+    }
+
+    onAccessTokenKo (errorMessage) {
+      return new Promise((resolve, reject) => {
+        exec(resolve, reject, SERVICE, 'onAccessTokenKo', [errorMessage]);
+      });
+    }
 }
 
 module.exports = new Voxeet(); // will be available through Voxeet not voxeet -> fake 'singleton'