From 215e51f764660442405b47c2620c62681ef5a057 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sat, 26 Nov 2016 18:57:08 +0100
Subject: Move some interactions to the backendInteractor

The idea is that all interactions should move there, so components
don't have to pass around credentials all the time.
---
 src/services/api/api.service.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/services/api/api.service.js')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 87102376..7757dd88 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -20,21 +20,23 @@ let fetch = (url, options) => {
 }
 
 const authHeaders = (user) => {
-  if (user) {
+  if (user && user.username && user.password) {
     return { 'Authorization': `Basic ${btoa(`${user.username}:${user.password}`)}` }
   } else {
     return { }
   }
 }
 
-const fetchConversation = ({id}) => {
+const fetchConversation = ({id, credentials}) => {
   let url = `${CONVERSATION_URL}/${id}.json?count=100`
-  return fetch(url).then((data) => data.json())
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => data.json())
 }
 
-const fetchStatus = ({id}) => {
+const fetchStatus = ({id, credentials}) => {
   let url = `${STATUS_URL}/${id}.json`
-  return fetch(url).then((data) => data.json())
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => data.json())
 }
 
 const fetchTimeline = ({timeline, credentials, since = false, until = false}) => {
-- 
cgit v1.2.3-70-g09d2