diff --git a/package.json b/package.json index f2150aa..f1bce27 100644 --- a/package.json +++ b/package.json @@ -27,9 +27,6 @@ "@shoutem/fork-terminal": "1.0.0", "archiver": "^3.0.0", "async": "2.6.0", - "babel-eslint": "8.2.3", - "babel-plugin-transform-object-rest-spread": "6.26.0", - "babel-preset-env": "^1.7.0", "babel-register": "6.26.0", "bluebird": "3.5.1", "child-process-promise": "2.2.1", @@ -89,7 +86,11 @@ }, "devDependencies": { "babel-cli": "6.26.0", + "babel-eslint": "8.2.3", "babel-plugin-rewire": "1.1.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-preset-env": "^1.7.0", + "babel-preset-es2015": "6.24.1", "chai": "4.1.2", "dos2unix-cli": "1.0.1", "eslint-config-airbnb": "16.1.0", diff --git a/src/clients/_tests_/extension-manager.js b/src/clients/_tests_/extension-manager.js index 2e057a4..42a534d 100644 --- a/src/clients/_tests_/extension-manager.js +++ b/src/clients/_tests_/extension-manager.js @@ -5,7 +5,7 @@ describe('Extension manager client integration tests', () => { describe('Fetch developer info', () => { it('should fetch developer info', async () => { const refreshToken = await authService.getRefreshToken({ email: 'cli-test@shoutem.com', password: 'password' }); - await authService.authorizeRequests(refreshToken); + authService.authorizeRequests(refreshToken); const dev = await getDeveloper(); console.log(dev); }); diff --git a/src/clients/auth-service.js b/src/clients/auth-service.js index 1e87130..1535930 100644 --- a/src/clients/auth-service.js +++ b/src/clients/auth-service.js @@ -1,5 +1,5 @@ import URI from 'urijs'; -import fetchTokenIntercept from '@shoutem/fetch-token-intercept'; +import { configure, authorize } from '@shoutem/fetch-token-intercept'; import logger from '../services/logger'; import cache from '../services/cache-env'; @@ -145,8 +145,8 @@ function authorizeRequests(refreshToken) { try { const accessToken = cache.getValue('access-token'); - fetchTokenIntercept.configure(authorizationConfig); - fetchTokenIntercept.authorize(refreshToken, accessToken); + configure(authorizationConfig); + authorize(refreshToken, accessToken); return true; } catch (err) { logger.info(err); diff --git a/src/templates/settings-page-react-bin/server/.babelrc b/src/templates/settings-page-react-bin/server/.babelrc index b4e0857..20d0be1 100644 --- a/src/templates/settings-page-react-bin/server/.babelrc +++ b/src/templates/settings-page-react-bin/server/.babelrc @@ -1,6 +1,6 @@ { "presets": [ - ["es2015", { "modules": false }], + ["env", { "modules": false }], "react", "stage-0" ],