mirror of
https://github.com/mayswind/ezbookkeeping.git
synced 2026-05-19 17:24:26 +08:00
add revoke all sessions in device & session page
This commit is contained in:
@@ -143,6 +143,7 @@ func startWebServer(c *cli.Context) error {
|
|||||||
// Tokens
|
// Tokens
|
||||||
apiV1Route.GET("/tokens/list.json", bindApi(api.Tokens.TokenListHandler))
|
apiV1Route.GET("/tokens/list.json", bindApi(api.Tokens.TokenListHandler))
|
||||||
apiV1Route.POST("/tokens/revoke.json", bindApi(api.Tokens.TokenRevokeHandler))
|
apiV1Route.POST("/tokens/revoke.json", bindApi(api.Tokens.TokenRevokeHandler))
|
||||||
|
apiV1Route.POST("/tokens/revokeAll.json", bindApi(api.Tokens.TokenRevokeAllHandler))
|
||||||
apiV1Route.POST("/tokens/refresh.json", bindApi(api.Tokens.TokenRefreshHandler))
|
apiV1Route.POST("/tokens/refresh.json", bindApi(api.Tokens.TokenRefreshHandler))
|
||||||
|
|
||||||
// Users
|
// Users
|
||||||
|
|||||||
+40
-6
@@ -75,8 +75,8 @@ func (a *TokensApi) TokenRevokeCurrentHandler(c *core.Context) (interface{}, *er
|
|||||||
}
|
}
|
||||||
|
|
||||||
tokenRecord := &models.TokenRecord{
|
tokenRecord := &models.TokenRecord{
|
||||||
Uid: uid,
|
Uid: uid,
|
||||||
UserTokenId: userTokenId,
|
UserTokenId: userTokenId,
|
||||||
CreatedUnixTime: claims.IssuedAt,
|
CreatedUnixTime: claims.IssuedAt,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,6 +129,40 @@ func (a *TokensApi) TokenRevokeHandler(c *core.Context) (interface{}, *errs.Erro
|
|||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *TokensApi) TokenRevokeAllHandler(c *core.Context) (interface{}, *errs.Error) {
|
||||||
|
uid := c.GetCurrentUid()
|
||||||
|
tokens, err := a.tokens.GetAllTokensByUid(uid)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
log.ErrorfWithRequestId(c, "[tokens.TokenRevokeAllHandler] failed to get all tokens for user \"uid:%d\", because %s", uid, err.Error())
|
||||||
|
return nil, errs.ErrOperationFailed
|
||||||
|
}
|
||||||
|
|
||||||
|
claims := c.GetTokenClaims()
|
||||||
|
currentTokenIndex := 0
|
||||||
|
|
||||||
|
for i := 0; i < len(tokens); i++ {
|
||||||
|
token := tokens[i]
|
||||||
|
|
||||||
|
if utils.Int64ToString(token.Uid) == claims.Id && utils.Int64ToString(token.UserTokenId) == claims.UserTokenId && token.CreatedUnixTime == claims.IssuedAt {
|
||||||
|
currentTokenIndex = i
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tokens = append(tokens[:currentTokenIndex], tokens[currentTokenIndex+1:]...)
|
||||||
|
|
||||||
|
err = a.tokens.DeleteTokens(uid, tokens)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
log.ErrorfWithRequestId(c, "[token.TokenRevokeAllHandler] failed to revoke all tokens for user \"uid:%d\", because %s", uid, err.Error())
|
||||||
|
return nil, errs.Or(err, errs.ErrOperationFailed)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.InfofWithRequestId(c, "[token.TokenRevokeAllHandler] user \"uid:%d\" has revoked all tokens", uid)
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (a *TokensApi) TokenRefreshHandler(c *core.Context) (interface{}, *errs.Error) {
|
func (a *TokensApi) TokenRefreshHandler(c *core.Context) (interface{}, *errs.Error) {
|
||||||
uid := c.GetCurrentUid()
|
uid := c.GetCurrentUid()
|
||||||
user, err := a.users.GetUserById(uid)
|
user, err := a.users.GetUserById(uid)
|
||||||
@@ -148,8 +182,8 @@ func (a *TokensApi) TokenRefreshHandler(c *core.Context) (interface{}, *errs.Err
|
|||||||
oldTokenClaims := c.GetTokenClaims()
|
oldTokenClaims := c.GetTokenClaims()
|
||||||
oldUserTokenId, _ := utils.StringToInt64(oldTokenClaims.UserTokenId)
|
oldUserTokenId, _ := utils.StringToInt64(oldTokenClaims.UserTokenId)
|
||||||
oldTokenRecord := &models.TokenRecord{
|
oldTokenRecord := &models.TokenRecord{
|
||||||
Uid: uid,
|
Uid: uid,
|
||||||
UserTokenId: oldUserTokenId,
|
UserTokenId: oldUserTokenId,
|
||||||
CreatedUnixTime: oldTokenClaims.IssuedAt,
|
CreatedUnixTime: oldTokenClaims.IssuedAt,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,9 +192,9 @@ func (a *TokensApi) TokenRefreshHandler(c *core.Context) (interface{}, *errs.Err
|
|||||||
log.InfofWithRequestId(c, "[token.TokenRefreshHandler] user \"uid:%d\" token refreshed, new token will be expired at %d", user.Uid, claims.ExpiresAt)
|
log.InfofWithRequestId(c, "[token.TokenRefreshHandler] user \"uid:%d\" token refreshed, new token will be expired at %d", user.Uid, claims.ExpiresAt)
|
||||||
|
|
||||||
refreshResp := &models.TokenRefreshResponse{
|
refreshResp := &models.TokenRefreshResponse{
|
||||||
NewToken: token,
|
NewToken: token,
|
||||||
OldTokenId: a.tokens.GenerateTokenId(oldTokenRecord),
|
OldTokenId: a.tokens.GenerateTokenId(oldTokenRecord),
|
||||||
User: user.ToUserBasicInfo(),
|
User: user.ToUserBasicInfo(),
|
||||||
}
|
}
|
||||||
|
|
||||||
return refreshResp, nil
|
return refreshResp, nil
|
||||||
|
|||||||
@@ -116,6 +116,25 @@ func (s *TokenService) DeleteToken(tokenRecord *models.TokenRecord) error {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *TokenService) DeleteTokens(uid int64, tokenRecords []*models.TokenRecord) error {
|
||||||
|
if uid <= 0 {
|
||||||
|
return errs.ErrUserIdInvalid
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.TokenDB(uid).DoTransaction(func(sess *xorm.Session) error {
|
||||||
|
for i := 0; i < len(tokenRecords); i++ {
|
||||||
|
tokenRecord := tokenRecords[i]
|
||||||
|
_, err := sess.Where("uid=? AND user_token_id=? AND created_unix_time=?", uid, tokenRecord.UserTokenId, tokenRecord.CreatedUnixTime).Delete(&models.TokenRecord{})
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func (s *TokenService) DeleteTokenByClaims(claims *core.UserTokenClaims) error {
|
func (s *TokenService) DeleteTokenByClaims(claims *core.UserTokenClaims) error {
|
||||||
uid, err := utils.StringToInt64(claims.Id)
|
uid, err := utils.StringToInt64(claims.Id)
|
||||||
|
|
||||||
|
|||||||
@@ -126,6 +126,9 @@ export default {
|
|||||||
tokenId
|
tokenId
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
revokeAllTokens: () => {
|
||||||
|
return axios.post('v1/tokens/revokeAll.json');
|
||||||
|
},
|
||||||
getProfile: () => {
|
getProfile: () => {
|
||||||
return axios.get('v1/users/profile/get.json');
|
return axios.get('v1/users/profile/get.json');
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -358,11 +358,15 @@ export default {
|
|||||||
'Your profile has been successfully updated': 'Your profile has been successfully updated',
|
'Your profile has been successfully updated': 'Your profile has been successfully updated',
|
||||||
'Unable to update user profile': 'Unable to update user profile',
|
'Unable to update user profile': 'Unable to update user profile',
|
||||||
'Device & Sessions': 'Device & Sessions',
|
'Device & Sessions': 'Device & Sessions',
|
||||||
|
'Logout All': 'Logout All',
|
||||||
'Unable to get session list': 'Unable to get session list',
|
'Unable to get session list': 'Unable to get session list',
|
||||||
'Current': 'Current',
|
'Current': 'Current',
|
||||||
'Other Device': 'Other Device',
|
'Other Device': 'Other Device',
|
||||||
'Are you sure you want to logout from this session?': 'Are you sure you want to logout from this session?',
|
'Are you sure you want to logout from this session?': 'Are you sure you want to logout from this session?',
|
||||||
'Unable to logout from this session': 'Unable to logout from this session',
|
'Unable to logout from this session': 'Unable to logout from this session',
|
||||||
|
'Are you sure you want to logout all other sessions?': 'Are you sure you want to logout all other sessions?',
|
||||||
|
'You have logged out all other sessions': 'You have logged out all other sessions',
|
||||||
|
'Unable to logout all other sessions': 'Unable to logout all other sessions',
|
||||||
'Regenerate Backup Codes': 'Regenerate Backup Codes',
|
'Regenerate Backup Codes': 'Regenerate Backup Codes',
|
||||||
'Please use two factor authentication app scan the below qrcode and input current passcode': 'Please use two factor authentication app scan the below qrcode and input current passcode',
|
'Please use two factor authentication app scan the below qrcode and input current passcode': 'Please use two factor authentication app scan the below qrcode and input current passcode',
|
||||||
'Please enter your current password when disable two factor authentication': 'Please enter your current password when disable two factor authentication',
|
'Please enter your current password when disable two factor authentication': 'Please enter your current password when disable two factor authentication',
|
||||||
|
|||||||
@@ -358,11 +358,15 @@ export default {
|
|||||||
'Your profile has been successfully updated': '您的用户信息更新成功',
|
'Your profile has been successfully updated': '您的用户信息更新成功',
|
||||||
'Unable to update user profile': '无法更新用户信息',
|
'Unable to update user profile': '无法更新用户信息',
|
||||||
'Device & Sessions': '设备和会话',
|
'Device & Sessions': '设备和会话',
|
||||||
|
'Logout All': '注销全部',
|
||||||
'Unable to get session list': '无法获取会话列表',
|
'Unable to get session list': '无法获取会话列表',
|
||||||
'Current': '当前',
|
'Current': '当前',
|
||||||
'Other Device': '其他设备',
|
'Other Device': '其他设备',
|
||||||
'Are you sure you want to logout from this session?': '您确定是否要退出该会话?',
|
'Are you sure you want to logout from this session?': '您确定是否要退出该会话?',
|
||||||
'Unable to logout from this session': '无法退出该会话',
|
'Unable to logout from this session': '无法退出该会话',
|
||||||
|
'Are you sure you want to logout all other sessions?': '您确定是否要退出其他所有会话?',
|
||||||
|
'You have logged out all other sessions': '您已经退出其他所有会话',
|
||||||
|
'Unable to logout all other sessions': '无法退出其他所有会话',
|
||||||
'Regenerate Backup Codes': '重新生成备用码',
|
'Regenerate Backup Codes': '重新生成备用码',
|
||||||
'Please use two factor authentication app scan the below qrcode and input current passcode': '请使用两步验证应用扫描下方的二维码并输入当前的验证码',
|
'Please use two factor authentication app scan the below qrcode and input current passcode': '请使用两步验证应用扫描下方的二维码并输入当前的验证码',
|
||||||
'Please enter your current password when disable two factor authentication': '禁用两步验证时需要输入您的当前密码',
|
'Please enter your current password when disable two factor authentication': '禁用两步验证时需要输入您的当前密码',
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
<template>
|
<template>
|
||||||
<f7-page ptr @ptr:refresh="reload">
|
<f7-page ptr @ptr:refresh="reload">
|
||||||
<f7-navbar :title="$t('Device & Sessions')" :back-link="$t('Back')"></f7-navbar>
|
<f7-navbar>
|
||||||
|
<f7-nav-left :back-link="$t('Back')"></f7-nav-left>
|
||||||
|
<f7-nav-title :title="$t('Device & Sessions')"></f7-nav-title>
|
||||||
|
<f7-nav-right>
|
||||||
|
<f7-link :class="{ 'disabled': tokens.length < 2 }" :text="$t('Logout All')" @click="revokeAll"></f7-link>
|
||||||
|
</f7-nav-right>
|
||||||
|
</f7-navbar>
|
||||||
|
|
||||||
<f7-card class="skeleton-text" v-if="loading">
|
<f7-card class="skeleton-text" v-if="loading">
|
||||||
<f7-card-content :padding="false">
|
<f7-card-content :padding="false">
|
||||||
@@ -126,6 +132,43 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
},
|
||||||
|
revokeAll() {
|
||||||
|
const self = this;
|
||||||
|
|
||||||
|
if (self.tokens.length < 2) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
self.$confirm('Are you sure you want to logout all other sessions?', () => {
|
||||||
|
self.$showLoading();
|
||||||
|
|
||||||
|
self.$services.revokeAllTokens().then(response => {
|
||||||
|
self.$hideLoading();
|
||||||
|
const data = response.data;
|
||||||
|
|
||||||
|
if (!data || !data.success || !data.result) {
|
||||||
|
self.$alert('Unable to logout all other sessions');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let i = self.tokens.length - 1; i >= 0; i--) {
|
||||||
|
if (!self.tokens[i].isCurrent) {
|
||||||
|
self.tokens.splice(i, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
self.$toast('You have logged out all other sessions');
|
||||||
|
}).catch(error => {
|
||||||
|
self.$hideLoading();
|
||||||
|
|
||||||
|
if (error.response && error.response.data && error.response.data.errorMessage) {
|
||||||
|
self.$alert({error: error.response.data});
|
||||||
|
} else if (!error.processed) {
|
||||||
|
self.$alert('Unable to logout all other sessions');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
filters: {
|
filters: {
|
||||||
|
|||||||
Reference in New Issue
Block a user