Skip to content

chore: implement user link claims as a typed golang object #15502

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 7 commits into from
Nov 14, 2024
Merged

chore: implement user link claims as a typed golang object #15502

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c7a773
chore: implement user link claims as a typed golang object
Emyrk Nov 13, 2024
918b1f5
chore: fixup old references
Emyrk Nov 13, 2024
b1f0997
fix claims reference
Emyrk Nov 13, 2024
88da3eb
fix claims reference
Emyrk Nov 13, 2024
84f84a5
fix sql value function
Emyrk Nov 13, 2024
28eb806
add claims to assert equivalent on fetch
Emyrk Nov 14, 2024
c6f7376
fixup assert test
Emyrk Nov 14, 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 claims reference
  • Loading branch information
@Emyrk
Emyrk committed Nov 14, 2024
commit 88da3ebb62718307f66f077d864a38865db5bfb5
2 changes: 1 addition & 1 deletion coderd/database/dbauthz/dbauthz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@ func (s *MethodTestSuite) TestUser() {
OAuthExpiry: link.OAuthExpiry,
UserID: link.UserID,
LoginType: link.LoginType,
DebugContext: json.RawMessage("{}"),
Claims: database.UserLinkClaims{},
}).Asserts(rbac.ResourceUserObject(link.UserID), policy.ActionUpdatePersonal).Returns(link)
}))
s.Run("UpdateUserRoles", s.Subtest(func(db database.Store, check *expects) {
Expand Down
3 changes: 1 addition & 2 deletions enterprise/dbcrypt/dbcrypt_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"crypto/rand"
"database/sql"
"encoding/base64"
"encoding/json"
"io"
"testing"
"time"
Expand Down Expand Up @@ -57,7 +56,7 @@ func TestUserLinks(t *testing.T) {
OAuthRefreshToken: "refresh",
UserID: link.UserID,
LoginType: link.LoginType,
DebugContext: json.RawMessage("{}"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we throw in a value here and check the output below just to make sure it gets marshalled and unmarshalled correctly?

Claims: database.UserLinkClaims{},
})
require.NoError(t, err)
require.Equal(t, "access", updated.OAuthAccessToken)
Expand Down