Check out headers for API requests / QBWEBSDK-621

Author: dimaspirit

quickblox.min.js

@@ -1858,7 +1858,6 @@ function createNormalMessageViaRESTAndReceiveItTest(params, msgExtension, dialog
     });
 
     QB_RECEIVER.chat.onMessageListener = function(userId, receivedMessage) {
-        console.info('TESTTS2');
         expect(userId).toEqual(QBUser1.id);
         expect(receivedMessage).toBeDefined();
         expect(receivedMessage.id).not.toBeNull();

spec/QB-ChatSpec.js

@@ -17,6 +17,12 @@ describe('Helpers', function() {
     QB.init(CREDENTIALS.appId, CREDENTIALS.authKey, CREDENTIALS.authSecret, CONFIG);
   });
 
+  it('can get OS information', function(){
+    const env = QB._getOS();
+
+    expect(env).toEqual(jasmine.any(String));
+  });
+
   it('can generate user\'s jid', function() {
     var userJid = QB.chat.helpers.getUserJid(5, appId);
 

spec/QB-HelpersSpec.js

@@ -25,6 +25,8 @@ QuickBlox.prototype = {
      * */
     buildNumber: config.buildNumber,
 
+    _getOS: Utils.getOS.bind(Utils),
+
     /**
      * @memberof QB
      * @param {Number | String} appIdOrToken - Application ID (from your admin panel) or Session Token.

src/qbMain.js

@@ -104,13 +104,20 @@ ServiceProxy.prototype = {
             };
         }
 
-        if (isQBRequest && qbSessionToken) {
+        if (isQBRequest) {
             if (!qbRequest.headers) {
                 qbRequest.headers = {};
             }
 
-            qbRequest.headers['QB-Token'] = qbSessionToken;
-            qbRequest.headers['QB-SDK'] = 'JS ' + config.version + ' - Server';
+            // TODO: include QB-OS header in Access-Control-Allow-Headers;
+            // Now gets error 'Request header field QB-OS is not allowed by Access-Control-Allow-Headers in preflight response'
+            // qbRequest.headers['QB-OS'] = Utils.getOS();
+
+            qbRequest.headers['QB-SDK'] = 'JS ' + config.version + ' - Client';
+
+            if(qbSessionToken) {
+                qbRequest.headers['QB-Token'] = qbSessionToken;
+            }
         }
 
         if (config.timeout) {

src/qbProxy.js

@@ -11,6 +11,7 @@ var isBrowser = typeof window !== "undefined",
 
 if (!isBrowser && !isNativeScript) {
     var fs = require('fs');
+    var os = require('os');
 }
 
 // The object for type MongoDB.Bson.ObjectId
@@ -37,6 +38,55 @@ var Utils = {
             'node': isNode
         };
     },
+
+    _getOSInfoFromNodeJS: function() {
+        return os.platform();
+    },
+
+    _getOSInfoFromBrowser: function() {
+        return window.navigator.userAgent;
+    },
+
+    getOS: function() {
+        var self = this;
+        var osName = 'An unknown OS';
+
+        var OS_LIST = [
+            {
+                osName:'Windows',
+                codeNames:['Windows', 'win32']
+            },
+            {
+                osName:'Linux',
+                codeNames:['Linux', 'linux']
+            },
+            {
+                osName:'macOS',
+                codeNames:['Mac OS', 'darwin']
+            }
+        ];
+
+        var platformInfo;
+
+        if(self.getEnv().browser) {
+            platformInfo = self._getOSInfoFromBrowser();
+        } else if(self.getEnv().node) {
+            platformInfo = self._getOSInfoFromNodeJS();
+        }
+
+        OS_LIST.forEach( function(osInfo) {
+            osInfo.codeNames.forEach( function(codeName) {
+                var index = platformInfo.indexOf(codeName);
+
+                if(index !== -1) {
+                    osName = osInfo.osName;
+                }
+            });
+        });
+
+        return osName;
+    },
+
     safeCallbackCall: function() {
         var listenerString = arguments[0].toString(),
             listenerName = listenerString.split('(')[0].split(' ')[1],