Fix bad exports, including a circular dependency

auth0 · Apr 4, 2018 · 72f77d9 · 72f77d9
1 parent 6d1fab2
commit 72f77d9
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 18 deletions.
diff --git a/api/get_index.js b/api/get_index.js
@@ -6,7 +6,7 @@ const logger = require('../lib/logger');
 const stylesheet = require('../lib/stylesheet');
 const getIdentityProviderPublicName = require('../lib/idProviders');
 const humanizeArray = require('../lib/humanize');
-const resolveLocale = require('../lib/locale');
+const { resolveLocale } = require('../lib/locale');
 const { getSettings } = require('../lib/storage');
 
 const decodeToken = token =>

diff --git a/gulpfile.js b/gulpfile.js
@@ -7,8 +7,7 @@ const nodemon = require('gulp-nodemon');
 const { install } = require('./modifyRule');
 const managementAdapter = require('./lib/managementAdapter');
 
-const ManagementClientAdapter = managementAdapter.default;
-const { getCurrentConfig } = managementAdapter;
+const { ManagementClientAdapter, getCurrentConfig } = managementAdapter;
 
 gulp.task('run', () => {
   ngrok.connect(3001, (ngrokError, url) => {

diff --git a/lib/locale.js b/lib/locale.js
@@ -19,5 +19,8 @@ function resolveLocale(locale = 'en', overrideLocales) {
   return action.then(returnableFunction).catch(() => allLocales);
 }
 
-module.exports = resolveLocale;
-module.exports.allLocales = allLocales;
+module.exports = {
+  allLocales,
+  resolveLocale,
+};
+
diff --git a/lib/managementAdapter.js b/lib/managementAdapter.js
@@ -53,5 +53,8 @@ class ManagementClientAdapter {
   }
 }
 
-module.exports = ManagementClientAdapter;
-module.exports.getCurrentConfig = getCurrentConfig;
+module.exports = { 
+  ManagementClientAdapter,
+  getCurrentConfig,
+};
+
diff --git a/lib/storage.js b/lib/storage.js
@@ -1,9 +1,9 @@
 const getStorage = require('./db').get;
-const { allLocales } = require('./locale');
+const allLocales = require('../locales.json');
 const defTemplate = require('../templates/utils/defaultTemplate');
 
-export const STATUS_SUCCESSFUL = 'ok';
-export const STATUS_ERRORED = 'error';
+const STATUS_SUCCESSFUL = 'ok';
+const STATUS_ERRORED = 'error';
 const DEFAULT_LOCALE = 'en';
 
 // Temporal dummy storage accessor methods
@@ -46,6 +46,8 @@ function setLocales(locales) {
 }
 
 module.exports = {
+  STATUS_SUCCESSFUL,
+  STATUS_ERRORED,
   getSettings,
   setSettings,
   getLocales,

diff --git a/templates/utils/auth0widget.js b/templates/utils/auth0widget.js
@@ -1,5 +1,5 @@
 /* eslint-disable arrow-parens */
-const getCurrentLocale = require('../../lib/locale');
+const { resolveLocale } = require('../../lib/locale');
 const { getSettings } = require('../../lib/storage');
 const svgDimensions = require('../../lib/svgDimensions');
 const lockOverlay = require('./lockOverlay');
@@ -55,7 +55,7 @@ const getSubmitButton = (settings, t) => {
 module.exports = (dynamicSettings, identities, locale = 'en') =>
   getSettings().then(storedSettings => {
     const settings = Object.assign(storedSettings, dynamicSettings);
-    return getCurrentLocale(locale).then(t => `
+    return resolveLocale(locale).then(t => `
             <div id="auth0-lock-container-1" class="auth0-lock-container">
                 <div class="auth0-lock auth0-lock-opened auth0-lock-with-tabs ${lockOutlineClass(
     settings.removeOverlay

diff --git a/test/test_helper.js b/test/test_helper.js
@@ -122,4 +122,4 @@ const createToken = (user) => {
   return sign(userSub, config('AUTH0_CLIENT_SECRET'), options);
 };
 
-module.exports = { startServer, createRequest as request, createServer, createToken };
+module.exports = { startServer, request: createRequest, createServer, createToken };
diff --git a/test/unit/locale_test.js b/test/unit/locale_test.js
@@ -1,8 +1,7 @@
 /* eslint-disable no-underscore-dangle */
 
 const { expect } = require('chai');
-const resolveLocale = require('../../lib/locale');
-const { allLocales } = require('../../lib/locale');
+const { resolveLocale, allLocales } = require('../../lib/locale');
 
 const sampleLocales = {
   en: {

diff --git a/test/unit/managementAdapter_test.js b/test/unit/managementAdapter_test.js
@@ -2,8 +2,7 @@
 
 const path = require('path');
 const { expect } = require('chai');
-const ManagementAdapter = require('../../lib/managementAdapter');
-const { getCurrentConfig } = require('../../lib/managementAdapter');
+const { ManagementClientAdapter, getCurrentConfig } = require('../../lib/managementAdapter');
 
 const configPath = path.join(__dirname, '../../server/config.test.json');
 
@@ -20,7 +19,7 @@ describe('Management API adapter', () => {
 
   it('Adapter initializes correctly', (done) => {
     getCurrentConfig(configPath).then((config) => {
-      const adapter = new ManagementAdapter(config);
+      const adapter = new ManagementClientAdapter(config);
 
       expect(typeof adapter.client).to.equal('object');