Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 095d151

Browse files
authored
Merge pull request #4744 from mruff-aeq/mirror_sbc_staff_role_fix_to_main
34553 skip completing party name check for SBC staff (mirror hotfix to main)
2 parents 23b1d7b + 93ce953 commit 095d151

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

legal-api/src/legal_api/services/filings/validations/registration.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from legal_api.core.filing import Filing
2828
from legal_api.errors import Error
2929
from legal_api.services import STAFF_ROLE, NaicsService, flags
30+
from legal_api.services.authz import SBC_STAFF_ROLE
3031
from legal_api.services.filings.validations.common_validations import (
3132
is_same_str,
3233
validate_court_order,
@@ -171,14 +172,16 @@ def validate_completing_party_name(filing: dict, filing_type="registration") ->
171172
"""Validate the completing party name matches the submitting user's name.
172173
173174
Clients cannot edit the completing party (it is pre-populated from their login),
174-
so the submitted name must match their user record; staff enter it manually from
175-
a paper form and API gateway users have their own workflow, so both are skipped.
175+
so the submitted name must match their user record; registry and SBC staff enter it
176+
manually from a paper form and API gateway users have their own workflow, so those
177+
are skipped.
176178
"""
177179
api_login_source = "API_GW" # jwt loginSource of an API gateway user
178180
msg = []
179181
current_user = getattr(request_ctx, "current_user", None) if has_request_context() else None
180182
if (not current_user
181183
or jwt.validate_roles(current_user, [STAFF_ROLE])
184+
or jwt.validate_roles(current_user, [SBC_STAFF_ROLE])
182185
or current_user.get("loginSource") == api_login_source):
183186
return msg
184187

legal-api/tests/unit/services/filings/validations/test_registration.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from business_model.models import Business, User
2525
from legal_api.services import NaicsService, NameXService, flags
2626
from legal_api.services.filings.validations.validation import validate
27-
from legal_api.services.authz import BASIC_USER, STAFF_ROLE
27+
from legal_api.services.authz import BASIC_USER, SBC_STAFF_ROLE, STAFF_ROLE
2828
from registry_schemas.example_data import FILING_HEADER, REGISTRATION
2929

3030
from tests.unit.services.filings.validations import create_party, create_party_address
@@ -457,6 +457,7 @@ def mock_check(permissions_msg, filing_type):
457457
MISMATCH_ERROR),
458458
('client_user_record_no_name', [BASIC_USER], 'BCSC', (None, None, None), None, MISMATCH_ERROR),
459459
('staff_skipped', [STAFF_ROLE], 'IDIR', ('Different', None, 'Person'), None, None),
460+
('sbc_staff_skipped', [SBC_STAFF_ROLE], 'IDIR', ('Different', None, 'Person'), None, None),
460461
('api_gw_skipped', [BASIC_USER], 'API_GW', ('Different', None, 'Person'), None, None),
461462
]
462463
)

0 commit comments

Comments
 (0)