Make sure to qualify requests made outside of adapters

This commit is contained in:
Michael Lange
2017-10-06 17:14:08 -07:00
parent 13975ebc0b
commit 4dd8ec89b8
2 changed files with 20 additions and 4 deletions

View File

@@ -1,14 +1,18 @@
import Ember from 'ember';
import fetch from 'fetch';
import PromiseObject from '../utils/classes/promise-object';
import { namespace } from '../adapters/application';
const { Service, computed } = Ember;
const { Service, computed, inject } = Ember;
export default Service.extend({
token: inject.service(),
leader: computed(function() {
const token = this.get('token');
return PromiseObject.create({
promise: fetch(`/${namespace}/status/leader`)
promise: token
.authorizedRequest(`/${namespace}/status/leader`)
.then(res => res.json())
.then(rpcAddr => ({ rpcAddr }))
.then(leader => {

View File

@@ -1,6 +1,7 @@
import Ember from 'ember';
import fetch from 'fetch';
const { Service, computed } = Ember;
const { Service, computed, assign } = Ember;
export default Service.extend({
accessor: computed({
@@ -31,4 +32,15 @@ export default Service.extend({
return value;
},
}),
authorizedRequest(url, options = {}) {
const headers = {};
const token = this.get('secret');
if (token) {
headers['X-Nomad-Token'] = token;
}
return fetch(url, assign(options, { headers }));
},
});