Feat: oauth2 qq

zijiren233 · zijiren233 · commit c96abd29279a · 2023-11-17T16:38:39.000+08:00
diff --git a/internal/db/user.go b/internal/db/user.go
@@ -19,7 +19,7 @@ func WithRole(role model.Role) CreateUserConfig {
 	}
 }
 
-func CreateUser(username string, p provider.OAuth2Provider, puid uint, conf ...CreateUserConfig) (*model.User, error) {
+func CreateUser(username string, p provider.OAuth2Provider, puid uint64, conf ...CreateUserConfig) (*model.User, error) {
 	u := &model.User{
 		Username: username,
 		Role:     model.RoleUser,
@@ -41,7 +41,7 @@ func CreateUser(username string, p provider.OAuth2Provider, puid uint, conf ...C
 }
 
 // 只有当provider和puid没有找到对应的user时才会创建
-func CreateOrLoadUser(username string, p provider.OAuth2Provider, puid uint, conf ...CreateUserConfig) (*model.User, error) {
+func CreateOrLoadUser(username string, p provider.OAuth2Provider, puid uint64, conf ...CreateUserConfig) (*model.User, error) {
 	var user model.User
 	var userProvider model.UserProvider
 
@@ -60,7 +60,7 @@ func CreateOrLoadUser(username string, p provider.OAuth2Provider, puid uint, con
 	return &user, nil
 }
 
-func GetProviderUserID(p provider.OAuth2Provider, puid uint) (string, error) {
+func GetProviderUserID(p provider.OAuth2Provider, puid uint64) (string, error) {
 	var userProvider model.UserProvider
 	if err := db.Where("provider = ? AND provider_user_id = ?", p, puid).First(&userProvider).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
diff --git a/internal/model/oauth2.go b/internal/model/oauth2.go
@@ -8,7 +8,7 @@ import (
 
 type UserProvider struct {
 	Provider       provider.OAuth2Provider `gorm:"not null;primarykey"`
-	ProviderUserID uint                    `gorm:"not null;primarykey;autoIncrement:false"`
+	ProviderUserID uint64                  `gorm:"not null;primarykey;autoIncrement:false"`
 	CreatedAt      time.Time
 	UpdatedAt      time.Time
 	UserID         string `gorm:"not null;index"`
diff --git a/internal/op/users.go b/internal/op/users.go
@@ -43,7 +43,7 @@ func GetUserById(id string) (*User, error) {
 	return u2, userCache.SetWithExpire(id, u2, time.Hour)
 }
 
-func CreateUser(username string, p provider.OAuth2Provider, pid uint, conf ...db.CreateUserConfig) (*User, error) {
+func CreateUser(username string, p provider.OAuth2Provider, pid uint64, conf ...db.CreateUserConfig) (*User, error) {
 	if username == "" {
 		return nil, errors.New("username cannot be empty")
 	}
@@ -59,7 +59,7 @@ func CreateUser(username string, p provider.OAuth2Provider, pid uint, conf ...db
 	return u2, userCache.SetWithExpire(u.ID, u2, time.Hour)
 }
 
-func CreateOrLoadUser(username string, p provider.OAuth2Provider, pid uint, conf ...db.CreateUserConfig) (*User, error) {
+func CreateOrLoadUser(username string, p provider.OAuth2Provider, pid uint64, conf ...db.CreateUserConfig) (*User, error) {
 	if username == "" {
 		return nil, errors.New("username cannot be empty")
 	}
@@ -75,7 +75,7 @@ func CreateOrLoadUser(username string, p provider.OAuth2Provider, pid uint, conf
 	return u2, userCache.SetWithExpire(u.ID, u2, time.Hour)
 }
 
-func GetUserByProvider(p provider.OAuth2Provider, pid uint) (*User, error) {
+func GetUserByProvider(p provider.OAuth2Provider, pid uint64) (*User, error) {
 	uid, err := db.GetProviderUserID(p, pid)
 	if err != nil {
 		return nil, err
diff --git a/internal/provider/plugins/client.go b/internal/provider/plugins/client.go
@@ -79,6 +79,6 @@ func (c *GRPCClient) GetUserInfo(ctx context.Context, tk *oauth2.Token) (*provid
 	}
 	return &provider.UserInfo{
 		Username:       resp.Username,
-		ProviderUserID: uint(resp.ProviderUserId),
+		ProviderUserID: resp.ProviderUserId,
 	}, nil
 }
diff --git a/internal/provider/plugins/example/example_gitee.go b/internal/provider/plugins/example/example_gitee.go
@@ -80,7 +80,7 @@ func (p *GiteeProvider) GetUserInfo(ctx context.Context, tk *oauth2.Token) (*pro
 }
 
 type giteeUserInfo struct {
-	ID    uint   `json:"id"`
+	ID    uint64 `json:"id"`
 	Login string `json:"login"`
 }
 
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -10,7 +10,7 @@ type OAuth2Provider string
 
 type UserInfo struct {
 	Username       string
-	ProviderUserID uint
+	ProviderUserID uint64
 }
 
 type Oauth2Option struct {
diff --git a/internal/provider/providers/baidu-netdisk.go b/internal/provider/providers/baidu-netdisk.go
@@ -71,7 +71,7 @@ type baiduNetDiskProviderUserInfo struct {
 	BaiduName string `json:"baidu_name"`
 	Errmsg    string `json:"errmsg"`
 	Errno     int    `json:"errno"`
-	Uk        uint   `json:"uk"`
+	Uk        uint64 `json:"uk"`
 }
 
 func init() {
diff --git a/internal/provider/providers/baidu.go b/internal/provider/providers/baidu.go
@@ -3,12 +3,11 @@ package providers
 import (
 	"context"
 	"fmt"
-	"hash/crc32"
+	"hash/crc64"
 	"net/http"
 
 	json "github.com/json-iterator/go"
 	"github.com/synctv-org/synctv/internal/provider"
-	"github.com/zijiren233/stream"
 	"golang.org/x/oauth2"
 )
 
@@ -62,7 +61,7 @@ func (p *BaiduProvider) GetUserInfo(ctx context.Context, tk *oauth2.Token) (*pro
 	}
 	return &provider.UserInfo{
 		Username:       ui.Uname,
-		ProviderUserID: uint(crc32.ChecksumIEEE(stream.StringToBytes(ui.Openid))),
+		ProviderUserID: crc64.Checksum([]byte(ui.Openid), crc64.MakeTable(crc64.ECMA)),
 	}, nil
 }
 
diff --git a/internal/provider/providers/gitee.go b/internal/provider/providers/gitee.go
@@ -63,7 +63,7 @@ func (p *GiteeProvider) GetUserInfo(ctx context.Context, tk *oauth2.Token) (*pro
 }
 
 type giteeUserInfo struct {
-	ID    uint   `json:"id"`
+	ID    uint64 `json:"id"`
 	Login string `json:"login"`
 }
 
diff --git a/internal/provider/providers/github.go b/internal/provider/providers/github.go
@@ -62,7 +62,7 @@ func (p *GithubProvider) GetUserInfo(ctx context.Context, tk *oauth2.Token) (*pr
 
 type githubUserInfo struct {
 	Login string `json:"login"`
-	ID    uint   `json:"id"`
+	ID    uint64 `json:"id"`
 }
 
 func init() {
diff --git a/internal/provider/providers/google.go b/internal/provider/providers/google.go
@@ -65,6 +65,6 @@ func init() {
 }
 
 type googleUserInfo struct {
-	ID   uint   `json:"id,string"`
+	ID   uint64 `json:"id,string"`
 	Name string `json:"name"`
 }
diff --git a/internal/provider/providers/microsoft.go b/internal/provider/providers/microsoft.go
@@ -2,7 +2,7 @@ package providers
 
 import (
 	"context"
-	"hash/crc32"
+	"hash/crc64"
 	"net/http"
 
 	json "github.com/json-iterator/go"
@@ -58,7 +58,7 @@ func (p *MicrosoftProvider) GetUserInfo(ctx context.Context, tk *oauth2.Token) (
 	}
 	return &provider.UserInfo{
 		Username:       ui.DisplayName,
-		ProviderUserID: uint(crc32.ChecksumIEEE(stream.StringToBytes(ui.ID))),
+		ProviderUserID: crc64.Checksum(stream.StringToBytes(ui.ID), crc64.MakeTable(crc64.ECMA)),
 	}, nil
 }
 
diff --git a/internal/provider/providers/qq.go b/internal/provider/providers/qq.go
@@ -0,0 +1,74 @@
+package providers
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"strconv"
+
+	json "github.com/json-iterator/go"
+	"github.com/synctv-org/synctv/internal/provider"
+	"golang.org/x/oauth2"
+)
+
+type QQProvider struct {
+	config oauth2.Config
+}
+
+func (p *QQProvider) Init(c provider.Oauth2Option) {
+	p.config.Scopes = []string{"get_user_info"}
+	p.config.Endpoint = oauth2.Endpoint{
+		AuthURL:  "https://graph.qq.com/oauth2.0/authorize",
+		TokenURL: "https://graph.qq.com/oauth2.0/token?grant_type=authorization_code",
+	}
+	p.config.ClientID = c.ClientID
+	p.config.ClientSecret = c.ClientSecret
+	p.config.RedirectURL = c.RedirectURL
+}
+
+func (p *QQProvider) Provider() provider.OAuth2Provider {
+	return "qq"
+}
+
+func (p *QQProvider) NewAuthURL(state string) string {
+	return p.config.AuthCodeURL(state, oauth2.AccessTypeOnline)
+}
+
+func (p *QQProvider) GetToken(ctx context.Context, code string) (*oauth2.Token, error) {
+	return p.config.Exchange(ctx, code)
+}
+
+func (p *QQProvider) RefreshToken(ctx context.Context, tk string) (*oauth2.Token, error) {
+	return p.config.TokenSource(ctx, &oauth2.Token{RefreshToken: tk}).Token()
+}
+
+func (p *QQProvider) GetUserInfo(ctx context.Context, tk *oauth2.Token) (*provider.UserInfo, error) {
+	client := p.config.Client(ctx, tk)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf("https://graph.qq.com/oauth2.0/me?access_token=%s&fmt=json", tk.AccessToken), nil)
+	if err != nil {
+		return nil, err
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	ui := qqProviderUserInfo{}
+	err = json.NewDecoder(resp.Body).Decode(&ui)
+	if err != nil {
+		return nil, err
+	}
+	return &provider.UserInfo{
+		Username:       strconv.FormatUint(ui.Openid, 10),
+		ProviderUserID: ui.Openid,
+	}, nil
+}
+
+func init() {
+	RegisterProvider(new(QQProvider))
+}
+
+type qqProviderUserInfo struct {
+	ClientID string `json:"client_id"`
+	Openid   uint64 `json:"openid,string"`
+}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ func WithRole(role model.Role) CreateUserConfig {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`-func CreateUser(username string, p provider.OAuth2Provider, puid uint, conf ...CreateUserConfig) (*model.User, error) {`
	`22`	`+func CreateUser(username string, p provider.OAuth2Provider, puid uint64, conf ...CreateUserConfig) (*model.User, error) {`
`23`	`23`	`u := &model.User{`
`24`	`24`	`Username: username,`
`25`	`25`	`Role: model.RoleUser,`
`@@ -41,7 +41,7 @@ func CreateUser(username string, p provider.OAuth2Provider, puid uint, conf ...C`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`// 只有当provider和puid没有找到对应的user时才会创建`
`44`		`-func CreateOrLoadUser(username string, p provider.OAuth2Provider, puid uint, conf ...CreateUserConfig) (*model.User, error) {`
	`44`	`+func CreateOrLoadUser(username string, p provider.OAuth2Provider, puid uint64, conf ...CreateUserConfig) (*model.User, error) {`
`45`	`45`	`var user model.User`
`46`	`46`	`var userProvider model.UserProvider`
`47`	`47`
`@@ -60,7 +60,7 @@ func CreateOrLoadUser(username string, p provider.OAuth2Provider, puid uint, con`
`60`	`60`	`return &user, nil`
`61`	`61`	`}`
`62`	`62`
`63`		`-func GetProviderUserID(p provider.OAuth2Provider, puid uint) (string, error) {`
	`63`	`+func GetProviderUserID(p provider.OAuth2Provider, puid uint64) (string, error) {`
`64`	`64`	`var userProvider model.UserProvider`
`65`	`65`	`if err := db.Where("provider = ? AND provider_user_id = ?", p, puid).First(&userProvider).Error; err != nil {`
`66`	`66`	`if errors.Is(err, gorm.ErrRecordNotFound) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func GetUserById(id string) (*User, error) {`
`43`	`43`	`return u2, userCache.SetWithExpire(id, u2, time.Hour)`
`44`	`44`	`}`
`45`	`45`
`46`		`-func CreateUser(username string, p provider.OAuth2Provider, pid uint, conf ...db.CreateUserConfig) (*User, error) {`
	`46`	`+func CreateUser(username string, p provider.OAuth2Provider, pid uint64, conf ...db.CreateUserConfig) (*User, error) {`
`47`	`47`	`if username == "" {`
`48`	`48`	`return nil, errors.New("username cannot be empty")`
`49`	`49`	`}`
`@@ -59,7 +59,7 @@ func CreateUser(username string, p provider.OAuth2Provider, pid uint, conf ...db`
`59`	`59`	`return u2, userCache.SetWithExpire(u.ID, u2, time.Hour)`
`60`	`60`	`}`
`61`	`61`
`62`		`-func CreateOrLoadUser(username string, p provider.OAuth2Provider, pid uint, conf ...db.CreateUserConfig) (*User, error) {`
	`62`	`+func CreateOrLoadUser(username string, p provider.OAuth2Provider, pid uint64, conf ...db.CreateUserConfig) (*User, error) {`
`63`	`63`	`if username == "" {`
`64`	`64`	`return nil, errors.New("username cannot be empty")`
`65`	`65`	`}`
`@@ -75,7 +75,7 @@ func CreateOrLoadUser(username string, p provider.OAuth2Provider, pid uint, conf`
`75`	`75`	`return u2, userCache.SetWithExpire(u.ID, u2, time.Hour)`
`76`	`76`	`}`
`77`	`77`
`78`		`-func GetUserByProvider(p provider.OAuth2Provider, pid uint) (*User, error) {`
	`78`	`+func GetUserByProvider(p provider.OAuth2Provider, pid uint64) (*User, error) {`
`79`	`79`	`uid, err := db.GetProviderUserID(p, pid)`
`80`	`80`	`if err != nil {`
`81`	`81`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,6 @@ func (c GRPCClient) GetUserInfo(ctx context.Context, tk oauth2.Token) (*provid`
`79`	`79`	`}`
`80`	`80`	`return &provider.UserInfo{`
`81`	`81`	`Username: resp.Username,`
`82`		`- ProviderUserID: uint(resp.ProviderUserId),`
	`82`	`+ ProviderUserID: resp.ProviderUserId,`
`83`	`83`	`}, nil`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (p GiteeProvider) GetUserInfo(ctx context.Context, tk oauth2.Token) (*pro`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`type giteeUserInfo struct {`
`83`		- ID uint `json:"id"`
	`83`	+ ID uint64 `json:"id"`
`84`	`84`	Login string `json:"login"`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ type OAuth2Provider string`
`10`	`10`
`11`	`11`	`type UserInfo struct {`
`12`	`12`	`Username string`
`13`		`- ProviderUserID uint`
	`13`	`+ ProviderUserID uint64`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`type Oauth2Option struct {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ type baiduNetDiskProviderUserInfo struct {`
`71`	`71`	BaiduName string `json:"baidu_name"`
`72`	`72`	Errmsg string `json:"errmsg"`
`73`	`73`	Errno int `json:"errno"`
`74`		- Uk uint `json:"uk"`
	`74`	+ Uk uint64 `json:"uk"`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,11 @@ package providers`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`		`- "hash/crc32"`
	`6`	`+ "hash/crc64"`
`7`	`7`	`"net/http"`
`8`	`8`
`9`	`9`	`json "github.com/json-iterator/go"`
`10`	`10`	`"github.com/synctv-org/synctv/internal/provider"`
`11`		`- "github.com/zijiren233/stream"`
`12`	`11`	`"golang.org/x/oauth2"`
`13`	`12`	`)`
`14`	`13`
`@@ -62,7 +61,7 @@ func (p BaiduProvider) GetUserInfo(ctx context.Context, tk oauth2.Token) (*pro`
`62`	`61`	`}`
`63`	`62`	`return &provider.UserInfo{`
`64`	`63`	`Username: ui.Uname,`
`65`		`- ProviderUserID: uint(crc32.ChecksumIEEE(stream.StringToBytes(ui.Openid))),`
	`64`	`+ ProviderUserID: crc64.Checksum([]byte(ui.Openid), crc64.MakeTable(crc64.ECMA)),`
`66`	`65`	`}, nil`
`67`	`66`	`}`
`68`	`67`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (p GiteeProvider) GetUserInfo(ctx context.Context, tk oauth2.Token) (*pro`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`type giteeUserInfo struct {`
`66`		- ID uint `json:"id"`
	`66`	+ ID uint64 `json:"id"`
`67`	`67`	Login string `json:"login"`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (p GithubProvider) GetUserInfo(ctx context.Context, tk oauth2.Token) (*pr`
`62`	`62`
`63`	`63`	`type githubUserInfo struct {`
`64`	`64`	Login string `json:"login"`
`65`		- ID uint `json:"id"`
	`65`	+ ID uint64 `json:"id"`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`func init() {`