From f8791f06eb79af699248c0c29825fad4b365dbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 9 Jul 2026 12:36:45 +0200 Subject: [PATCH 1/2] Remove old oauth2 scopes 0-downtime; prod was migrated to new ones --- app/config/scopes/project.php | 12 ------------ .../Project/Http/Project/OAuth2/Apple/Update.php | 2 +- .../Project/Http/Project/OAuth2/Auth0/Update.php | 2 +- .../Project/Http/Project/OAuth2/Authentik/Update.php | 2 +- .../Modules/Project/Http/Project/OAuth2/Base.php | 2 +- .../Http/Project/OAuth2/FusionAuth/Update.php | 2 +- .../Project/Http/Project/OAuth2/Gitlab/Update.php | 2 +- .../Project/Http/Project/OAuth2/Google/Update.php | 2 +- .../Project/Http/Project/OAuth2/Keycloak/Update.php | 2 +- .../Project/Http/Project/OAuth2/Microsoft/Update.php | 2 +- .../Project/Http/Project/OAuth2/Oidc/Update.php | 2 +- .../Project/Http/Project/OAuth2/Okta/Update.php | 2 +- 12 files changed, 11 insertions(+), 23 deletions(-) diff --git a/app/config/scopes/project.php b/app/config/scopes/project.php index af6d00aa6b..30073ccf50 100644 --- a/app/config/scopes/project.php +++ b/app/config/scopes/project.php @@ -95,18 +95,6 @@ return [ "Access to update project\'s stages", "category" => "Project", ], - "oauth2.read" => [ - "description" => - "Access to read project\'s OAuth2 configuration. Use 'project.oauth2.read' instead.", - "category" => "Project", - 'deprecated' => true, - ], - "oauth2.write" => [ - "description" => - "Access to update project\'s OAuth2 configuration. Use 'project.oauth2.write' instead.", - "category" => "Project", - 'deprecated' => true, - ], // Auth 'users.read' => [ diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Apple/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Apple/Update.php index 5efa935c39..735f3f1212 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Apple/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Apple/Update.php @@ -112,7 +112,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Auth0/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Auth0/Update.php index 88f20501ef..7532caa596 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Auth0/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Auth0/Update.php @@ -86,7 +86,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Authentik/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Authentik/Update.php index d466920636..d6015012bc 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Authentik/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Authentik/Update.php @@ -86,7 +86,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Base.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Base.php index 956339cb4d..f430362f43 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Base.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Base.php @@ -238,7 +238,7 @@ abstract class Base extends Action ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/FusionAuth/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/FusionAuth/Update.php index 9496a0edcf..9ad28eb50d 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/FusionAuth/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/FusionAuth/Update.php @@ -86,7 +86,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Gitlab/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Gitlab/Update.php index 46cd464ce1..228e2417df 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Gitlab/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Gitlab/Update.php @@ -97,7 +97,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Google/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Google/Update.php index 8ca9499c17..19a0c9ce78 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Google/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Google/Update.php @@ -90,7 +90,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Keycloak/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Keycloak/Update.php index 267aab6ae9..82d38c7a4a 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Keycloak/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Keycloak/Update.php @@ -92,7 +92,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Microsoft/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Microsoft/Update.php index e571c57692..7818a4ca7c 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Microsoft/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Microsoft/Update.php @@ -96,7 +96,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Oidc/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Oidc/Update.php index dbf18ad6f0..365bc5efcb 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Oidc/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Oidc/Update.php @@ -122,7 +122,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Okta/Update.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Okta/Update.php index f0f4fba3e7..d6e221ee60 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Okta/Update.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Okta/Update.php @@ -94,7 +94,7 @@ class Update extends Base ->setHttpPath('/v1/project/oauth2/' . $providerId) ->desc('Update project OAuth2 ' . $providerLabel) ->groups(['api', 'project']) - ->label('scope', ['oauth2.write', 'project.oauth2.write']) + ->label('scope', 'project.oauth2.write') ->label('event', 'oauth2.[providerId].update') ->label('audits.event', 'project.oauth2.[providerId].update') ->label('audits.resource', 'project.oauth2/{response.$id}') From 2ea90e76c34e01dc8c19678c74d4828e54f8e594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 9 Jul 2026 12:46:51 +0200 Subject: [PATCH 2/2] Fix missed spots when removing unused scopes --- .../Platform/Modules/Project/Http/Project/OAuth2/Get.php | 2 +- .../Platform/Modules/Project/Http/Project/OAuth2/XList.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Get.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Get.php index 9b6b04b164..92e278dabd 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Get.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/Get.php @@ -30,7 +30,7 @@ class Get extends Action ->setHttpPath('/v1/project/oauth2/:provider') ->desc('Get project OAuth2 provider') ->groups(['api', 'project']) - ->label('scope', ['oauth2.read', 'project.oauth2.read']) + ->label('scope', 'project.oauth2.read') ->label('sdk', new Method( namespace: 'project', group: 'oauth2', diff --git a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/XList.php b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/XList.php index 5368316aa1..78e7a8c1e8 100644 --- a/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/XList.php +++ b/src/Appwrite/Platform/Modules/Project/Http/Project/OAuth2/XList.php @@ -34,7 +34,7 @@ class XList extends Action ->setHttpPath('/v1/project/oauth2') ->desc('List project OAuth2 providers') ->groups(['api', 'project']) - ->label('scope', ['oauth2.read', 'project.oauth2.read']) + ->label('scope', 'project.oauth2.read') ->label('sdk', new Method( namespace: 'project', group: 'oauth2',