Browse Source

Improved auth flow

update-deps
Alex Mikhalev 7 years ago
parent
commit
0f4b055a12
  1. 14
      app/state/AppState.ts

14
app/state/AppState.ts

@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
import { WebSocketRpcClient } from "@app/sprinklersRpc/websocketClient";
import HttpApi from "@app/state/HttpApi";
import { UiStore } from "@app/state/UiStore";
import { createBrowserHistory, History } from "history";
import { computed } from "mobx";
import { RouterStore, syncHistoryWithStore } from "mobx-react-router";
import { WebSocketRpcClient } from "@app/sprinklersRpc/websocketClient";
import HttpApi from "@app/state/HttpApi";
import { UiStore } from "@app/state/UiStore";
import log from "@common/logger";
const isDev = process.env.NODE_ENV === "development";
const websocketPort = isDev ? 8080 : location.port;
@ -28,7 +30,13 @@ export default class AppState { @@ -28,7 +30,13 @@ export default class AppState {
if (!this.httpApi.tokenStore.accessToken.isValid) {
if (this.httpApi.tokenStore.refreshToken.isValid) {
try {
await this.httpApi.tokenStore.grantRefresh();
} catch (err) {
log.warn({ err }, "could not refresh access token. erasing token");
this.tokenStore.clear();
this.history.push("/login");
}
} else {
this.history.push("/login");
}

Loading…
Cancel
Save