Merge branch 'next'

mainmatter · Jun 25, 2014 · 9eb0b0d · 9eb0b0d
2 parents 95c6416 + c76ca36
commit 9eb0b0d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.6.2
+
+* The `crossOriginWhitelist` is now loaded from `window.ENV` correctly, see
+  #218.
+
 # 0.6.1
 
 * __[BREAKING] All factory properties that previously had a "Factory" suffix

diff --git a/packages/ember-simple-auth-cookie-store/package.json b/packages/ember-simple-auth-cookie-store/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-simple-auth-cookie-store",
   "main": "simple-auth-cookie-store",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "A Cookie based store for Ember Simple Auth.",
   "author": "Marco Otte-Witte",
   "license": "MIT"

diff --git a/packages/ember-simple-auth-devise/package.json b/packages/ember-simple-auth-devise/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-simple-auth-devise",
   "main": "simple-auth-devise",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "An authenticator and authorizer for Ember Simple Auth that is compatible with the Ruby on Rails plugin devise.",
   "author": "Timothy Baron, Marco Otte-Witte",
   "license": "MIT"

diff --git a/packages/ember-simple-auth-oauth2/package.json b/packages/ember-simple-auth-oauth2/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-simple-auth-oauth2",
   "main": "simple-auth-oauth2",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "An authenticator and authorizer for Ember Simple Auth that implement RFC 6749 OAuth 2.0 and RFC 6750 (Bearer Tokens).",
   "author": "Marco Otte-Witte",
   "license": "MIT"

diff --git a/packages/ember-simple-auth/lib/simple-auth/configuration.js b/packages/ember-simple-auth/lib/simple-auth/configuration.js
@@ -111,6 +111,7 @@ export default {
     this.sessionPropertyName      = globalConfig.sessionPropertyName || this.sessionPropertyName;
     this.authorizer               = globalConfig.authorizer || this.authorizer;
     this.store                    = globalConfig.store || this.store;
+    this.crossOriginWhitelist     = globalConfig.crossOriginWhitelist || this.crossOriginWhitelist;
     this.applicationRootUrl       = container.lookup('router:main').get('rootURL') || '/';
   }
 };
diff --git a/packages/ember-simple-auth/package.json b/packages/ember-simple-auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-simple-auth",
   "main": "simple-auth",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "A lightweight library for implementing authentication/authorization with Ember.js applications.",
   "author": "Marco Otte-Witte",
   "license": "MIT"