From 08c484042e72d00ab1e094c44fb78552d19e453c Mon Sep 17 00:00:00 2001 From: Marco Otte-Witte Date: Wed, 25 Jun 2014 19:29:44 +0200 Subject: [PATCH 1/3] load crossOriginWhitelist from window.ENV, close #218 --- packages/ember-simple-auth/lib/simple-auth/configuration.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ember-simple-auth/lib/simple-auth/configuration.js b/packages/ember-simple-auth/lib/simple-auth/configuration.js index 5c5e43c85..87b969ec5 100644 --- 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') || '/'; } }; From 0b51d610356ca634ad67ef4a405b6ccd81f5b48f Mon Sep 17 00:00:00 2001 From: Marco Otte-Witte Date: Wed, 25 Jun 2014 19:33:33 +0200 Subject: [PATCH 2/3] fixed README link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6484dba89..68a0de39d 120000 --- a/README.md +++ b/README.md @@ -1 +1 @@ -packages/simple-auth/README.md \ No newline at end of file +packages/ember-simple-auth/README.md \ No newline at end of file From c76ca3646f4363077dcd82cfc3708e7c1bf0146b Mon Sep 17 00:00:00 2001 From: Marco Otte-Witte Date: Wed, 25 Jun 2014 20:35:01 +0200 Subject: [PATCH 3/3] 0.6.2 --- CHANGELOG.md | 5 +++++ packages/ember-simple-auth-cookie-store/package.json | 2 +- packages/ember-simple-auth-devise/package.json | 2 +- packages/ember-simple-auth-oauth2/package.json | 2 +- packages/ember-simple-auth/package.json | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95f546d0b..3968db076 100644 --- 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 index 36c5d37b6..9cc81ef1d 100644 --- 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 index 3157c8b40..c9347f958 100644 --- 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 index 700e8fade..b7d826480 100644 --- 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/package.json b/packages/ember-simple-auth/package.json index 51de81570..8a5b3b163 100644 --- 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"