Skip to content

Commit 21dcf27

Browse files
committed
Merge remote-tracking branch 'origin/main' into external_auth_be_updates
2 parents 3ecf615 + 5b2f436 commit 21dcf27

File tree

8 files changed

+973
-156
lines changed

8 files changed

+973
-156
lines changed

coderd/database/dbauthz/dbauthz.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ var (
227227
rbac.ResourceOrganizationMember.Type: {rbac.ActionCreate},
228228
rbac.ResourceOrgRoleAssignment.Type: {rbac.ActionCreate},
229229
rbac.ResourceUser.Type: {rbac.ActionCreate, rbac.ActionUpdate, rbac.ActionDelete},
230-
rbac.ResourceUserData.Type: {rbac.ActionCreate, rbac.ActionUpdate},
230+
rbac.ResourceUserData.Type: {rbac.ActionCreate, rbac.ActionUpdate, rbac.ActionRead},
231231
rbac.ResourceWorkspace.Type: {rbac.ActionUpdate},
232232
rbac.ResourceWorkspaceBuild.Type: {rbac.ActionUpdate},
233233
rbac.ResourceWorkspaceExecution.Type: {rbac.ActionCreate},
@@ -981,10 +981,7 @@ func (q *querier) GetExternalAuthLink(ctx context.Context, arg database.GetExter
981981
}
982982

983983
func (q *querier) GetExternalAuthLinksByUserID(ctx context.Context, userID uuid.UUID) ([]database.ExternalAuthLink, error) {
984-
if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
985-
return nil, err
986-
}
987-
return q.db.GetExternalAuthLinksByUserID(ctx, userID)
984+
return fetchWithPostFilter(q.auth, q.db.GetExternalAuthLinksByUserID)(ctx, userID)
988985
}
989986

990987
func (q *querier) GetFileByHashAndCreator(ctx context.Context, arg database.GetFileByHashAndCreatorParams) (database.File, error) {

coderd/database/dbmem/dbmem.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,21 @@ func (q *FakeQuerier) DeleteExternalAuthLink(ctx context.Context, arg database.D
10251025
return err
10261026
}
10271027

1028-
panic("not implemented")
1028+
q.mutex.Lock()
1029+
defer q.mutex.Unlock()
1030+
1031+
for index, key := range q.externalAuthLinks {
1032+
if key.UserID != arg.UserID {
1033+
continue
1034+
}
1035+
if key.ProviderID != arg.ProviderID {
1036+
continue
1037+
}
1038+
q.externalAuthLinks[index] = q.externalAuthLinks[len(q.externalAuthLinks)-1]
1039+
q.externalAuthLinks = q.externalAuthLinks[:len(q.externalAuthLinks)-1]
1040+
return nil
1041+
}
1042+
return sql.ErrNoRows
10291043
}
10301044

10311045
func (q *FakeQuerier) DeleteGitSSHKey(_ context.Context, userID uuid.UUID) error {

site/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@
7171
"react-confetti": "6.1.0",
7272
"react-date-range": "1.4.0",
7373
"react-dom": "18.2.0",
74-
"react-helmet-async": "1.3.0",
75-
"react-markdown": "8.0.7",
74+
"react-helmet-async": "2.0.1",
75+
"react-markdown": "9.0.1",
7676
"react-query": "npm:@tanstack/react-query@4.35.3",
77-
"react-router-dom": "6.16.0",
77+
"react-router-dom": "6.20.0",
7878
"react-syntax-highlighter": "15.5.0",
7979
"react-use": "17.4.0",
8080
"react-virtualized-auto-sizer": "1.0.20",
8181
"react-window": "1.8.8",
82-
"remark-gfm": "3.0.1",
82+
"remark-gfm": "4.0.0",
8383
"rollup-plugin-visualizer": "5.9.0",
8484
"semver": "7.5.3",
8585
"ts-proto": "1.164.0",

0 commit comments

Comments
 (0)