redirect to desired page after authenticating

This commit is contained in:
2026-01-06 02:33:48 -07:00
parent 34061d21c1
commit e20623a6d3
7 changed files with 80 additions and 34 deletions
+15 -5
View File
@@ -1,6 +1,7 @@
package site
import (
"context"
"fmt"
"net/http"
"ruben/inventory2/internal/site/response"
@@ -11,14 +12,23 @@ import (
func (s *Server) loginPage(r *http.Request) (response.Response, error) {
ctx := r.Context()
state, err := s.auth.NewState(ctx)
u, err := s.newLoginURL(ctx, "/")
if err != nil {
return nil, response.Errorf("failed to generate random state: %w", err)
return nil, err
}
return response.TemporaryRedirect(u), nil
}
func (s *Server) newLoginURL(ctx context.Context, targetURI string) (string, error) {
state, err := s.auth.NewState(ctx, targetURI)
if err != nil {
return "", fmt.Errorf("failed to generate random state: %w", err)
}
base64EncodedState := fmt.Sprintf("%x", state[:])
return response.TemporaryRedirect(s.auth.AuthCodeURL(base64EncodedState)), nil
return s.auth.AuthCodeURL(base64EncodedState), nil
}
// POST /login
@@ -44,7 +54,7 @@ func (s *Server) loginCallback(r *http.Request) (response.Response, error) {
// obtain token and profile
accessToken, expiration, err := s.auth.Exchange(ctx, q.Get("state"), q.Get("code"))
accessToken, targetURI, expiration, err := s.auth.Exchange(ctx, q.Get("state"), q.Get("code"))
if err != nil {
return nil, response.Unauthorized().
Msg(fmt.Sprintf("Failed to exchange an authorization code for a token")).
@@ -53,7 +63,7 @@ func (s *Server) loginCallback(r *http.Request) (response.Response, error) {
// set access_token cookie and redirect to a reasonable place
return response.TemporaryRedirect("/").
return response.TemporaryRedirect(targetURI).
Cookie(newAccessTokenCookie(accessToken, expiration)), nil
}