Merge tag '0.7.2' into amp.chat
Change-Id: Ideb662d56977082af5757fed21573ff25ca52e27
This commit is contained in:
commit
da8cb12756
@ -35,20 +35,23 @@ const authProvider = {
|
|||||||
|
|
||||||
const logout_api_url =
|
const logout_api_url =
|
||||||
localStorage.getItem("base_url") + "/_matrix/client/r0/logout";
|
localStorage.getItem("base_url") + "/_matrix/client/r0/logout";
|
||||||
const token = localStorage.getItem("access_token");
|
const access_token = localStorage.getItem("access_token");
|
||||||
|
|
||||||
const options = {
|
const options = {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
user: {
|
user: {
|
||||||
authenticated: true,
|
authenticated: true,
|
||||||
token: `Bearer ${token}`,
|
token: `Bearer ${access_token}`,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
return fetchUtils.fetchJson(logout_api_url, options).then(({ json }) => {
|
if (typeof access_token === "string") {
|
||||||
localStorage.removeItem("access_token");
|
fetchUtils.fetchJson(logout_api_url, options).then(({ json }) => {
|
||||||
localStorage.removeItem("device_id");
|
localStorage.removeItem("access_token");
|
||||||
});
|
localStorage.removeItem("device_id");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return Promise.resolve();
|
||||||
},
|
},
|
||||||
// called when the API returns an error
|
// called when the API returns an error
|
||||||
checkError: ({ status }) => {
|
checkError: ({ status }) => {
|
||||||
@ -62,7 +65,7 @@ const authProvider = {
|
|||||||
checkAuth: () => {
|
checkAuth: () => {
|
||||||
const access_token = localStorage.getItem("access_token");
|
const access_token = localStorage.getItem("access_token");
|
||||||
console.log("checkAuth " + access_token);
|
console.log("checkAuth " + access_token);
|
||||||
return typeof access_token == "string"
|
return typeof access_token === "string"
|
||||||
? Promise.resolve()
|
? Promise.resolve()
|
||||||
: Promise.reject();
|
: Promise.reject();
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user