Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions drivers/thunder/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ func (x *Thunder) Init(ctx context.Context) (err error) {
// 清空 信任密钥
x.Addition.CreditKey = ""
}
if token == nil {
return err
}
x.SetTokenResp(token)
return err
},
Expand Down Expand Up @@ -521,6 +524,9 @@ func (xc *XunLeiCommon) SetCoreTokenResp(tr *CoreLoginResp) {

// 携带Authorization和CaptchaToken的请求
func (xc *XunLeiCommon) Request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
if xc.TokenResp == nil {
return nil, errs.EmptyToken
}
data, err := xc.Common.Request(url, method, func(req *resty.Request) {
req.SetHeaders(map[string]string{
"Authorization": xc.Token(),
Expand Down
18 changes: 18 additions & 0 deletions drivers/thunder/driver_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package thunder

import (
"errors"
"net/http"
"testing"

"github.com/OpenListTeam/OpenList/v4/internal/errs"
)

func TestRequestReturnsErrorWhenTokenIsMissing(t *testing.T) {
xc := &XunLeiCommon{}

_, err := xc.Request(API_URL+"/about", http.MethodGet, nil, nil)
if !errors.Is(err, errs.EmptyToken) {
t.Fatalf("expected EmptyToken, got %v", err)
}
}
7 changes: 7 additions & 0 deletions drivers/thunder_browser/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/OpenListTeam/OpenList/v4/drivers/base"
"github.com/OpenListTeam/OpenList/v4/internal/driver"
"github.com/OpenListTeam/OpenList/v4/internal/errs"
"github.com/OpenListTeam/OpenList/v4/internal/model"
"github.com/OpenListTeam/OpenList/v4/internal/op"
streamPkg "github.com/OpenListTeam/OpenList/v4/internal/stream"
Expand Down Expand Up @@ -87,6 +88,9 @@ func (x *ThunderBrowser) Init(ctx context.Context) (err error) {
// 清空 信任密钥
x.Addition.CreditKey = ""
}
if token == nil {
return err
}
x.SetTokenResp(token)
return err
},
Expand Down Expand Up @@ -639,6 +643,9 @@ func (xc *XunLeiBrowserCommon) SetSpaceTokenResp(spaceToken string) {

// Request 携带Authorization和CaptchaToken的请求
func (xc *XunLeiBrowserCommon) Request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
if xc.TokenResp == nil {
return nil, errs.EmptyToken
}
data, err := xc.Common.Request(url, method, func(req *resty.Request) {
req.SetHeaders(map[string]string{
"Authorization": xc.GetToken(),
Expand Down
18 changes: 18 additions & 0 deletions drivers/thunder_browser/driver_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package thunder_browser

import (
"errors"
"net/http"
"testing"

"github.com/OpenListTeam/OpenList/v4/internal/errs"
)

func TestRequestReturnsErrorWhenTokenIsMissing(t *testing.T) {
xc := &XunLeiBrowserCommon{}

_, err := xc.Request(API_URL+"/about", http.MethodGet, nil, nil)
if !errors.Is(err, errs.EmptyToken) {
t.Fatalf("expected EmptyToken, got %v", err)
}
}
8 changes: 7 additions & 1 deletion drivers/thunderx/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,16 @@ func (x *ThunderX) Init(ctx context.Context) (err error) {
token, err = x.Login(x.Username, x.Password)
if err != nil {
x.GetStorage().SetStatus(fmt.Sprintf("%+v", err.Error()))
if token.UserID != "" {
if token != nil && token.UserID != "" {
x.SetUserID(token.UserID)
x.UserAgent = BuildCustomUserAgent(utils.GetMD5EncodeStr(x.Username+x.Password), ClientID, PackageName, SdkVersion, ClientVersion, PackageName, token.UserID)
}
op.MustSaveDriverStorage(x)
}
}
if token == nil {
return err
}
x.SetTokenResp(token)
return err
},
Expand Down Expand Up @@ -496,6 +499,9 @@ func (xc *XunLeiXCommon) SetTokenResp(tr *TokenResp) {

// Request 携带Authorization和CaptchaToken的请求
func (xc *XunLeiXCommon) Request(url string, method string, callback base.ReqCallback, resp interface{}) ([]byte, error) {
if xc.TokenResp == nil {
return nil, errs.EmptyToken
}
data, err := xc.Common.Request(url, method, func(req *resty.Request) {
req.SetHeaders(map[string]string{
"Authorization": xc.Token(),
Expand Down
18 changes: 18 additions & 0 deletions drivers/thunderx/driver_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package thunderx

import (
"errors"
"net/http"
"testing"

"github.com/OpenListTeam/OpenList/v4/internal/errs"
)

func TestRequestReturnsErrorWhenTokenIsMissing(t *testing.T) {
xc := &XunLeiXCommon{}

_, err := xc.Request(API_URL+"/about", http.MethodGet, nil, nil)
if !errors.Is(err, errs.EmptyToken) {
t.Fatalf("expected EmptyToken, got %v", err)
}
}
Loading