Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/sandbox/auth/internal/authflow/authflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ func (f *AuthFlow) Exchange(code string) (*session.Token, error) {
return nil, err
}

// TODO: Add verification
// err = f.verify(tok)
// if err != nil {
// return nil, err
Expand Down
15 changes: 0 additions & 15 deletions pkg/sandbox/auth/internal/callbackserver/callbackserver.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package callbackserver

import (
"fmt"
"net"
"net/http"
)
Expand Down Expand Up @@ -67,44 +66,30 @@ func (s *CallbackServer) Start() error {
}

http.HandleFunc(s.path, func(w http.ResponseWriter, r *http.Request) {
fmt.Println("callback received")
defer func() {
fmt.Println("callback handler exiting")
// _ = s.Stop()
}()

q := r.URL.Query()
resp := Response{
Error: q.Get("error"),
Code: q.Get("code"),
State: q.Get("state"),
}
fmt.Println("sending response")
s.respCh <- resp

// TODO: define success and error redirects
fmt.Println("redirecting")
http.Redirect(w, r, "https://www.jetpack.io", http.StatusSeeOther)
})

fmt.Println("starting server")
if err := s.server.Serve(s.listener); err != nil && err != http.ErrServerClosed {
fmt.Println("error starting server")
return err
}
fmt.Println("server stopped")
return nil
}

func (s *CallbackServer) WaitForResponse() Response {
fmt.Println("waiting for response")
resp := <-s.respCh
fmt.Println("got response")
_ = s.Stop()
return resp
}

func (s *CallbackServer) Stop() error {
fmt.Println("stopping server")
return s.server.Close()
}