colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove GlobalAction

This commit is contained in:
Jannis Mattheis 2018-10-21 14:00:26 +02:00
parent dcd8469f4d
commit 4af9b9686f
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/src/actions/GlobalAction.ts
View File

@ -1,19 +0,0 @@
import {AxiosResponse} from 'axios';
import dispatcher from '../stores/dispatcher';
import * as AppAction from './AppAction';
import * as ClientAction from './ClientAction';
import * as MessageAction from './MessageAction';
import * as UserAction from './UserAction';
export function initialLoad(resp: AxiosResponse<IUser>) {
AppAction.fetchApps();
MessageAction.listenToWebSocket();
ClientAction.fetchClients();
if (resp.data.admin) {
UserAction.fetchUsers();
}
}
export function snack(message: string) {
dispatcher.dispatch({type: 'SNACK', payload: message});
}

5
ui/src/stores/CurrentUser.ts
View File

@ -1,7 +1,6 @@
import axios, {AxiosResponse} from 'axios'; import axios, {AxiosResponse} from 'axios';
import * as config from '../config'; import * as config from '../config';
import {detect} from 'detect-browser'; import {detect} from 'detect-browser';
import * as GlobalAction from '../actions/GlobalAction';
import SnackManager, {SnackReporter} from './SnackManager'; import SnackManager, {SnackReporter} from './SnackManager';
import {observable} from 'mobx'; import {observable} from 'mobx';
@ -38,6 +37,7 @@ class CurrentUser {
}; };
public login = async (username: string, password: string) => { public login = async (username: string, password: string) => {
this.loggedIn = false;
this.authenticating = true; this.authenticating = true;
const browser = detect(); const browser = detect();
const name = (browser && browser.name + ' ' + browser.version) || 'unknown browser'; const name = (browser && browser.name + ' ' + browser.version) || 'unknown browser';
@ -53,10 +53,9 @@ class CurrentUser {
this.snack(`A client named '${name}' was created for your session.`); this.snack(`A client named '${name}' was created for your session.`);
this.setToken(resp.data.token); this.setToken(resp.data.token);
this.tryAuthenticate() this.tryAuthenticate()
.then((user) => { .then(() => {
this.authenticating = false; this.authenticating = false;
this.loggedIn = true; this.loggedIn = true;
GlobalAction.initialLoad(user);
}) })
.catch(() => { .catch(() => {
this.authenticating = false; this.authenticating = false;