fix: remove package.json dependency from builderUtil

okta · Apr 17, 2020 · 7c7a179 · 7c7a179
1 parent 654f9e1
commit 7c7a179
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/packages/okta-auth-js/lib/browser/browser.js b/packages/okta-auth-js/lib/browser/browser.js
@@ -82,7 +82,7 @@ function OktaAuthBuilder(args) {
     throw new AuthSdkError(errorMessage);
   }
 
-  this.userAgent = builderUtil.getUserAgent(args) || 'okta-auth-js-' + SDK_VERSION;
+  this.userAgent = builderUtil.getUserAgent(args, SDK_VERSION) || 'okta-auth-js-' + SDK_VERSION;
 
   // Digital clocks will drift over time, so the server
   // can misalign with the time reported by the browser.

diff --git a/packages/okta-auth-js/lib/builderUtil.js b/packages/okta-auth-js/lib/builderUtil.js
@@ -13,7 +13,6 @@
 var AuthSdkError = require('./errors/AuthSdkError');
 var tx = require('./tx');
 var util = require('./util');
-var SDK_VERSION = require('../package.json').version;
 
 // TODO: use @okta/configuration-validation (move module to this monorepo?)
 // eslint-disable-next-line complexity
@@ -101,7 +100,7 @@ function buildOktaAuth(OktaAuthBuilder) {
   };
 }
 
-function getUserAgent(args) {
+function getUserAgent(args, sdkVersion) {
   var userAgent = args.userAgent;
 
   if (!userAgent) {
@@ -113,7 +112,7 @@ function getUserAgent(args) {
   }
 
   if (userAgent.template) {
-    return userAgent.template.replace('$OKTA_AUTH_JS', `okta-auth-js/${SDK_VERSION}`);
+    return userAgent.template.replace('$OKTA_AUTH_JS', `okta-auth-js/${sdkVersion}`);
   }
 
   return '';

diff --git a/packages/okta-auth-js/lib/server/server.js b/packages/okta-auth-js/lib/server/server.js
@@ -29,7 +29,7 @@ function OktaAuthBuilder(args) {
     headers: args.headers
   };
 
-  this.userAgent = builderUtil.getUserAgent(args) || 'okta-auth-js-server' + SDK_VERSION;
+  this.userAgent = builderUtil.getUserAgent(args, SDK_VERSION) || 'okta-auth-js-server' + SDK_VERSION;
 
   sdk.tx = {
     status: util.bind(tx.transactionStatus, null, sdk),

diff --git a/packages/okta-auth-js/test/spec/builderUtil.js b/packages/okta-auth-js/test/spec/builderUtil.js
@@ -1,5 +1,6 @@
-var builderUtil  = require('../../lib/builderUtil');
-var SDK_VERSION = require('../../package.json').version;
+const builderUtil  = require('../../lib/builderUtil');
+
+const SDK_VERSION = '0.0.0';
 
 describe('builderUtil', () => {
 
@@ -19,8 +20,8 @@ describe('builderUtil', () => {
           template: 'fake userAgent $OKTA_AUTH_JS' 
         } 
       };
-      const userAgent = builderUtil.getUserAgent(args);
-      expect(userAgent).toEqual(`fake userAgent okta-auth-js/${SDK_VERSION}`);
+      const userAgent = builderUtil.getUserAgent(args, SDK_VERSION);
+      expect(userAgent).toEqual(`fake userAgent okta-auth-js/0.0.0`);
     });
     it('should return undefined if neither with userAgent nor userAgentTemplate in args', () => {
       const args = {};