sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-14 02:39:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into oauth-flow-fallback

Browse Source
This commit is contained in:
Viktor Liu
2026-08-25 17:14:47 +02:00
parent 5339de7097 c512bf25aa
commit e8d6aa6344
290 changed files with 15668 additions and 3050 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/internal/auth/auth.go
+2 -2
View File
@@ -147,7 +147,7 @@ func (a *Auth) IsSSOSupported(ctx context.Context) (bool, error) {
// GetOAuthFlow returns an OAuth flow (PKCE or Device) using the existing management connection
// This avoids creating a new connection to the management server
func (a *Auth) GetOAuthFlow(ctx context.Context, forceDeviceAuth bool) (OAuthFlow, error) {
func (a *Auth) GetOAuthFlow(ctx context.Context, forceDeviceAuth bool, hint string) (OAuthFlow, error) {
var flow OAuthFlow
// the connection is owned by a and outlives this call, so a later fallback reuses it
@@ -157,7 +157,7 @@ func (a *Auth) GetOAuthFlow(ctx context.Context, forceDeviceAuth bool) (OAuthFlo
err := a.withRetry(ctx, func(client *mgm.GrpcClient) error {
var err error
flow, err = oauthFlowWithFallback(a, client, flowOrder(forceDeviceAuth, true), "", newAuth)
flow, err = oauthFlowWithFallback(a, client, flowOrder(forceDeviceAuth, true), hint, newAuth)
if IsSSOUnavailable(err) {
return backoff.Permanent(err)