Merge branch 'master' into tomas/release-websocket-client-fixes

stripe · Sep 17, 2024 · 581a9f9 · 581a9f9
2 parents 9003e3e + 6c259f0
commit 581a9f9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/pkg/cmd/listen.go b/pkg/cmd/listen.go
@@ -52,6 +52,7 @@ type listenCmd struct {
 	apiBaseURL            string
 	noWSS                 bool
 	timeout               int64
+	deviceToken           string
 }
 
 func newListenCmd() *listenCmd {
@@ -158,12 +159,13 @@ func (lc *listenCmd) runListenCmd(cmd *cobra.Command, args []string) error {
 	}
 
 	logger := log.StandardLogger()
-	proxyVisitor := createVisitor(logger, lc.format, lc.printJSON)
+	proxyVisitor := lc.createVisitor(logger, lc.format, lc.printJSON)
 	proxyOutCh := make(chan websocket.IElement)
 
 	p, err := proxy.Init(ctx, &proxy.Config{
 		Client:                client,
 		DeviceName:            deviceName,
+		DeviceToken:           &lc.deviceToken,
 		ForwardURL:            lc.forwardURL,
 		ForwardThinURL:        lc.forwardThinURL,
 		ForwardHeaders:        lc.forwardHeaders,
@@ -213,7 +215,7 @@ func withSIGTERMCancel(ctx context.Context, onCancel func()) context.Context {
 	return ctx
 }
 
-func createVisitor(logger *log.Logger, format string, printJSON bool) *websocket.Visitor {
+func (lc *listenCmd) createVisitor(logger *log.Logger, format string, printJSON bool) *websocket.Visitor {
 	var s *spinner.Spinner
 
 	return &websocket.Visitor{
@@ -273,8 +275,8 @@ func createVisitor(logger *log.Logger, format string, printJSON bool) *websocket
 				color := ansi.Color(os.Stdout)
 				outputStr := fmt.Sprintf("%s   --> %s [%s]",
 					color.Faint(localTime),
-					ansi.Linkify(ansi.Bold(data.Type), data.URLForEventType(), logger.Out),
-					ansi.Linkify(data.ID, data.URLForEventID(), logger.Out),
+					ansi.Bold(data.Type),
+					ansi.Linkify(data.ID, data.URLForEventID(lc.deviceToken), logger.Out),
 				)
 				fmt.Println(outputStr)
 				return nil
@@ -307,8 +309,7 @@ func createVisitor(logger *log.Logger, format string, printJSON bool) *websocket
 				if event != nil {
 					link = ansi.Linkify(event.ID, event.URLForEventID(), logger.Out)
 				} else if v2Event != nil {
-					// todo(@charliecruzan): Add link support once inspector supports v2 events
-					link = v2Event.ID
+					link = ansi.Linkify(v2Event.ID, v2Event.URLForEventID(lc.deviceToken), logger.Out)
 				}
 				localTime := time.Now().Format(timeLayout)
 

diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go
@@ -67,7 +67,8 @@ func (f FailedToReadResponseError) Error() string {
 // Config provides the configuration of a Proxy
 type Config struct {
 	// DeviceName is the name of the device sent to Stripe to help identify the device
-	DeviceName string
+	DeviceName  string
+	DeviceToken *string
 
 	// Client is a configured stripe client used to execute authenticated calls to the Stripe API.
 	Client stripe.RequestPerformer
@@ -156,7 +157,7 @@ func (p *Proxy) Run(ctx context.Context) error {
 
 	for nAttempts < maxConnectAttempts {
 		session, err := p.createSession(ctx)
-
+		*p.cfg.DeviceToken = session.DeviceToken
 		if err != nil {
 			p.cfg.OutCh <- websocket.ErrorElement{
 				Error: fmt.Errorf("Error while authenticating with Stripe: %v", err),

diff --git a/pkg/proxy/v2_stripe_event.go b/pkg/proxy/v2_stripe_event.go
@@ -23,11 +23,6 @@ type primaryRelatedObject struct {
 }
 
 // URLForEventID builds a full URL from a V2StripeEvent ID.
-func (e *V2EventPayload) URLForEventID() string {
-	return fmt.Sprintf("https://dashboard.stripe.com/events/%s", e.ID)
-}
-
-// URLForEventType builds a full URL from a V2StripeEvent Type.
-func (e *V2EventPayload) URLForEventType() string {
-	return fmt.Sprintf("https://dashboard.stripe.com/events?type=%s", e.Type)
+func (e *V2EventPayload) URLForEventID(cliEndpointID string) string {
+	return fmt.Sprintf("https://dashboard.stripe.com/workbench/webhooks/%s?event=%s", cliEndpointID, e.ID)
 }
diff --git a/pkg/stripeauth/messages.go b/pkg/stripeauth/messages.go
@@ -11,4 +11,5 @@ type StripeCLISession struct {
 	WebSocketURL                string `json:"websocket_url"`
 	DefaultVersion              string `json:"default_version"`
 	LatestVersion               string `json:"latest_version"`
+	DeviceToken                 string `json:"device_token"`
 }