Commit21dcf27

committed

Merge remote-tracking branch 'origin/main' into external_auth_be_updates

2 parents3ecf615 +5b2f436 commit21dcf27Copy full SHA for 21dcf27

File tree

+973

-156

lines changed

+973

-156

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ var (`
`227`	`227`	`rbac.ResourceOrganizationMember.Type: {rbac.ActionCreate},`
`228`	`228`	`rbac.ResourceOrgRoleAssignment.Type: {rbac.ActionCreate},`
`229`	`229`	`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},`
`231`	`231`	`rbac.ResourceWorkspace.Type: {rbac.ActionUpdate},`
`232`	`232`	`rbac.ResourceWorkspaceBuild.Type: {rbac.ActionUpdate},`
`233`	`233`	`rbac.ResourceWorkspaceExecution.Type: {rbac.ActionCreate},`
`@@ -981,10 +981,7 @@ func (q *querier) GetExternalAuthLink(ctx context.Context, arg database.GetExter`
`981`	`981`	`}`
`982`	`982`
`983`	`983`	`func (q*querier)GetExternalAuthLinksByUserID(ctx context.Context,userID uuid.UUID) ([]database.ExternalAuthLink,error) {`
`984`		`-iferr:=q.authorizeContext(ctx,rbac.ActionRead,rbac.ResourceSystem);err!=nil {`
`985`		`-returnnil,err`
`986`		`-}`
`987`		`-returnq.db.GetExternalAuthLinksByUserID(ctx,userID)`
	`984`	`+returnfetchWithPostFilter(q.auth,q.db.GetExternalAuthLinksByUserID)(ctx,userID)`
`988`	`985`	`}`
`989`	`986`
`990`	`987`	`func (q*querier)GetFileByHashAndCreator(ctx context.Context,arg database.GetFileByHashAndCreatorParams) (database.File,error) {`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1025,7 +1025,21 @@ func (q *FakeQuerier) DeleteExternalAuthLink(ctx context.Context, arg database.D`
`1025`	`1025`	`returnerr`
`1026`	`1026`	`}`
`1027`	`1027`
`1028`		`-panic("not implemented")`
	`1028`	`+q.mutex.Lock()`
	`1029`	`+deferq.mutex.Unlock()`
	`1030`	`+`
	`1031`	`+forindex,key:=rangeq.externalAuthLinks {`
	`1032`	`+ifkey.UserID!=arg.UserID {`
	`1033`	`+continue`
	`1034`	`+}`
	`1035`	`+ifkey.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`	`+returnnil`
	`1041`	`+}`
	`1042`	`+returnsql.ErrNoRows`
`1029`	`1043`	`}`
`1030`	`1044`
`1031`	`1045`	`func (q*FakeQuerier)DeleteGitSSHKey(_ context.Context,userID uuid.UUID)error {`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,15 +71,15 @@`
`71`	`71`	`"react-confetti":"6.1.0",`
`72`	`72`	`"react-date-range":"1.4.0",`
`73`	`73`	`"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",`
`76`	`76`	`"react-query":"npm:@tanstack/react-query@4.35.3",`
`77`		`-"react-router-dom":"6.16.0",`
	`77`	`+"react-router-dom":"6.20.0",`
`78`	`78`	`"react-syntax-highlighter":"15.5.0",`
`79`	`79`	`"react-use":"17.4.0",`
`80`	`80`	`"react-virtualized-auto-sizer":"1.0.20",`
`81`	`81`	`"react-window":"1.8.8",`
`82`		`-"remark-gfm":"3.0.1",`
	`82`	`+"remark-gfm":"4.0.0",`
`83`	`83`	`"rollup-plugin-visualizer":"5.9.0",`
`84`	`84`	`"semver":"7.5.3",`
`85`	`85`	`"ts-proto":"1.164.0",`

Comments

(0)