From 76721fee0066124021e19eb80d08912db160b28a Mon Sep 17 00:00:00 2001 From: Mike Landau Date: Mon, 2 Oct 2023 15:12:45 -0700 Subject: [PATCH] [auth] Bump auth pkg --- go.mod | 7 +++---- go.sum | 10 ++++++---- internal/boxcli/auth.go | 29 ++++------------------------- internal/boxcli/pull.go | 2 +- internal/boxcli/push.go | 2 +- 5 files changed, 15 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index c11e01f0aaf..6e008e8dff8 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,8 @@ require ( github.com/stretchr/testify v1.8.4 github.com/wk8/go-ordered-map/v2 v2.1.8 github.com/zealic/go2node v0.1.0 - go.jetpack.io/pkg v0.0.0-20230920232528-54278537129b + go.jetpack.io/pkg v0.0.0-20231002215645-9afeb0623fd3 + golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 golang.org/x/mod v0.12.0 golang.org/x/sync v0.3.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 @@ -111,13 +112,11 @@ require ( github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect go4.org v0.0.0-20200411211856-f5505b9728dd // indirect golang.org/x/crypto v0.13.0 // indirect - golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect - golang.org/x/net v0.15.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sys v0.12.0 // indirect golang.org/x/term v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.6.0 // indirect - google.golang.org/appengine v1.6.7 // indirect + google.golang.org/appengine v1.6.8 // indirect google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/go.sum b/go.sum index 02daf05a7a8..e095acb9d80 100644 --- a/go.sum +++ b/go.sum @@ -164,6 +164,7 @@ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= @@ -334,8 +335,8 @@ github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036/go.mod h1:gqRgreBU github.com/zaffka/mongodb-boltdb-mock v0.0.0-20221014194232-b4bb03fbe3a0/go.mod h1:GsDD1qsG+86MeeCG7ndi6Ei3iGthKL3wQ7PTFigDfNY= github.com/zealic/go2node v0.1.0 h1:ofxpve08cmLJBwFdI0lPCk9jfwGWOSD+s6216x0oAaA= github.com/zealic/go2node v0.1.0/go.mod h1:GrkFr+HctXwP7vzcU9RsgtAeJjTQ6Ud0IPCQAqpTfBg= -go.jetpack.io/pkg v0.0.0-20230920232528-54278537129b h1:8sbFeLQ7GtVP7CxvpmBoOh6w2ZTK4DyZuMkyiIGFdjs= -go.jetpack.io/pkg v0.0.0-20230920232528-54278537129b/go.mod h1:drBQ4v8Hxs501Y3KK3vbsNBhn/TEMEDHrdXK7cOb9yg= +go.jetpack.io/pkg v0.0.0-20231002215645-9afeb0623fd3 h1:aMydtVCHn7dfotOyV41VAxX5b5OOsCc4TxOXwDt38Yw= +go.jetpack.io/pkg v0.0.0-20231002215645-9afeb0623fd3/go.mod h1:iaf3e/aENp5luwYFlfCxj+GsiwqHagbvRAY3bIdEgGA= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -455,6 +456,7 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= @@ -503,8 +505,8 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= diff --git a/internal/boxcli/auth.go b/internal/boxcli/auth.go index 63ea14dd79a..cea46b375a1 100644 --- a/internal/boxcli/auth.go +++ b/internal/boxcli/auth.go @@ -4,6 +4,7 @@ package boxcli import ( + "context" "fmt" "github.com/spf13/cobra" @@ -26,7 +27,6 @@ func authCmd() *cobra.Command { cmd.AddCommand(loginCmd()) cmd.AddCommand(logoutCmd()) - cmd.AddCommand(refreshCmd()) cmd.AddCommand(whoAmICmd()) return cmd @@ -75,34 +75,13 @@ func logoutCmd() *cobra.Command { return cmd } -// This is for debugging purposes only. Hidden. -func refreshCmd() *cobra.Command { - cmd := &cobra.Command{ - Use: "refresh", - Short: "Refresh credentials", - Args: cobra.ExactArgs(0), - Hidden: true, - RunE: func(cmd *cobra.Command, args []string) error { - c, err := auth.NewClient(issuer, clientID) - if err != nil { - return err - } - _ = c.RefreshSession() - fmt.Fprintln(cmd.OutOrStdout(), "Refreshed successfully") - return nil - }, - } - - return cmd -} - func whoAmICmd() *cobra.Command { cmd := &cobra.Command{ Use: "whoami", Short: "Show the current user", Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { - tok, err := genSession() + tok, err := genSession(cmd.Context()) if err != nil { return err } else if tok == nil { @@ -132,10 +111,10 @@ func whoAmICmd() *cobra.Command { return cmd } -func genSession() (*session.Token, error) { +func genSession(ctx context.Context) (*session.Token, error) { c, err := auth.NewClient(issuer, clientID) if err != nil { return nil, err } - return c.GetSession(), nil + return c.GetSession(ctx) } diff --git a/internal/boxcli/pull.go b/internal/boxcli/pull.go index cbcde521ecd..82ad962b021 100644 --- a/internal/boxcli/pull.go +++ b/internal/boxcli/pull.go @@ -62,7 +62,7 @@ func pullCmdFunc(cmd *cobra.Command, url string, flags *pullCmdFlags) error { } var creds devopt.Credentials - t, err := genSession() + t, err := genSession(cmd.Context()) if err != nil { return errors.WithStack(err) } else if t != nil { diff --git a/internal/boxcli/push.go b/internal/boxcli/push.go index e1fc1269473..b2aa7da3f36 100644 --- a/internal/boxcli/push.go +++ b/internal/boxcli/push.go @@ -41,7 +41,7 @@ func pushCmdFunc(cmd *cobra.Command, url string, flags pushCmdFlags) error { if err != nil { return errors.WithStack(err) } - t, err := genSession() + t, err := genSession(cmd.Context()) var creds devopt.Credentials if err != nil { return errors.WithStack(err)