fix: getFileUrl to construct correct url when token is set

.pubnub.yml

@@ -1,5 +1,10 @@
 ---
 changelog:
+  - date: 2022-12-08
+    version: v7.2.2
+    changes:
+      - type: bug
+        text: "Fixes issue of getFileUrl not setting auth value as token string when token is set."
   - date: 2022-11-10
     version: v7.2.1
     changes:
@@ -879,7 +884,7 @@ sdks:
           - distribution-type: source
             distribution-repository: GitHub release
             package-name: pubnub.js
-            location: https://github.com/pubnub/javascript/archive/refs/tags/v7.2.1.zip
+            location: https://github.com/pubnub/javascript/archive/refs/tags/v7.2.2.zip
             requires:
               - name: 'agentkeepalive'
                 min-version: '3.5.2'
@@ -1550,7 +1555,7 @@ sdks:
           - distribution-type: library
             distribution-repository: GitHub release
             package-name: pubnub.js
-            location: https://github.com/pubnub/javascript/releases/download/v7.2.1/pubnub.7.2.1.js
+            location: https://github.com/pubnub/javascript/releases/download/v7.2.2/pubnub.7.2.2.js
             requires:
               - name: 'agentkeepalive'
                 min-version: '3.5.2'

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v7.2.2
+December 08 2022
+
+#### Fixed
+- Fixes issue of getFileUrl not setting auth value as token string when token is set. Fixed the following issues reported by [@abdalla-nayer](https://github.com/abdalla-nayer): [#302](https://github.com/pubnub/javascript/issues/302).
+
 ## v7.2.1
 November 10 2022
 

README.md

@@ -22,8 +22,8 @@ You will need the publish and subscribe keys to authenticate your app. Get your
      npm install pubnub
      ```
    * or download one of our builds from our CDN: 
-     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.2.1.js
-     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.2.1.min.js
+     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.2.2.js
+     * https://cdn.pubnub.com/sdk/javascript/pubnub.7.2.2.min.js
 
 2. Configure your keys:
 

dist/web/pubnub.js

@@ -768,7 +768,7 @@
             return this;
         };
         default_1.prototype.getVersion = function () {
-            return '7.2.1';
+            return '7.2.2';
         };
         default_1.prototype._addPnsdkSuffix = function (name, suffix) {
             this._PNSDKSuffix[name] = suffix;
@@ -4817,7 +4817,7 @@
     /**       */
     var getFileUrlFunction = (function (modules, _a) {
         var channel = _a.channel, id = _a.id, name = _a.name;
-        var config = modules.config, networking = modules.networking;
+        var config = modules.config, networking = modules.networking, tokenManager = modules.tokenManager;
         if (!channel) {
             throw new PubNubError('Validation failed, check status for details', createValidationError("channel can't be empty"));
         }
@@ -4831,8 +4831,9 @@
         var params = {};
         params.uuid = config.getUUID();
         params.pnsdk = generatePNSDK(config);
-        if (config.getAuthKey()) {
-            params.auth = config.getAuthKey();
+        var tokenOrKey = tokenManager.getToken() || config.getAuthKey();
+        if (tokenOrKey) {
+            params.auth = tokenOrKey;
         }
         if (config.secretKey) {
             signRequest(modules, url, params, {}, {

lib/core/components/config.js

@@ -169,7 +169,7 @@ var default_1 = /** @class */ (function () {
         return this;
     };
     default_1.prototype.getVersion = function () {
-        return '7.2.1';
+        return '7.2.2';
     };
     default_1.prototype._addPnsdkSuffix = function (name, suffix) {
         this._PNSDKSuffix[name] = suffix;

lib/core/endpoints/file_upload/get_file_url.js

@@ -8,7 +8,7 @@ var endpoint_1 = require("../../components/endpoint");
 var utils_1 = __importDefault(require("../../utils"));
 exports.default = (function (modules, _a) {
     var channel = _a.channel, id = _a.id, name = _a.name;
-    var config = modules.config, networking = modules.networking;
+    var config = modules.config, networking = modules.networking, tokenManager = modules.tokenManager;
     if (!channel) {
         throw new endpoint_1.PubNubError('Validation failed, check status for details', (0, endpoint_1.createValidationError)("channel can't be empty"));
     }
@@ -22,8 +22,9 @@ exports.default = (function (modules, _a) {
     var params = {};
     params.uuid = config.getUUID();
     params.pnsdk = (0, endpoint_1.generatePNSDK)(config);
-    if (config.getAuthKey()) {
-        params.auth = config.getAuthKey();
+    var tokenOrKey = tokenManager.getToken() || config.getAuthKey();
+    if (tokenOrKey) {
+        params.auth = tokenOrKey;
     }
     if (config.secretKey) {
         (0, endpoint_1.signRequest)(modules, url, params, {}, {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubnub",
-  "version": "7.2.1",
+  "version": "7.2.2",
   "author": "PubNub <support@pubnub.com>",
   "description": "Publish & Subscribe Real-time Messaging with PubNub",
   "scripts": {

src/core/components/config.js

@@ -339,7 +339,7 @@ export default class {
   }
 
   getVersion() {
-    return '7.2.1';
+    return '7.2.2';
   }
 
   _addPnsdkSuffix(name, suffix) {

src/core/endpoints/file_upload/get_file_url.js

@@ -5,7 +5,7 @@ import { PubNubError, createValidationError, signRequest, generatePNSDK } from '
 import utils from '../../utils';
 
 export default (modules, { channel, id, name }) => {
-  const { config, networking } = modules;
+  const { config, networking, tokenManager } = modules;
 
   if (!channel) {
     throw new PubNubError(
@@ -34,8 +34,9 @@ export default (modules, { channel, id, name }) => {
   params.uuid = config.getUUID();
   params.pnsdk = generatePNSDK(config);
 
-  if (config.getAuthKey()) {
-    params.auth = config.getAuthKey();
+  const tokenOrKey = tokenManager.getToken() || config.getAuthKey();
+  if (tokenOrKey) {
+    params.auth = tokenOrKey;
   }
 
   if (config.secretKey) {

test/integration/endpoints/get_file_url.test.js

@@ -2,8 +2,6 @@
 /* eslint no-console: 0 */
 
 import assert from 'assert';
-import nock from 'nock';
-import utils from '../../utils';
 import PubNub from '../../../src/node/index';
 
 describe('getFileUrl', () => {
@@ -35,4 +33,23 @@ describe('getFileUrl', () => {
     assert(url === `https://test1.example.com/v1/files/demo/channels/channel/files/id/name?uuid=myUUID&pnsdk=${pnsdk}`
         || url === `https://test2.example.com/v1/files/demo/channels/channel/files/id/name?uuid=myUUID&pnsdk=${pnsdk}`);
   });
+
+  it('constructs proper url when token is set', () => {
+    const pubnub = new PubNub({
+      subscribeKey: 'demo',
+      publishKey: 'demo',
+      uuid: 'myUUID',
+      origin: 'example.com',
+    });
+
+    pubnub.setToken('tokenString');
+
+    const url = pubnub.getFileUrl({ channel: 'channel', id: 'id', name: 'name' });
+    const pnsdk = `PubNub-JS-${pubnub._config.sdkFamily}%2F${pubnub._config.getVersion()}`;
+
+    assert.equal(
+      url,
+      `https://example.com/v1/files/demo/channels/channel/files/id/name?uuid=myUUID&pnsdk=${pnsdk}&auth=tokenString`,
+    );
+  });
 });