TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-02 06:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

用户AccessKey：增加最近访问时间、修复AccessKey没有区分用户的Bug

Browse Source
This commit is contained in:
GoEdgeLab
2021-06-16 10:48:08 +08:00
parent 076e807024
commit 3a25fea374
4 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/rpc/services/service_api_access_token.go
View File

@@ -7,12 +7,12 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
)
// AccessToken相关服务
// APIAccessTokenService AccessToken相关服务
type APIAccessTokenService struct {
BaseService
}
// 获取AccessToken
// GetAPIAccessToken 获取AccessToken
func (this *APIAccessTokenService) GetAPIAccessToken(ctx context.Context, req *pb.GetAPIAccessTokenRequest) (*pb.GetAPIAccessTokenResponse, error) {
if req.Type == "user" { // 用户
tx := this.NullTx()
@@ -28,11 +28,18 @@ func (this *APIAccessTokenService) GetAPIAccessToken(ctx context.Context, req *p
return nil, errors.New("access key not found")
}
// 更新AccessKey访问时间
err = models.SharedUserAccessKeyDAO.UpdateAccessKeyAccessedAt(tx, int64(accessKey.Id))
if err != nil {
return nil, err
}
// 创建AccessToken
token, expiresAt, err := models.SharedAPIAccessTokenDAO.GenerateAccessToken(tx, int64(accessKey.UserId))
if err != nil {
return nil, err
}
return &pb.GetAPIAccessTokenResponse{
Token: token,
ExpiresAt: expiresAt,

11
internal/rpc/services/service_user_access_key.go
View File

@@ -6,12 +6,12 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
)
// 用户AccessKey相关服务
// UserAccessKeyService 用户AccessKey相关服务
type UserAccessKeyService struct {
BaseService
}
// 创建AccessKey
// CreateUserAccessKey 创建AccessKey
func (this *UserAccessKeyService) CreateUserAccessKey(ctx context.Context, req *pb.CreateUserAccessKeyRequest) (*pb.CreateUserAccessKeyResponse, error) {
_, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId)
if err != nil {
@@ -27,7 +27,7 @@ func (this *UserAccessKeyService) CreateUserAccessKey(ctx context.Context, req *
return &pb.CreateUserAccessKeyResponse{UserAccessKeyId: userAccessKeyId}, nil
}
// 查找所有的AccessKey
// FindAllEnabledUserAccessKeys 查找所有的AccessKey
func (this *UserAccessKeyService) FindAllEnabledUserAccessKeys(ctx context.Context, req *pb.FindAllEnabledUserAccessKeysRequest) (*pb.FindAllEnabledUserAccessKeysResponse, error) {
_, _, err := this.ValidateAdminAndUser(ctx, 0, req.UserId)
if err != nil {
@@ -51,13 +51,14 @@ func (this *UserAccessKeyService) FindAllEnabledUserAccessKeys(ctx context.Conte
UniqueId: accessKey.UniqueId,
Secret: accessKey.Secret,
Description: accessKey.Description,
AccessedAt: int64(accessKey.AccessedAt),
})
}
return &pb.FindAllEnabledUserAccessKeysResponse{UserAccessKeys: result}, nil
}
// 删除AccessKey
// DeleteUserAccessKey 删除AccessKey
func (this *UserAccessKeyService) DeleteUserAccessKey(ctx context.Context, req *pb.DeleteUserAccessKeyRequest) (*pb.RPCSuccess, error) {
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {
@@ -83,7 +84,7 @@ func (this *UserAccessKeyService) DeleteUserAccessKey(ctx context.Context, req *
return this.Success()
}
// 设置是否启用AccessKey
// UpdateUserAccessKeyIsOn 设置是否启用AccessKey
func (this *UserAccessKeyService) UpdateUserAccessKeyIsOn(ctx context.Context, req *pb.UpdateUserAccessKeyIsOnRequest) (*pb.RPCSuccess, error) {
_, userId, err := this.ValidateAdminAndUser(ctx, 0, 0)
if err != nil {