peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Remember NextURI when logging in

Browse Source
This commit is contained in:
Peter Stuifzand 2018-07-25 14:27:23 +02:00
parent 1cea51d5d5
commit d9bdf78fd2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/eksterd/http.go
View File

@ -31,6 +31,7 @@ type session struct {
RedirectURI string `redis:"redirect_uri"` RedirectURI string `redis:"redirect_uri"`
State string `redis:"state"` State string `redis:"state"`
LoggedIn bool `redis:"logged_in"` LoggedIn bool `redis:"logged_in"`
NextURI string `redis:"next_uri"`
} }
type authResponse struct { type authResponse struct {
@ -291,7 +292,11 @@ func (h *mainHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
sess.Me = authResponse.Me sess.Me = authResponse.Me
sess.LoggedIn = true sess.LoggedIn = true
saveSession(sessionVar, &sess, conn) saveSession(sessionVar, &sess, conn)
if sess.NextURI != "" {
http.Redirect(w, r, sess.NextURI, 302)
} else {
http.Redirect(w, r, "/", 302) http.Redirect(w, r, "/", 302)
}
return return
} }
return return
@ -399,10 +404,13 @@ func (h *mainHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/", 302) http.Redirect(w, r, "/", 302)
return return
} }
sess.NextURI = r.URL.String()
saveSession(sessionVar, &sess, conn)
query := r.URL.Query() query := r.URL.Query()
//responseType := query.Get("response_type") // responseType := query.Get("response_type") // TODO: check response_type
me := query.Get("me") me := query.Get("me")
clientID := query.Get("client_id") clientID := query.Get("client_id")
redirectURI := query.Get("redirect_uri") redirectURI := query.Get("redirect_uri")