diff --git a/Gruntfile.js b/Gruntfile.js
index 271d3da2d..42800cbad 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,31 +1,30 @@
-"use strict";
+'use strict';
-const path = require("path");
-const fs = require("fs");
-const pkg = require("./package");
-const webpack = require("webpack");
-const webpackConfig = require("./webpack.config.js");
-const UnminifiedWebpackPlugin = require("unminified-webpack-plugin");
+const path = require('path');
+const fs = require('fs');
+const pkg = require('./package');
+const webpack = require('webpack');
+const webpackConfig = require('./webpack.config.js');
+const UnminifiedWebpackPlugin = require('unminified-webpack-plugin');
-module.exports = function (grunt) {
-
- const pkg_info = grunt.file.readJSON("package.json");
+module.exports = function(grunt) {
+ const pkg_info = grunt.file.readJSON('package.json');
grunt.initConfig({
pkg: pkg_info,
clean: {
- build: ["build/"],
- dev: ["build/"],
- dist: ["lib/"]
+ build: ['build/'],
+ dev: ['build/'],
+ dist: ['lib/']
},
babel: {
dist: {
files: [
{
expand: true,
- cwd: "src",
- src: ["**/*.js", "**/*.jsx"],
- dest: "lib",
+ cwd: 'src',
+ src: ['**/*.js', '**/*.jsx'],
+ dest: 'lib',
ext: '.js'
}
]
@@ -33,22 +32,21 @@ module.exports = function (grunt) {
},
env: {
build: {
- NODE_ENV: "production"
+ NODE_ENV: 'production'
}
},
exec: {
- touch_index: "touch src/index.js"
+ touch_index: 'touch src/index.js'
},
webpack: {
options: webpackConfig,
build: {
- devtool: "source-map",
+ devtool: 'source-map',
output: {
- path: path.join(__dirname, "build"),
+ path: path.join(__dirname, 'build'),
filename: 'lock.min.js'
},
watch: false,
- devtool: 'source-map',
plugins: [
new webpack.LoaderOptionsPlugin({
minimize: true,
@@ -56,7 +54,7 @@ module.exports = function (grunt) {
}),
new webpack.DefinePlugin({
'process.env': {
- 'NODE_ENV': JSON.stringify('production')
+ NODE_ENV: JSON.stringify('production')
}
}),
new webpack.optimize.AggressiveMergingPlugin(),
@@ -74,37 +72,38 @@ module.exports = function (grunt) {
]
}
},
- "webpack-dev-server": {
+ 'webpack-dev-server': {
options: {
webpack: webpackConfig,
- publicPath: "/build/"
+ publicPath: '/build/'
},
dev: {
hot: true,
port: 3000,
+ https: true,
webpack: {
- devtool: "eval"
+ devtool: 'eval'
}
},
design: {
webpack: {
entry: './support/design/index.js',
output: {
- path: path.join(__dirname, "build"),
+ path: path.join(__dirname, 'build'),
filename: 'lock.design.js'
},
- devtool: "eval"
+ devtool: 'eval'
}
}
},
- "i18n": {
+ i18n: {
build: {
files: [
{
expand: true,
- cwd: "lib/i18n",
- src: "**/*.js",
- dest: "build",
+ cwd: 'lib/i18n',
+ src: '**/*.js',
+ dest: 'build',
ext: '.js'
}
]
@@ -112,25 +111,25 @@ module.exports = function (grunt) {
}
});
- grunt.loadNpmTasks("grunt-babel");
- grunt.loadNpmTasks("grunt-webpack");
- grunt.loadNpmTasks("grunt-contrib-clean");
- grunt.loadNpmTasks("grunt-env");
- grunt.loadNpmTasks("grunt-exec");
+ grunt.loadNpmTasks('grunt-babel');
+ grunt.loadNpmTasks('grunt-webpack');
+ grunt.loadNpmTasks('grunt-contrib-clean');
+ grunt.loadNpmTasks('grunt-env');
+ grunt.loadNpmTasks('grunt-exec');
- grunt.registerTask("build", ["clean:build", "env:build", "webpack:build", "i18n:build"]);
- grunt.registerTask("dist", ["clean:dist", "babel:dist"]);
- grunt.registerTask("prepare_dev", ["clean:dev"]);
- grunt.registerTask("dev", ["prepare_dev", "webpack-dev-server:dev"]);
- grunt.registerTask("design", ["prepare_dev", "webpack-dev-server:design"]);
- grunt.registerMultiTask("i18n", "Prepares i18n files to be hosted in CDN", function () {
+ grunt.registerTask('build', ['clean:build', 'env:build', 'webpack:build', 'i18n:build']);
+ grunt.registerTask('dist', ['clean:dist', 'babel:dist']);
+ grunt.registerTask('prepare_dev', ['clean:dev']);
+ grunt.registerTask('dev', ['prepare_dev', 'webpack-dev-server:dev']);
+ grunt.registerTask('design', ['prepare_dev', 'webpack-dev-server:design']);
+ grunt.registerMultiTask('i18n', 'Prepares i18n files to be hosted in CDN', function() {
var languages = {};
var Auth0 = {
- registerLanguageDictionary: function (lang, dict) {
+ registerLanguageDictionary: function(lang, dict) {
languages[lang] = dict;
}
};
- this.files.forEach(function (file) {
+ this.files.forEach(function(file) {
var filename = file.src[0];
var lang = path.basename(filename, '.js');
var dict = require('./' + filename).default || require('./' + filename);
diff --git a/package.json b/package.json
index 082ddca9a..fe4e934ab 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
"zuul-ngrok": "4.0.0"
},
"dependencies": {
- "auth0-js": "~8.6.0",
+ "auth0-js": "~8.7.0",
"blueimp-md5": "2.3.1",
"fbjs": "^0.3.1",
"idtoken-verifier": "^1.0.1",
diff --git a/src/__tests__/core/web_api/__snapshots__/p2_api.test.js.snap b/src/__tests__/core/web_api/__snapshots__/p2_api.test.js.snap
index b6e97313c..a9ba5ca44 100644
--- a/src/__tests__/core/web_api/__snapshots__/p2_api.test.js.snap
+++ b/src/__tests__/core/web_api/__snapshots__/p2_api.test.js.snap
@@ -10,6 +10,8 @@ Object {
}
`;
+exports[`Auth0APIClient logIn with credentials should fail when in popup mode 1`] = `"Cross origin login is not supported in popup mode"`;
+
exports[`Auth0APIClient logIn with social/enterprise (without username and email) should call authorize when redirect===true 1`] = `
Object {
"nonce": undefined,
diff --git a/src/__tests__/core/web_api/p2_api.test.js b/src/__tests__/core/web_api/p2_api.test.js
index b465d70d4..33c35c509 100644
--- a/src/__tests__/core/web_api/p2_api.test.js
+++ b/src/__tests__/core/web_api/p2_api.test.js
@@ -51,12 +51,20 @@ describe('Auth0APIClient', () => {
});
});
describe('with credentials', () => {
+ it('should fail when in popup mode', () => {
+ const client = getClient({
+ redirect: false
+ });
+ expect(() => client.logIn({ username: 'foo' }, {})).toThrowErrorMatchingSnapshot();
+ });
it('should call client.login', () => {
- const client = getClient();
+ const client = getClient({
+ redirect: true
+ });
const callback = jest.fn();
client.logIn({ username: 'foo' }, {}, callback);
const mock = getAuth0ClientMock();
- const loginMock = mock.WebAuth.mock.instances[0].client.login.mock;
+ const loginMock = mock.WebAuth.mock.instances[0].login.mock;
assertCallWithCallback(loginMock, callback);
});
});
diff --git a/src/core/web_api/p2_api.js b/src/core/web_api/p2_api.js
index 417d096b2..6a37ddd22 100644
--- a/src/core/web_api/p2_api.js
+++ b/src/core/web_api/p2_api.js
@@ -53,8 +53,11 @@ class Auth0APIClient {
this.client.authorize(loginOptions, f);
}
} else {
+ if (this.authOpt.popup) {
+ throw new Error('Cross origin login is not supported in popup mode');
+ }
loginOptions.realm = options.connection;
- this.client.client.login(loginOptions, f);
+ this.client.login(loginOptions, f);
}
}
diff --git a/support/callback-cross-auth.html b/support/callback-cross-auth.html
new file mode 100644
index 000000000..823cdeb55
--- /dev/null
+++ b/support/callback-cross-auth.html
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/support/index.html b/support/index.html
index 0fcfdc8a6..3bb4e1307 100644
--- a/support/index.html
+++ b/support/index.html
@@ -2,42 +2,47 @@
Dev
-
+
+
-
+
+