diff --git a/.babelrc b/.babelrc index 4ffef06dbfb53d6210bc68ec4218f3b3d74108fc..274617bceec31c01138dff560444e4b64595c846 100755 --- a/.babelrc +++ b/.babelrc @@ -1,3 +1,4 @@ { - "presets": ["env", "react"] + "presets": ["env", "react"], + "plugins": ["transform-object-rest-spread"] } diff --git a/package-lock.json b/package-lock.json index 213df07a2213f6ca45b5fb0699beb8fc03d628a1..bddd5774a94dd9b49ccfb0161fc785af8d277316 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1267,12 +1267,28 @@ } }, "babel-plugin-transform-object-rest-spread": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz", - "integrity": "sha1-h11ryb52HFiirj/u5dxIldjH+SE=", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", + "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", "requires": { "babel-plugin-syntax-object-rest-spread": "6.13.0", - "babel-runtime": "6.23.0" + "babel-runtime": "6.26.0" + }, + "dependencies": { + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "requires": { + "core-js": "2.4.1", + "regenerator-runtime": "0.11.1" + } + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + } } }, "babel-plugin-transform-react-display-name": { @@ -1491,7 +1507,7 @@ "babel-plugin-transform-async-generator-functions": "6.24.1", "babel-plugin-transform-async-to-generator": "6.24.1", "babel-plugin-transform-exponentiation-operator": "6.24.1", - "babel-plugin-transform-object-rest-spread": "6.23.0" + "babel-plugin-transform-object-rest-spread": "6.26.0" } }, "babel-register": { @@ -7176,14 +7192,6 @@ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" }, - "jso": { - "version": "4.0.0-rc.3", - "resolved": "https://registry.npmjs.org/jso/-/jso-4.0.0-rc.3.tgz", - "integrity": "sha512-DbBIrfnrDP2TfJKBa0bjx/T9RA6dRMrfgu1SNhFCcooXH4FU4ZDkKwqR0Ef6aNXJe7B9b7ui6/YiWdKh7ziBcQ==", - "requires": { - "webpack-cli": "2.0.12" - } - }, "json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", diff --git a/package.json b/package.json index ba0ed52f0be6eedb19e51f7b937753559f7dcb56..792745f7a930f6c3eddc660746ba2a4f6e2976dd 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "", "scripts": { "start": "node server", - "dev": "webpack-dev-server --content-base public --config ./webpack.dev.config.js --host 127.0.0.1 ", + "dev": "webpack-dev-server --mode development --content-base public --config ./webpack.dev.config.js --host 127.0.0.1 ", "build": "webpack --display-error-details -d", "build:prod": "webpack -p --config ./webpack.prod.config.js" }, @@ -15,6 +15,7 @@ "babel-core": "^6.26.0", "babel-eslint": "^8.2.2", "babel-loader": "^7.1.4", + "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-polyfill": "^6.26.0", "babel-preset-env": "^1.6.1", "babel-preset-react": "^6.24.1", @@ -39,7 +40,6 @@ "dotenv": "^4.0.0", "express": "^4.16.3", "history": "^4.7.2", - "jso": "^4.0.0-rc.3", "jwt-decode": "^2.2.0", "lodash": "^4.17.5", "moment": "^2.21.0", diff --git a/src/utils/API.js b/src/utils/API.js index 52f1f5e20bb9351ad795aa32913dfe4e04399308..0f570f6ad2551806a46dc62a59d249a5dcc24b7b 100644 --- a/src/utils/API.js +++ b/src/utils/API.js @@ -20,7 +20,7 @@ class Authenticator { authenticate() { let opts = {} - opts.redirect_uri = 'http://0.0.0.0:8080/passiveResponse.html' + opts.redirect_uri = 'http://127.0.0.1:8080/passiveResponse.html' return this.jso.getToken(opts) .then((token) => { // console.error("Get Token returned ", token) @@ -62,7 +62,7 @@ authDataporten.jso.setLoader(Popup) const authORCID = new Authenticator({ providerID: "orcid", client_id: 'APP-RL4BA8VODEEBZCPN', - redirect_uri: 'http://0.0.0.0:8080/?callback=orcid', + redirect_uri: 'http://127.0.0.1:8080/?callback=orcid', authorization: 'https://orcid.org/oauth/authorize', userinfo: 'https://auth.dataporten.no/userinfo', response_type: 'code', diff --git a/webpack.base.config.js b/webpack.base.config.js index 90f774007e4a36ea35109310e54766623e36715b..f3852c91bfed6451bc1db30d79433548073ab7c5 100644 --- a/webpack.base.config.js +++ b/webpack.base.config.js @@ -44,8 +44,8 @@ module.exports = { exclude: (/node_modules/), loader: 'babel-loader', query: { - presets: ['es2015', 'react', 'stage-2'], - plugins: ['transform-es2015-spread'] + presets: ['env', 'react'], + plugins: ["transform-object-rest-spread"] } }, {