loading up the forgejo repo on tangled to test page performance
Merge pull request 'fix: Do not delete global Oauth2 applications' (#6054) from fnetx/global-oauth-corruption into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6054
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
+11
+8
models/auth/TestOrphanedOAuth2Applications/oauth2_application.yaml
+8
models/auth/TestOrphanedOAuth2Applications/oauth2_application.yaml
···
23
23
redirect_uris: '["http://127.0.0.1", "https://127.0.0.1"]'
24
24
created_unix: 1712358091
25
25
updated_unix: 1712358091
26
+
-
27
+
id: 1003
28
+
uid: 0
29
+
name: "Global Auth source that should be kept"
30
+
client_id: "2f3467c1-7b3b-463d-ab04-2ae2b2712826"
31
+
redirect_uris: '["http://example.com/globalapp", "https://example.com/globalapp"]'
32
+
created_unix: 1732387292
33
+
updated_unix: 1732387292
+2
models/auth/oauth2.go
+2
models/auth/oauth2.go
···
657
657
Table("`oauth2_application`").
658
658
Join("LEFT", "`user`", "`oauth2_application`.`uid` = `user`.`id`").
659
659
Where(builder.IsNull{"`user`.id"}).
660
+
Where(builder.Neq{"uid": 0}). // exclude instance-wide admin applications
660
661
Where(builder.NotIn("`oauth2_application`.`client_id`", BuiltinApplicationsClientIDs())).
661
662
Select("COUNT(`oauth2_application`.`id`)").
662
663
Count()
···
668
669
From("`oauth2_application`").
669
670
Join("LEFT", "`user`", "`oauth2_application`.`uid` = `user`.`id`").
670
671
Where(builder.IsNull{"`user`.id"}).
672
+
Where(builder.Neq{"uid": 0}). // exclude instance-wide admin applications
671
673
Where(builder.NotIn("`oauth2_application`.`client_id`", BuiltinApplicationsClientIDs()))
672
674
673
675
b := builder.Delete(builder.In("id", subQuery)).From("`oauth2_application`")