Fixed auth token header, Moved dispatch out of constructors
This commit is contained in:
parent
44c6117ce1
commit
ffe3cba510
|
@ -10,17 +10,19 @@ const localStorage = global.process && process.env.NODE_ENV === "test"
|
|||
|
||||
function headers() {
|
||||
const token = localStorage.getItem("userToken") || "";
|
||||
|
||||
return {
|
||||
let header = {
|
||||
Accept: "application/json",
|
||||
"Content-Type": "application/json",
|
||||
Authorization: `Token ${token}`
|
||||
"Content-Type": "application/json"
|
||||
};
|
||||
if (token) {
|
||||
header["Authorization"] = `Token ${token}`;
|
||||
}
|
||||
return header;
|
||||
}
|
||||
|
||||
const apiInstance = axios.create({
|
||||
baseURL: API_ENDPOINT,
|
||||
timeout: 3000,
|
||||
timeout: 3000
|
||||
});
|
||||
|
||||
export function get(url, params = {}) {
|
||||
|
|
|
@ -13,8 +13,7 @@ import { sendLoginRequest } from "../../actions/auth/saga.actions";
|
|||
import Error from "../Shared/Error";
|
||||
|
||||
class Login extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
componentWillMount() {
|
||||
this.props.dispatch(clearAuthRequestError());
|
||||
this.props.dispatch(clearAuthRequestSuccess());
|
||||
}
|
||||
|
|
|
@ -14,8 +14,7 @@ import { sendRegisterRequest } from "../../actions/auth/saga.actions";
|
|||
import Error from "../Shared/Error";
|
||||
|
||||
class Register extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
componentWillMount() {
|
||||
this.props.dispatch(clearAuthRequestError());
|
||||
this.props.dispatch(clearAuthRequestSuccess());
|
||||
}
|
||||
|
|
|
@ -13,8 +13,7 @@ import { sendChangePasswordRequest } from "../../actions/auth/saga.actions";
|
|||
import Error from "../Shared/Error";
|
||||
|
||||
class Settings extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
componentWillMount() {
|
||||
this.props.dispatch(clearAuthRequestError());
|
||||
this.props.dispatch(clearAuthRequestSuccess());
|
||||
}
|
||||
|
|
|
@ -12,8 +12,7 @@ import { sendEmailVerificationRequest } from "../../actions/auth/saga.actions";
|
|||
import Error from "../Shared/Error";
|
||||
|
||||
class VerifyEmail extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
componentWillMount() {
|
||||
const emailKey = this.props.match.params.emailKey;
|
||||
this.props.dispatch(clearEmailVerificationError());
|
||||
this.props.dispatch(clearEmailVerificationSuccess());
|
||||
|
|
Loading…
Reference in New Issue
Block a user