Skip to content

Commit 7082287

Browse files
committed
undo supoprt role
1 parent eb68d9b commit 7082287

File tree

8 files changed

+6
-54
lines changed

8 files changed

+6
-54
lines changed

packages/common-library/src/common_library/users_enums.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"GUEST": 10,
77
"USER": 20,
88
"TESTER": 30,
9-
"PRODUCT_SUPPORT": 35,
109
"PRODUCT_OWNER": 40,
1110
"ADMIN": 100,
1211
}
@@ -34,7 +33,6 @@ class UserRole(Enum):
3433
GUEST = "GUEST"
3534
USER = "USER"
3635
TESTER = "TESTER"
37-
PRODUCT_SUPPORT = "PRODUCT_SUPPORT"
3836
PRODUCT_OWNER = "PRODUCT_OWNER"
3937
ADMIN = "ADMIN"
4038

packages/models-library/src/models_library/api_schemas_webserver/users.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ class MyProfileRestGet(OutputSchemaWithoutCamelCase):
8888
"GUEST",
8989
"USER",
9090
"TESTER",
91-
"PRODUCT_SUPPORT",
9291
"PRODUCT_OWNER",
9392
"ADMIN",
9493
]

packages/postgres-database/src/simcore_postgres_database/migration/versions/1546c76e03f0_updates_user_roles_with_product_support_.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

services/api-server/openapi.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"info": {
44
"title": "osparc.io public API",
55
"description": "osparc-simcore public API specifications",
6-
"version": "0.13.0"
6+
"version": "0.13.1"
77
},
88
"paths": {
99
"/v0/meta": {
@@ -12582,7 +12582,6 @@
1258212582
"GUEST",
1258312583
"USER",
1258412584
"TESTER",
12585-
"PRODUCT_SUPPORT",
1258612585
"PRODUCT_OWNER",
1258712586
"ADMIN"
1258812587
],

services/api-server/src/simcore_service_api_server/models/schemas/profiles.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class UserRoleEnum(StrAutoEnum):
2222
GUEST = auto()
2323
USER = auto()
2424
TESTER = auto()
25-
PRODUCT_SUPPORT = auto()
2625
PRODUCT_OWNER = auto()
2726
ADMIN = auto()
2827

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13838,7 +13838,6 @@ components:
1383813838
- GUEST
1383913839
- USER
1384013840
- TESTER
13841-
- PRODUCT_SUPPORT
1384213841
- PRODUCT_OWNER
1384313842
- ADMIN
1384413843
title: Role

services/web/server/src/simcore_service_webserver/security/_authz_access_roles.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,15 @@ class PermissionDict(TypedDict, total=False):
104104
],
105105
inherits=[UserRole.USER],
106106
),
107-
UserRole.PRODUCT_SUPPORT: PermissionDict(
108-
can=[
109-
"product.details.*",
110-
"admin.users.read",
111-
],
112-
inherits=[UserRole.TESTER],
113-
),
114107
UserRole.PRODUCT_OWNER: PermissionDict(
115108
# NOTE: Add `tags=["po"]` to entrypoints with this access requirements
116109
can=[
117-
"product.invitations.create",
110+
"admin.users.read",
118111
"admin.users.write",
112+
"product.details.*",
113+
"product.invitations.create",
119114
],
120-
inherits=[UserRole.PRODUCT_SUPPORT],
115+
inherits=[UserRole.TESTER],
121116
),
122117
UserRole.ADMIN: PermissionDict(
123118
can=[

services/web/server/tests/unit/with_dbs/03/invitations/test_users_accounts_rest_registration.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,8 @@ async def mock_send_message(msg):
9595
*(
9696
(role, status.HTTP_403_FORBIDDEN)
9797
for role in UserRole
98-
if UserRole.ANONYMOUS < role < UserRole.PRODUCT_SUPPORT
98+
if UserRole.ANONYMOUS < role < UserRole.PRODUCT_OWNER
9999
),
100-
(UserRole.PRODUCT_SUPPORT, status.HTTP_200_OK),
101100
(UserRole.PRODUCT_OWNER, status.HTTP_200_OK),
102101
(UserRole.ADMIN, status.HTTP_200_OK),
103102
],

0 commit comments

Comments
 (0)