From d1b02aebec9393acdb6b28980e24654a5569ffc7 Mon Sep 17 00:00:00 2001
From: Eugen Ciur <eugen@papermerge.com>
Date: Sun, 21 Nov 2021 11:49:46 +0100
Subject: [PATCH] reuse requests service
---
app/adapters/application.js | 17 ++---------------
app/services/requests.js | 3 ++-
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/app/adapters/application.js b/app/adapters/application.js
index db31fbf..c087b2c 100644
--- a/app/adapters/application.js
+++ b/app/adapters/application.js
@@ -1,5 +1,4 @@
import JSONAPIAdapter from '@ember-data/adapter/json-api';
-import { computed } from '@ember/object';
import { inject as service } from '@ember/service';
import ENV from 'papermerge/config/environment';
@@ -7,7 +6,7 @@ import ENV from 'papermerge/config/environment';
export default class ApplicationAdapter extends JSONAPIAdapter {
namespace = ENV.APP.NAMESPACE;
host = ENV.APP.HOST;
- @service session;
+ @service requests;
buildURL(...args) {
let ret = super.buildURL(...args);
@@ -18,19 +17,7 @@ export default class ApplicationAdapter extends JSONAPIAdapter {
return `${ret}/`;
}
- @computed('session.data.authenticated.token', 'session.isAuthenticated')
get headers() {
- let _headers = {},
- token;
-
- if (this.session.isAuthenticated) {
- token = this.session.data.authenticated.token;
- _headers['Authorization'] = `Token ${token}`;
- }
-
- return _headers;
+ return this.requests.headers;
}
-
-
-
}
diff --git a/app/services/requests.js b/app/services/requests.js
index 5ba331a..71ea917 100644
--- a/app/services/requests.js
+++ b/app/services/requests.js
@@ -1,5 +1,6 @@
import ENV from 'papermerge/config/environment';
import Service from '@ember/service';
+// eslint-disable-next-line ember/no-computed-properties-in-native-classes
import { computed } from '@ember/object';
import { inject as service } from '@ember/service';
@@ -23,7 +24,7 @@ export default class Requests extends Service {
return `${ENV.APP.HOST}/${ENV.APP.NAMESPACE}/`;
}
- @computed('session.data.authenticated.token', 'session.isAuthenticated')
+ @computed('session.{data.authenticated.token,isAuthenticated}')
get headers() {
let _headers = {},
token;
--
GitLab