diff --git a/.generator/templates/client.mustache b/.generator/templates/client.mustache index b345b3ad9..a23402c09 100644 --- a/.generator/templates/client.mustache +++ b/.generator/templates/client.mustache @@ -27,13 +27,13 @@ import ( "unicode/utf8" "github.com/cenkalti/backoff/v4" + "github.com/go-jose/go-jose/v3" + "github.com/go-jose/go-jose/v3/jwt" "golang.org/x/oauth2" {{#withAWSV4Signature}} awsv4 "github.com/aws/aws-sdk-go/aws/signer/v4" awscredentials "github.com/aws/aws-sdk-go/aws/credentials" {{/withAWSV4Signature}} - "gopkg.in/square/go-jose.v2" - "gopkg.in/square/go-jose.v2/jwt" goCache "github.com/patrickmn/go-cache" ) @@ -670,7 +670,7 @@ func (c *APIClient) prepareRequest( {{/withAWSV4Signature}} } - // This will override the auth in context + // This will override the auth in context var auth Authorization switch c.cfg.Okta.Client.AuthorizationMode { case "SSWS": @@ -1083,4 +1083,4 @@ type RequestAccessToken struct { ExpiresIn int `json:"expires_in,omitempty"` AccessToken string `json:"access_token,omitempty"` Scope string `json:"scope,omitempty"` -} \ No newline at end of file +} diff --git a/.generator/templates/configuration.mustache b/.generator/templates/configuration.mustache index 5b9c656e1..ca0508102 100644 --- a/.generator/templates/configuration.mustache +++ b/.generator/templates/configuration.mustache @@ -16,8 +16,8 @@ import ( "strings" "syscall" + "github.com/go-jose/go-jose/v3" "github.com/kelseyhightower/envconfig" - "gopkg.in/square/go-jose.v2" "gopkg.in/yaml.v3" ) diff --git a/.generator/templates/go.mod.mustache b/.generator/templates/go.mod.mustache index 29fc6ea70..dc91c428a 100644 --- a/.generator/templates/go.mod.mustache +++ b/.generator/templates/go.mod.mustache @@ -7,6 +7,7 @@ require ( github.com/aws/aws-sdk-go v1.34.14 {{/withAWSV4Signature}} github.com/cenkalti/backoff/v4 v4.1.3 + github.com/go-jose/go-jose/v3 v3.0.0 github.com/davecgh/go-spew v1.1.1 // indirect github.com/jarcoal/httpmock v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 @@ -14,5 +15,4 @@ require ( github.com/stretchr/testify v1.4.0 golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558 gopkg.in/yaml.v3 v3.0.1 - gopkg.in/square/go-jose.v2 v2.6.0 -) \ No newline at end of file +) diff --git a/.generator/templates/go.sum b/.generator/templates/go.sum index e209af77f..9458c94fb 100644 --- a/.generator/templates/go.sum +++ b/.generator/templates/go.sum @@ -51,6 +51,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo= +github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -367,8 +369,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= -gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/go.mod b/go.mod index 145bb8122..4b78cc716 100644 --- a/go.mod +++ b/go.mod @@ -5,11 +5,11 @@ go 1.19 require ( github.com/BurntSushi/toml v1.1.0 github.com/cenkalti/backoff/v4 v4.1.3 + github.com/go-jose/go-jose/v3 v3.0.0 github.com/jarcoal/httpmock v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627 github.com/stretchr/testify v1.7.1 - gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 9c03cde00..af6ffd0eb 100644 --- a/go.sum +++ b/go.sum @@ -5,6 +5,9 @@ github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo= +github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jarcoal/httpmock v1.2.0 h1:gSvTxxFR/MEMfsGrvRbdfpRUMBStovlSRLw0Ep1bwwc= @@ -17,14 +20,20 @@ github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod h1:3Qf8k github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= -gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/okta/config.go b/okta/config.go index 726f0b861..748c37787 100644 --- a/okta/config.go +++ b/okta/config.go @@ -26,8 +26,8 @@ import ( "syscall" "time" + "github.com/go-jose/go-jose/v3" "github.com/okta/okta-sdk-golang/v2/okta/cache" - "gopkg.in/square/go-jose.v2" ) type config struct { diff --git a/okta/requestExecutor.go b/okta/requestExecutor.go index dbcfab793..23a224f23 100644 --- a/okta/requestExecutor.go +++ b/okta/requestExecutor.go @@ -35,10 +35,10 @@ import ( "github.com/BurntSushi/toml" "github.com/cenkalti/backoff/v4" + "github.com/go-jose/go-jose/v3" + "github.com/go-jose/go-jose/v3/jwt" "github.com/okta/okta-sdk-golang/v2/okta/cache" goCache "github.com/patrickmn/go-cache" - "gopkg.in/square/go-jose.v2" - "gopkg.in/square/go-jose.v2/jwt" ) const AccessTokenCacheKey = "OKTA_ACCESS_TOKEN"