1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From: Mathias Gibbens <gibmat@debian.org>
Description: Updates for building with zitadel/oidc/v3, taken from https://github.com/lxc/incus/pull/674
Forwarded: no (this patch is licensed as Apache-2.0 and I haven't signed Canonical's CLA)
diff --git a/client/connection.go b/client/connection.go
index c2f6d7387..a2d2301d6 100644
--- a/client/connection.go
+++ b/client/connection.go
@@ -13,7 +13,7 @@ import (
"github.com/go-macaroon-bakery/macaroon-bakery/v3/httpbakery"
"github.com/gorilla/websocket"
- "github.com/zitadel/oidc/v2/pkg/oidc"
+ "github.com/zitadel/oidc/v3/pkg/oidc"
"github.com/canonical/lxd/shared"
"github.com/canonical/lxd/shared/logger"
diff --git a/client/lxd_oidc.go b/client/lxd_oidc.go
index 089a85cbb..24f8f2f76 100644
--- a/client/lxd_oidc.go
+++ b/client/lxd_oidc.go
@@ -14,9 +14,9 @@ import (
"time"
"github.com/go-macaroon-bakery/macaroon-bakery/v3/httpbakery"
- "github.com/zitadel/oidc/v2/pkg/client/rp"
- httphelper "github.com/zitadel/oidc/v2/pkg/http"
- "github.com/zitadel/oidc/v2/pkg/oidc"
+ "github.com/zitadel/oidc/v3/pkg/client/rp"
+ httphelper "github.com/zitadel/oidc/v3/pkg/http"
+ "github.com/zitadel/oidc/v3/pkg/oidc"
"golang.org/x/oauth2"
)
@@ -158,7 +158,7 @@ func (o *oidcClient) getProvider(issuer string, clientID string) (rp.RelyingPart
rp.WithHTTPClient(o.httpClient),
}
- provider, err := rp.NewRelyingPartyOIDC(issuer, clientID, "", "", oidcScopes, options...)
+ provider, err := rp.NewRelyingPartyOIDC(context.TODO(), issuer, clientID, "", "", oidcScopes, options...)
if err != nil {
return nil, err
}
@@ -178,7 +178,7 @@ func (o *oidcClient) refresh(issuer string, clientID string) error {
return errRefreshAccessToken
}
- oauthTokens, err := rp.RefreshAccessToken(provider, o.tokens.RefreshToken, "", "")
+ oauthTokens, err := rp.RefreshTokens[*oidc.IDTokenClaims](context.TODO(), provider, o.tokens.RefreshToken, "", "")
if err != nil {
return errRefreshAccessToken
}
@@ -214,7 +214,7 @@ func (o *oidcClient) authenticate(issuer string, clientID string, audience strin
o.oidcTransport.deviceAuthorizationEndpoint = provider.GetDeviceAuthorizationEndpoint()
- resp, err := rp.DeviceAuthorization(oidcScopes, provider)
+ resp, err := rp.DeviceAuthorization(context.TODO(), oidcScopes, provider, nil)
if err != nil {
return err
}
|
