thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Add json tags for oauth2 form (#6627) (#6641)

Browse source 
(cherry picked from commit 62d3f49c28)
Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
Jonas Franz 2019-04-15 22:36:14 +02:00 committed by GitHub
parent e8ca2da08f
commit c363ef5da0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
integrations/oauth_test.go
View file

@ -75,7 +75,30 @@ func TestAccessTokenExchange(t *testing.T) {
func TestAccessTokenExchangeWithoutPKCE(t *testing.T) { func TestAccessTokenExchangeWithoutPKCE(t *testing.T) {
prepareTestEnv(t) prepareTestEnv(t)
req := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ req := NewRequestWithJSON(t, "POST", "/login/oauth/access_token", map[string]string{
"grant_type": "authorization_code",
"client_id": "da7da3ba-9a13-4167-856f-3899de0b0138",
"client_secret": "4MK8Na6R55smdCY0WuCCumZ6hjRPnGY5saWVRHHjJiA=",
"redirect_uri": "a",
"code": "authcode",
"code_verifier": "N1Zo9-8Rfwhkt68r1r29ty8YwIraXR8eh_1Qwxg7yQXsonBt", // test PKCE additionally
})
resp := MakeRequest(t, req, 200)
type response struct {
AccessToken string `json:"access_token"`
TokenType string `json:"token_type"`
ExpiresIn int64 `json:"expires_in"`
RefreshToken string `json:"refresh_token"`
}
parsed := new(response)
assert.NoError(t, json.Unmarshal(resp.Body.Bytes(), parsed))
assert.True(t, len(parsed.AccessToken) > 10)
assert.True(t, len(parsed.RefreshToken) > 10)
}
func TestAccessTokenExchangeJSON(t *testing.T) {
prepareTestEnv(t)
req := NewRequestWithJSON(t, "POST", "/login/oauth/access_token", map[string]string{
"grant_type": "authorization_code", "grant_type": "authorization_code",
"client_id": "da7da3ba-9a13-4167-856f-3899de0b0138", "client_id": "da7da3ba-9a13-4167-856f-3899de0b0138",
"client_secret": "4MK8Na6R55smdCY0WuCCumZ6hjRPnGY5saWVRHHjJiA=", "client_secret": "4MK8Na6R55smdCY0WuCCumZ6hjRPnGY5saWVRHHjJiA=",

14
modules/auth/user_form.go
View file

@ -168,15 +168,15 @@ func (f *GrantApplicationForm) Validate(ctx *macaron.Context, errs binding.Error
// AccessTokenForm for issuing access tokens from authorization codes or refresh tokens // AccessTokenForm for issuing access tokens from authorization codes or refresh tokens
type AccessTokenForm struct { type AccessTokenForm struct {
GrantType string GrantType string `json:"grant_type"`
ClientID string ClientID string `json:"client_id"`
ClientSecret string ClientSecret string `json:"client_secret"`
RedirectURI string RedirectURI string `json:"redirect_uri"`
Code string Code string `json:"code"`
RefreshToken string RefreshToken string `json:"refresh_token"`
// PKCE support // PKCE support
CodeVerifier string CodeVerifier string `json:"code_verifier"`
} }
// Validate valideates the fields // Validate valideates the fields