Merge pull request #18 from RafaelClaumann/chapter-17-5-redirect-user…

…-approprietaly-after-login

Chapter 17.5 Redirect user appropriately after login

cmd/web/handlers.go

@@ -242,7 +242,15 @@ func (app *application) userLoginPost(w http.ResponseWriter, r *http.Request) {
 	// Add the ID of the current user to the session, so that they are now 'logged in'.
 	app.sessionManager.Put(r.Context(), "authenticatedUserID", id)
 
-	// Redirect the user to the create snippet page.
+	// Use the PopString method to retrieve and remove a value from the session
+	// data in one step.
+	// If no matching key exists this will return the empty string.
+	path := app.sessionManager.PopString(r.Context(), "redirectPathAfterLogin")
+	if path != "" {
+		http.Redirect(w, r, path, http.StatusSeeOther)
+		return
+	}
+
 	http.Redirect(w, r, "/snippet/create", http.StatusSeeOther)
 }
 

cmd/web/middleware.go

@@ -61,6 +61,8 @@ func (app *application) requireAuthentication(next http.Handler) http.Handler {
 		// return from the middleware chain so that no subsequent handlers in
 		// the chain are executed.
 		if !app.isAuthenticated(r) {
+			// add redirectPathAfterLogin to redirect unauthenticated users correctly after login
+			app.sessionManager.Put(r.Context(), "redirectPathAfterLogin", r.URL.Path)
 			http.Redirect(w, r, "/user/login", http.StatusSeeOther)
 			return
 		}