doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(client): remove token from client args

Browse source
This commit is contained in:
hexxa 2022-08-10 13:12:32 +08:00 • committed by Hexxa
parent 6cc99312bf
commit 0cce1bd090
10 changed files with 294 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/server/server_settings_test.go
View file

@ -73,7 +73,7 @@ func TestSettingsHandlers(t *testing.T) {
users := addUsers(t, addr, userPwd, 1, adminToken)
t.Run("get/set client config", func(t *testing.T) {
settingsCl := client.NewSettingsClient(addr)
adminSettingsCli := client.NewSettingsClient(addr, adminToken)
cfgs := []*db.ClientConfig{
&db.ClientConfig{
SiteName: "quickshare",
@ -93,14 +93,14 @@ func TestSettingsHandlers(t *testing.T) {
ClientCfg: cfg,
CaptchaEnabled: false,
}
resp, _, errs := settingsCl.SetClientCfg(clientCfgMsg, adminToken)
resp, _, errs := adminSettingsCli.SetClientCfg(clientCfgMsg)
if len(errs) > 0 {
t.Fatal(errs)
} else if resp.StatusCode != 200 {
t.Fatal(resp.StatusCode)
}
resp, clientCfgMsgGot, errs := settingsCl.GetClientCfg(adminToken)
resp, clientCfgMsgGot, errs := adminSettingsCli.GetClientCfg()
if len(errs) > 0 {
t.Fatal(errs)
} else if resp.StatusCode != 200 {
@ -120,7 +120,8 @@ func TestSettingsHandlers(t *testing.T) {
}
userToken := client.GetCookie(resp.Cookies(), q.TokenCookie)
resp, clientCfgMsgGot, errs := settingsCl.GetClientCfg(userToken)
userSettingsCli := client.NewSettingsClient(addr, userToken)
resp, clientCfgMsgGot, errs := userSettingsCli.GetClientCfg()
if len(errs) > 0 {
t.Fatal(errs)
} else if resp.StatusCode != 200 {
@ -135,7 +136,7 @@ func TestSettingsHandlers(t *testing.T) {
})
t.Run("ReportErrors", func(t *testing.T) {
settingsCl := client.NewSettingsClient(addr)
adminSettingsCli := client.NewSettingsClient(addr, adminToken)
reports := &settings.ClientErrorReports{
Reports: []*settings.ClientErrorReport{
&settings.ClientErrorReport{
@ -149,7 +150,7 @@ func TestSettingsHandlers(t *testing.T) {
},
}
reportResp, _, errs := settingsCl.ReportErrors(reports, adminToken)
reportResp, _, errs := adminSettingsCli.ReportErrors(reports)
if len(errs) > 0 {
t.Fatal(errs)
} else if reportResp.StatusCode != 200 {
@ -178,9 +179,9 @@ func TestSettingsHandlers(t *testing.T) {
})
t.Run("WorkerQueueLen", func(t *testing.T) {
settingsCl := client.NewSettingsClient(addr)
adminSettingsCli := client.NewSettingsClient(addr, adminToken)
reportResp, _, errs := settingsCl.WorkerQueueLen(adminToken)
reportResp, _, errs := adminSettingsCli.WorkerQueueLen()
if len(errs) > 0 {
t.Fatal(errs)
} else if reportResp.StatusCode != 200 {