Merge pull request #121 from yyg-max/master

fix: Handle the ban of LinuxDo accounts

Author: TethysPlex

internal/apps/oauth/err.go

@@ -25,7 +25,7 @@
 package oauth
 
 const (
-	UnAuthorized = "未登录"
-	InvalidState = "非法登录请求"
-	BannedUser   = "用户已被封禁"
+	UnAuthorized  = "未登录"
+	InvalidState  = "非法登录请求"
+	BannedAccount = "账号已被封禁"
 )

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
 		}