amikhalev/sprinklers3
1
1
Fork 0
Code Issues 9 Pull Requests 1 Releases Wiki Activity

Fixed rpc not connecting after login

Browse Source
This commit is contained in:
Alex Mikhalev 2018-08-19 20:01:04 -06:00
parent 939540cd0e
commit ed8d012a4b
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/state/AppState.ts
View File

@ -29,6 +29,7 @@ export default class AppState extends TypedEventEmitter<AppEvents> {
super();
this.sprinklersRpc.on("newUserData", this.userStore.receiveUserData);
this.sprinklersRpc.on("tokenError", this.checkToken);
this.httpApi.on("tokenGranted", () => this.emit("hasToken"));
this.httpApi.on("tokenError", this.checkToken);
this.on("checkToken", this.doCheckToken);

33
client/state/HttpApi.ts
View File

@ -1,14 +1,16 @@
import { action } from "mobx";
import { TokenStore } from "@client/state/TokenStore";
import ApiError from "@common/ApiError";
import { ErrorCode } from "@common/ErrorCode";
import { TokenGrantPasswordRequest, TokenGrantRefreshRequest, TokenGrantResponse } from "@common/httpApi";
import log from "@common/logger";
import { DefaultEvents, TypedEventEmitter } from "@common/TypedEventEmitter";
import { runInAction } from "mobx";
export { ApiError };
interface HttpApiEvents extends DefaultEvents {
tokenGranted(response: TokenGrantResponse): void;
error(err: ApiError): void;
tokenError(err: ApiError): void;
}
@ -39,6 +41,8 @@ export default class HttpApi extends TypedEventEmitter<HttpApiEvents> {
this.emit("tokenError", err);
}
});
this.on("tokenGranted", this.onTokenGranted);
}
async makeRequest(url: string, options?: RequestInit, body?: any): Promise<any> {
@ -82,13 +86,7 @@ export default class HttpApi extends TypedEventEmitter<HttpApiEvents> {
const response: TokenGrantResponse = await this.makeRequest("/token/grant", {
method: "POST",
}, request);
runInAction("grantPasswordSuccess", () => {
this.tokenStore.accessToken.token = response.access_token;
this.tokenStore.refreshToken.token = response.refresh_token;
this.tokenStore.saveLocalStorage();
});
const { accessToken } = this.tokenStore;
log.debug({ aud: accessToken.claims!.aud }, "got password grant tokens");
this.emit("tokenGranted", response);
}
async grantRefresh() {
@ -102,12 +100,17 @@ export default class HttpApi extends TypedEventEmitter<HttpApiEvents> {
const response: TokenGrantResponse = await this.makeRequest("/token/grant", {
method: "POST",
}, request);
runInAction("grantRefreshSuccess", () => {
this.tokenStore.accessToken.token = response.access_token;
this.tokenStore.refreshToken.token = response.refresh_token;
this.tokenStore.saveLocalStorage();
});
const { accessToken } = this.tokenStore;
log.debug({ aud: accessToken.claims!.aud }, "got refresh grant tokens");
this.emit("tokenGranted", response);
}
@action.bound
private onTokenGranted(response: TokenGrantResponse) {
this.tokenStore.accessToken.token = response.access_token;
this.tokenStore.refreshToken.token = response.refresh_token;
this.tokenStore.saveLocalStorage();
const { accessToken, refreshToken } = this.tokenStore;
log.debug({
accessToken: accessToken.claims, refreshToken: refreshToken.claims,
}, "got new tokens");
}
}