ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tokens now correctly delete themselves

Browse source
This commit is contained in:
ReAnzu 2018-02-26 19:53:56 -06:00
parent f11f4e9313
commit deb70e5f28
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client/js/api.js
View file

@ -175,11 +175,18 @@ class Api extends events.EventTarget {
} }
logout() { logout() {
this.delete_token(this.userName, this.userToken); this.delete_token(this.userName, this.userToken).then(response => {
this._logout()
}, error => {
this._logout()
});
}
_logout() {
this.user = null; this.user = null;
this.userName = null; this.userName = null;
this.userPassword = null; this.userPassword = null;
this.userToken = null;
this.dispatchEvent(new CustomEvent('logout')); this.dispatchEvent(new CustomEvent('logout'));
} }

2
server/szurubooru/api/user_token_api.py
View file

@ -30,9 +30,9 @@ def create_user_token(ctx: rest.Context, _params: Dict[str, str] = {}) -> rest.R
@rest.routes.delete('/user-tokens/(?P<user_token>[^/]+)/?') @rest.routes.delete('/user-tokens/(?P<user_token>[^/]+)/?')
def create_user_token(ctx: rest.Context, params: Dict[str, str]) -> rest.Response: def create_user_token(ctx: rest.Context, params: Dict[str, str]) -> rest.Response:
auth.verify_privilege(ctx.user, 'user_token:delete')
user_token = user_tokens.get_user_token_by_user_and_token(ctx.user, params['user_token']) user_token = user_tokens.get_user_token_by_user_and_token(ctx.user, params['user_token'])
if user_token is not None: if user_token is not None:
auth.verify_privilege(ctx.user, 'user_token:delete')
ctx.session.delete(user_token) ctx.session.delete(user_token)
ctx.session.commit() ctx.session.commit()
return {} return {}