diff --git a/internal/apps/oauth/err.go b/internal/apps/oauth/err.go index 6cb57590..e10d18a6 100644 --- a/internal/apps/oauth/err.go +++ b/internal/apps/oauth/err.go @@ -25,7 +25,7 @@ package oauth const ( - UnAuthorized = "未登录" - InvalidState = "非法登录请求" - BannedUser = "用户已被封禁" + UnAuthorized = "未登录" + InvalidState = "非法登录请求" + BannedAccount = "账号已被封禁" ) diff --git a/internal/apps/oauth/utils.go b/internal/apps/oauth/utils.go index c83152b7..1d13ceda 100644 --- a/internal/apps/oauth/utils.go +++ b/internal/apps/oauth/utils.go @@ -104,6 +104,11 @@ func doOAuth(ctx context.Context, code string) (*User, error) { span.SetStatus(codes.Error, err.Error()) return nil, err } + if !userInfo.Active { + err = errors.New(BannedAccount) + span.SetStatus(codes.Error, err.Error()) + return nil, err + } // save to db var user User @@ -142,7 +147,7 @@ func doOAuth(ctx context.Context, code string) (*User, error) { } } else { if !user.IsActive { - err = errors.New(BannedUser) + err = errors.New(BannedAccount) span.SetStatus(codes.Error, err.Error()) return nil, err }