github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2026-04-15 01:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Persist intended URL through the OAuth flow

Browse Source
This commit is contained in:
Laszlo Fogas
2019-06-27 08:25:00 +02:00
parent 69269f0fc3
commit ace264fe2f
4 changed files with 432 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
remote/github/github.go
+12 -3
View File
@@ -105,7 +105,7 @@ type client struct {
// Login authenticates the session and returns the remote user details.
func (c *client) Login(res http.ResponseWriter, req *http.Request) (*model.User, error) {
config := c.newConfig(httputil.GetURL(req))
config := c.newConfig(req)
// get the OAuth errors
if err := req.FormValue("error"); err != "" {
@@ -348,7 +348,16 @@ func (c *client) newContext() context.Context {
}
// helper function to return the GitHub oauth2 config
func (c *client) newConfig(redirect string) *oauth2.Config {
func (c *client) newConfig(req *http.Request) *oauth2.Config {
var redirect string
intendedURL := req.URL.Query()["url"]
if len(intendedURL) > 0 {
redirect = fmt.Sprintf("%s/authorize?url=%s", httputil.GetURL(req), intendedURL[0])
} else {
redirect = fmt.Sprintf("%s/authorize", httputil.GetURL(req))
}
return &oauth2.Config{
ClientID: c.Client,
ClientSecret: c.Secret,
@@ -357,7 +366,7 @@ func (c *client) newConfig(redirect string) *oauth2.Config {
AuthURL: fmt.Sprintf("%s/login/oauth/authorize", c.URL),
TokenURL: fmt.Sprintf("%s/login/oauth/access_token", c.URL),
},
RedirectURL: fmt.Sprintf("%s/authorize", redirect),
RedirectURL: redirect,
}
}