Skip to content

chore: return failed refresh errors on external auth as string (was boolean) #13402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 3, 2024
Merged

chore: return failed refresh errors on external auth as string (was boolean) #13402

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5d5dcd
chore: return failed refresh errors on external auth
Emyrk May 29, 2024
0f35152
Fix unit test
Emyrk May 29, 2024
6b21da8
Make invalid not an error
Emyrk May 29, 2024
1dab79f
Switch to a sentinel error
Emyrk May 31, 2024
85d1fde
fix tests
Emyrk May 31, 2024
91a5741
linting
Emyrk May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
@Emyrk
Emyrk committed May 31, 2024
commit 85d1fde0b3647cdeb9df66c0b1cfcfbbc44372da
11 changes: 8 additions & 3 deletions coderd/externalauth/externalauth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ func TestRefreshToken(t *testing.T) {
_, err := config.RefreshToken(context.Background(), nil, database.ExternalAuthLink{
OAuthExpiry: expired,
})
require.NoError(t, err)
require.Error(t, err)
require.True(t, externalauth.IsInvalidTokenError(err))
require.Contains(t, err.Error(), "failure")
})

t.Run("ValidateServerError", func(t *testing.T) {
Expand All @@ -132,7 +134,10 @@ func TestRefreshToken(t *testing.T) {

_, err := config.RefreshToken(ctx, nil, link)
require.ErrorContains(t, err, staticError)
require.True(t, externalauth.IsInvalidTokenError(err))
// Unsure if this should be the correct behavior. It's an invalid token because
// 'ValidateToken()' failed with a runtime error. This was the previous behavior,
// so not going to change it.
require.False(t, externalauth.IsInvalidTokenError(err))
require.True(t, validated, "token should have been attempted to be validated")
})

Expand All @@ -157,7 +162,7 @@ func TestRefreshToken(t *testing.T) {
link.OAuthExpiry = expired

_, err := config.RefreshToken(ctx, nil, link)
require.ErrorContains(t, err, staticError)
require.ErrorContains(t, err, "token failed to validate")
require.True(t, externalauth.IsInvalidTokenError(err))
require.True(t, validated, "token should have been attempted to be validated")
})
Expand Down