Skip to content

Commit f01fa59

Browse files
authored
[easy][auth] Update auth package (#1618)
## Summary Use newest version of auth which fetches access token. ## How was it tested? ``` devbox auth login devbox auth whoami ```
1 parent a0bdff9 commit f01fa59

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a
4040
github.com/wk8/go-ordered-map/v2 v2.1.8
4141
github.com/zealic/go2node v0.1.0
42-
go.jetpack.io/pkg v0.0.0-20231019173032-13f60a9e32b8
42+
go.jetpack.io/pkg v0.0.0-20231110160104-d72c97e89959
4343
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17
4444
golang.org/x/mod v0.12.0
4545
golang.org/x/sync v0.3.0
@@ -80,6 +80,7 @@ require (
8080
github.com/davecgh/go-spew v1.1.1 // indirect
8181
github.com/dsnet/compress v0.0.1 // indirect
8282
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
83+
github.com/gofrs/uuid/v5 v5.0.0 // indirect
8384
github.com/golang/protobuf v1.5.3 // indirect
8485
github.com/golang/snappy v0.0.4 // indirect
8586
github.com/google/btree v1.1.2 // indirect
@@ -112,6 +113,7 @@ require (
112113
github.com/therootcompany/xz v1.0.1 // indirect
113114
github.com/ulikunitz/xz v0.5.11 // indirect
114115
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
116+
go.jetpack.io/typeid v0.1.0 // indirect
115117
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
116118
golang.org/x/crypto v0.13.0 // indirect
117119
golang.org/x/oauth2 v0.12.0 // indirect

go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxF
151151
github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
152152
github.com/go-redis/redis v6.15.5+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
153153
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
154+
github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
155+
github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
154156
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
155157
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
156158
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -339,8 +341,10 @@ github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036/go.mod h1:gqRgreBU
339341
github.com/zaffka/mongodb-boltdb-mock v0.0.0-20221014194232-b4bb03fbe3a0/go.mod h1:GsDD1qsG+86MeeCG7ndi6Ei3iGthKL3wQ7PTFigDfNY=
340342
github.com/zealic/go2node v0.1.0 h1:ofxpve08cmLJBwFdI0lPCk9jfwGWOSD+s6216x0oAaA=
341343
github.com/zealic/go2node v0.1.0/go.mod h1:GrkFr+HctXwP7vzcU9RsgtAeJjTQ6Ud0IPCQAqpTfBg=
342-
go.jetpack.io/pkg v0.0.0-20231019173032-13f60a9e32b8 h1:xzAAUVfg9uqyJhZVc+ZDTLHtFlMhj/5St5JnVfDxbpk=
343-
go.jetpack.io/pkg v0.0.0-20231019173032-13f60a9e32b8/go.mod h1:m49CAcLbpZttEbzoEWC1SKD+/z5mEiFdw0dQxY6AM5Q=
344+
go.jetpack.io/pkg v0.0.0-20231110160104-d72c97e89959 h1:dMCXvqu0ecLm3cutTTTt3oeI+rgqX33d65yFEqnwqOw=
345+
go.jetpack.io/pkg v0.0.0-20231110160104-d72c97e89959/go.mod h1:kNS2CEFrjrOlkBRDygQddqnzrml66T0L3Hh82HeLSjw=
346+
go.jetpack.io/typeid v0.1.0 h1:suTmjNR3y2em2gCTG06agFfcACm3+zuxfziMUk5UXnw=
347+
go.jetpack.io/typeid v0.1.0/go.mod h1:E11ObFkKlvsSTxwwYIm+zpbsRthjIMDy/JGBogs2vSo=
344348
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
345349
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
346350
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

internal/boxcli/auth.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/spf13/cobra"
1111
"go.jetpack.io/devbox/internal/boxcli/usererr"
1212
"go.jetpack.io/devbox/internal/envir"
13-
"go.jetpack.io/pkg/sandbox/auth"
1413
"go.jetpack.io/pkg/sandbox/auth/session"
14+
"go.jetpack.io/pkg/sandbox/jetauth"
1515
)
1616

1717
var (
@@ -38,11 +38,11 @@ func loginCmd() *cobra.Command {
3838
Short: "Login to devbox",
3939
Args: cobra.ExactArgs(0),
4040
RunE: func(cmd *cobra.Command, args []string) error {
41-
c, err := auth.NewClient(issuer, clientID)
41+
c, err := jetauth.NewClient(issuer, clientID)
4242
if err != nil {
4343
return err
4444
}
45-
t, err := c.LoginFlow()
45+
t, err := c.LoginFlow(cmd.Context())
4646
if err != nil {
4747
return err
4848
}
@@ -60,7 +60,7 @@ func logoutCmd() *cobra.Command {
6060
Short: "logout from devbox",
6161
Args: cobra.ExactArgs(0),
6262
RunE: func(cmd *cobra.Command, args []string) error {
63-
c, err := auth.NewClient(issuer, clientID)
63+
c, err := jetauth.NewClient(issuer, clientID)
6464
if err != nil {
6565
return err
6666
}
@@ -112,7 +112,7 @@ func whoAmICmd() *cobra.Command {
112112
}
113113

114114
func genSession(ctx context.Context) (*session.Token, error) {
115-
c, err := auth.NewClient(issuer, clientID)
115+
c, err := jetauth.NewClient(issuer, clientID)
116116
if err != nil {
117117
return nil, err
118118
}

0 commit comments

Comments
 (0)