beenull/sftpgo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WebClient: fix test cases

Browse source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino 2023-12-12 19:04:32 +01:00
parent ff2eed8ee9
commit f721cf5c40
No known key found for this signature in database
GPG key ID: 935D2952DEC4EECF
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
internal/httpd/flash_test.go
View file

@ -16,6 +16,7 @@ package httpd
import (
"encoding/base64"
"encoding/json"
"fmt"
"net/http"
"net/http/httptest"
@ -23,18 +24,29 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/drakkan/sftpgo/v2/internal/util"
)
func TestFlashMessages(t *testing.T) {
rr := httptest.NewRecorder()
req, err := http.NewRequest(http.MethodGet, "/url", nil)
require.NoError(t, err)
message := "test message"
setFlashMessage(rr, req, flashMessage{ErrorString: message})
req.Header.Set("Cookie", fmt.Sprintf("%v=%v", flashCookieName, base64.URLEncoding.EncodeToString([]byte(message))))
message := flashMessage{
ErrorString: "error",
I18nMessage: util.I18nChangePwdTitle,
}
setFlashMessage(rr, req, message)
value, err := json.Marshal(message)
assert.NoError(t, err)
req.Header.Set("Cookie", fmt.Sprintf("%v=%v", flashCookieName, base64.URLEncoding.EncodeToString(value)))
msg := getFlashMessage(rr, req)
assert.Equal(t, message, msg.ErrorString)
assert.Equal(t, message, msg)
assert.Equal(t, util.I18nChangePwdTitle, msg.getI18nError().Message)
req.Header.Set("Cookie", fmt.Sprintf("%v=%v", flashCookieName, "a"))
msg = getFlashMessage(rr, req)
assert.Empty(t, msg)
req.Header.Set("Cookie", fmt.Sprintf("%v=%v", flashCookieName, "YQ=="))
msg = getFlashMessage(rr, req)
assert.Empty(t, msg)
}

2
internal/httpd/httpd_test.go
View file

@ -9806,7 +9806,7 @@ func TestWebUserTwoFactorLogin(t *testing.T) {
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
rr = executeRequest(req)
assert.Equal(t, http.StatusOK, rr.Code)
assert.Contains(t, rr.Body.String(), "Two factory authentication is not enabled")
assert.Contains(t, rr.Body.String(), util.I18n2FADisabled)
req, err = http.NewRequest(http.MethodPost, webClientTwoFactorPath, bytes.NewBuffer([]byte(form.Encode())))
assert.NoError(t, err)

4
templates/webclient/login.html
View file

@ -59,7 +59,9 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
<div data-i18n="general.or" class="text-center text-muted text-uppercase fw-bold mb-5">or</div>
{{- end}}
<a href="{{.OpenIDLoginURL}}" class="btn btn-flex flex-center btn-light btn-lg w-100 mb-5">
<img data-i18n="login.signin_openid" alt="Logo" src="{{.StaticURL}}/img/openid-logo.png" class="h-20px me-3" />Sign in with OpenID</a>
<img alt="Logo" src="{{.StaticURL}}/img/openid-logo.png" class="h-20px me-3" />
<span data-i18n="login.signin_openid">Sign in with OpenID</span>
</a>
{{- end}}
</div>
</form>