tanner/caremyway-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed auth token header, Moved dispatch out of constructors

Browse Source
This commit is contained in:
Alexander Wong 2017-09-03 12:15:37 -06:00
parent 44c6117ce1
commit ffe3cba510
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/api/baseApi.js
View File

@ -10,43 +10,45 @@ const localStorage = global.process && process.env.NODE_ENV === "test"
function headers() { function headers() {
const token = localStorage.getItem("userToken") || ""; const token = localStorage.getItem("userToken") || "";
let header = {
return {
Accept: "application/json", Accept: "application/json",
"Content-Type": "application/json", "Content-Type": "application/json"
Authorization: `Token ${token}`
}; };
if (token) {
header["Authorization"] = `Token ${token}`;
}
return header;
} }
const apiInstance = axios.create({ const apiInstance = axios.create({
baseURL: API_ENDPOINT, baseURL: API_ENDPOINT,
timeout: 3000, timeout: 3000
}); });
export function get(url, params = {}) { export function get(url, params = {}) {
return apiInstance return apiInstance
.get(url, {params, headers: headers()}) .get(url, { params, headers: headers() })
.then(response => response.data) .then(response => response.data)
.catch(error => Promise.reject(error)); .catch(error => Promise.reject(error));
} }
export function post(url, data) { export function post(url, data) {
return apiInstance return apiInstance
.post(url, data, {headers: headers()}) .post(url, data, { headers: headers() })
.then(response => response.data) .then(response => response.data)
.catch(error => Promise.reject(error)); .catch(error => Promise.reject(error));
} }
export function patch(url, data) { export function patch(url, data) {
return apiInstance return apiInstance
.patch(url, data, {headers: headers()}) .patch(url, data, { headers: headers() })
.then(response => response.data) .then(response => response.data)
.catch(error => Promise.reject(error)); .catch(error => Promise.reject(error));
} }
export function del(url) { export function del(url) {
return apiInstance return apiInstance
.delete(url, {headers: headers()}) .delete(url, { headers: headers() })
.then(response => response.data) .then(response => response.data)
.catch(error => Promise.reject(error)); .catch(error => Promise.reject(error));
} }

3
src/components/Auth/Login.jsx
View File

@ -13,8 +13,7 @@ import { sendLoginRequest } from "../../actions/auth/saga.actions";
import Error from "../Shared/Error"; import Error from "../Shared/Error";
class Login extends Component { class Login extends Component {
constructor(props) { componentWillMount() {
super(props);
this.props.dispatch(clearAuthRequestError()); this.props.dispatch(clearAuthRequestError());
this.props.dispatch(clearAuthRequestSuccess()); this.props.dispatch(clearAuthRequestSuccess());
} }

3
src/components/Auth/Register.jsx
View File

@ -14,8 +14,7 @@ import { sendRegisterRequest } from "../../actions/auth/saga.actions";
import Error from "../Shared/Error"; import Error from "../Shared/Error";
class Register extends Component { class Register extends Component {
constructor(props) { componentWillMount() {
super(props);
this.props.dispatch(clearAuthRequestError()); this.props.dispatch(clearAuthRequestError());
this.props.dispatch(clearAuthRequestSuccess()); this.props.dispatch(clearAuthRequestSuccess());
} }

3
src/components/Auth/Settings.jsx
View File

@ -13,8 +13,7 @@ import { sendChangePasswordRequest } from "../../actions/auth/saga.actions";
import Error from "../Shared/Error"; import Error from "../Shared/Error";
class Settings extends Component { class Settings extends Component {
constructor(props) { componentWillMount() {
super(props);
this.props.dispatch(clearAuthRequestError()); this.props.dispatch(clearAuthRequestError());
this.props.dispatch(clearAuthRequestSuccess()); this.props.dispatch(clearAuthRequestSuccess());
} }

3
src/components/Auth/VerifyEmail.jsx
View File

@ -12,8 +12,7 @@ import { sendEmailVerificationRequest } from "../../actions/auth/saga.actions";
import Error from "../Shared/Error"; import Error from "../Shared/Error";
class VerifyEmail extends Component { class VerifyEmail extends Component {
constructor(props) { componentWillMount() {
super(props);
const emailKey = this.props.match.params.emailKey; const emailKey = this.props.match.params.emailKey;
this.props.dispatch(clearEmailVerificationError()); this.props.dispatch(clearEmailVerificationError());
this.props.dispatch(clearEmailVerificationSuccess()); this.props.dispatch(clearEmailVerificationSuccess());