From 0cd461db1880de66d12a7e92cbc3e672b8cff202 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 27 Jan 2015 16:33:20 -0900 Subject: [PATCH] Setting up CORS --- app/adapters/application.js | 4 +++- app/authenticators/custom.js | 3 ++- config/environment.js | 4 +++- package.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/adapters/application.js b/app/adapters/application.js index 2c5e29d..1295b07 100644 --- a/app/adapters/application.js +++ b/app/adapters/application.js @@ -1,5 +1,7 @@ import DS from 'ember-data'; +import config from '../config/environment'; export default DS.RESTAdapter.reopen({ - namespace: 'api' + namespace: 'api', + host: config.apiURL }); diff --git a/app/authenticators/custom.js b/app/authenticators/custom.js index 1b08656..73ce81b 100644 --- a/app/authenticators/custom.js +++ b/app/authenticators/custom.js @@ -1,8 +1,9 @@ import Ember from 'ember'; import Base from 'simple-auth/authenticators/base'; +import config from '../config/environment'; export default Base.extend({ - tokenEndpoint: '/api/authenticate', + tokenEndpoint: config.apiURL + '/api/authenticate', restore: function(data) { return new Ember.RSVP.Promise(function(resolve, reject) { diff --git a/config/environment.js b/config/environment.js index 40c3219..c61fce3 100644 --- a/config/environment.js +++ b/config/environment.js @@ -26,8 +26,10 @@ module.exports = function(environment) { ENV.APP.LOG_TRANSITIONS_INTERNAL = true; // ENV.APP.LOG_VIEW_LOOKUPS = true; ENV['simple-auth'] = { - authorizer: 'authorizers:custom' + authorizer: 'authorizers:custom', + crossOriginWhitelist: ['http://127.0.0.1:8901'] } + ENV.apiURL = 'http://127.0.0.1:8901'; } if (environment === 'test') { diff --git a/package.json b/package.json index 1a15d27..4492967 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.0.0", "broccoli-ember-hbs-template-compiler": "^1.6.1", - "ember-cli": "0.1.9", + "ember-cli": "^0.1.9", "ember-cli-6to5": "0.2.1", "ember-cli-content-security-policy": "0.3.0", "ember-cli-dependency-checker": "0.0.7",