Fix oauth2 scope collition

This commit is contained in:
Matej Bačo committed 2026-06-30 12:33:38 +02:00
1 parent 8fe967fe6c
commit b78a72f83e
18 files changed
+35 -23

No files matched your search

+2 -2
View File
@@ -59,12 +59,12 @@ $admins = [
'tables.write',
'platforms.read',
'platforms.write',
'oauth2.read',
'oauth2.write',
'mocks.read',
'mocks.write',
'project.policies.read',
'project.policies.write',
'project.oauth2.read',
'project.oauth2.write',
'templates.read',
'templates.write',
'projects.write',
+14 -2
View File
@@ -65,6 +65,16 @@ return [
"Access to update project\'s policies",
"category" => "Project",
],
"project.oauth2.read" => [
"description" =>
"Access to read project\'s OAuth2 configuration.",
"category" => "Project",
],
"project.oauth2.write" => [
"description" =>
"Access to update project\'s OAUth2 configuration.",
"category" => "Project",
],
"templates.read" => [
"description" =>
"Access to read project\'s templates",
@@ -87,13 +97,15 @@ return [
],
"oauth2.read" => [
"description" =>
"Access to read project\'s OAuth2 configuration",
"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",
"Access to update project\'s OAuth2 configuration. Use 'project.oauth2.read' instead.",
"category" => "Project",
'deprecated' => true,
],
// Auth
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -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')
->label('scope', ['oauth2.read', 'project.oauth2.read'])
->label('sdk', new Method(
namespace: 'project',
group: 'oauth2',
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -106,7 +106,7 @@ class Update extends Base
->setHttpPath('/v1/project/oauth2/' . $providerId)
->desc('Update project OAuth2 ' . $providerLabel)
->groups(['api', 'project'])
->label('scope', 'oauth2.write')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -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')
->label('scope', ['oauth2.write', 'project.oauth2.write'])
->label('event', 'oauth2.[providerId].update')
->label('audits.event', 'project.oauth2.[providerId].update')
->label('audits.resource', 'project.oauth2/{response.$id}')
@@ -34,7 +34,7 @@ class XList extends Action
->setHttpPath('/v1/project/oauth2')
->desc('List project OAuth2 providers')
->groups(['api', 'project'])
->label('scope', 'oauth2.read')
->label('scope', ['oauth2.read', 'project.oauth2.read'])
->label('sdk', new Method(
namespace: 'project',
group: 'oauth2',
+2 -2
View File
@@ -433,12 +433,12 @@ class Migrations extends Action
'keys.write',
'platforms.read',
'platforms.write',
'oauth2.read',
'oauth2.write',
'mocks.read',
'mocks.write',
'project.policies.read',
'project.policies.write',
'project.oauth2.read',
'project.oauth2.write',
'templates.read',
'templates.write',
];
+2 -2
View File
@@ -90,8 +90,8 @@ const API_SCOPES = [
'tokens.write',
'platforms.read',
'platforms.write',
'oauth2.read',
'oauth2.write',
'project.oauth2.read',
'project.oauth2.write',
];
const BASE_PERMISSIONS = [
+2 -2
View File
@@ -169,12 +169,12 @@ trait ProjectCustom
'keys.write',
'platforms.read',
'platforms.write',
'oauth2.read',
'oauth2.write',
'mocks.read',
'mocks.write',
'project.policies.read',
'project.policies.write',
'project.oauth2.read',
'project.oauth2.write',
'templates.read',
'templates.write',
'insights.read',