react-native-mosquito-transport 0.0.44 → 0.0.46

package/android/src/main/java/com/mosquitodb/utils/FileUploader.java

@@ -43,7 +43,7 @@ public class FileUploader {
                 connection.setRequestProperty("hash-upload", config.getString("createHash"));
                 connection.setRequestProperty("Mosquito-Destination", config.getString("destination"));
                 if (config.hasKey("authToken")) {
-                    connection.setRequestProperty("Mosquito-Token", config.getString("authToken"));
+                    connection.setRequestProperty("mtoken", config.getString("authToken"));
                 }
                 connection.setFixedLengthStreamingMode((int) totalBytes);
 

package/ios/Mosquitodb.swift

@@ -101,7 +101,7 @@ class MosquitodbUploadTask: NSObject, URLSessionDataDelegate {
                 }
             }
             if options["authToken"] != nil {
-                request.setValue(options["authToken"] as? String, forHTTPHeaderField: "Mosquito-Token")
+                request.setValue(options["authToken"] as? String, forHTTPHeaderField: "mtoken")
             }
             request.setValue(options["createHash"] as? String, forHTTPHeaderField: "hash-upload");
             request.setValue("buffer/upload", forHTTPHeaderField: "Content-Type")
@@ -197,7 +197,7 @@ class MosquitodbDownloadTask: NSObject, URLSessionDownloadDelegate {
             }
         }
         if options["authToken"] != nil {
-            request.setValue(options["authToken"] as? String, forHTTPHeaderField: "Mosquito-Token")
+            request.setValue(options["authToken"] as? String, forHTTPHeaderField: "mtoken")
         }
         
         let session = URLSession(configuration: URLSessionConfiguration.default, delegate: self, delegateQueue: nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mosquito-transport",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "description": "React native javascript sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",

package/src/helpers/utils.js

@@ -190,7 +190,7 @@ export const buildFetchInterface = async ({ body, authToken, method, uglify, ser
         headers: {
             ...extraHeaders,
             'Content-type': uglify ? 'request/buffer' : 'application/json',
-            ...(authToken && !uglify) ? { 'Mosquito-Token': authToken } : {}
+            ...(authToken && !uglify) ? { 'mtoken': authToken } : {}
         },
         method: method || 'POST',
         credentials: 'omit'

package/src/index.js

@@ -63,9 +63,7 @@ class RNMT {
             triggerAuthToken(projectUrl);
             initTokenRefresher({ ...this.config }, true);
 
-            let isConnected,
-                lastSentToken,
-                queuedToken;
+            let isConnected, recentToken;
 
             const socket = io(`${this.config.wsPrefix}://${this.config.baseUrl}`, {
                 transports: ['websocket', 'polling', 'flashsocket'],
@@ -80,7 +78,7 @@ class RNMT {
                 ++connectionIte;
                 isConnected = true;
                 Scoped.IS_CONNECTED[projectUrl] = true;
-                if (queuedToken) updateMountedToken(queuedToken.token);
+                if (recentToken) updateMountedToken();
                 ServerReachableListener.dispatch(projectUrl, true);
                 awaitStore().then(() => {
                     if (isConnected) trySendPendingWrite(projectUrl);
@@ -114,18 +112,13 @@ class RNMT {
                 manualCheckConnection();
             });
 
-            const updateMountedToken = (token) => {
-                if ((lastSentToken || null) !== (token || null)) {
-                    socket.emit('_update_mounted_user', token || null);
-                    lastSentToken = token;
-                }
-                queuedToken = undefined;
+            const updateMountedToken = () => {
+                socket.emit('_update_mounted_user', recentToken || null);
             };
 
             listenToken(token => {
-                if (isConnected) {
-                    updateMountedToken(token);
-                } else queuedToken = { token };
+                recentToken = token;
+                if (isConnected) updateMountedToken();
             }, projectUrl);
 
             TokenRefreshListener.listenTo(projectUrl, v => {

package/src/products/auth/index.js

@@ -26,7 +26,7 @@ export default class MTAuth {
 
     customSignup = (email, password, name, metadata) => doCustomSignup(this.builder, email, password, name, metadata);
 
-    googleSignin = (token) => doGoogleSignin(this.builder, token);
+    googleSignin = (token, metadata) => doGoogleSignin(this.builder, token, metadata);
 
     appleSignin() {
         throw 'unsupported method call';
@@ -308,7 +308,7 @@ export const purgePendingToken = async (nodeId) => {
     }
 };
 
-const doGoogleSignin = (builder, token) => new Promise(async (resolve, reject) => {
+const doGoogleSignin = (builder, token, metadata) => new Promise(async (resolve, reject) => {
     const { projectUrl, serverE2E_PublicKey, uglify, extraHeaders } = builder;
 
     try {
@@ -316,7 +316,7 @@ const doGoogleSignin = (builder, token) => new Promise(async (resolve, reject) =
         const thisAuthStore = basicClone(CacheStore.AuthStore[projectUrl]);
 
         const [reqBuilder, [privateKey]] = await buildFetchInterface({
-            body: { token },
+            body: { token, metadata },
             uglify,
             serverE2E_PublicKey,
             extraHeaders