33246 Legal API - use common account

legal-api/pyproject.toml

@@ -33,6 +33,7 @@ dependencies = [
     "lxml (>=6.1.1)",
 
     "business-model @ git+https://github.com/bcgov/lear.git@main#subdirectory=python/common/business-registry-model",
+    "business-registry-account @ git+https://github.com/bcgov/lear.git@main#subdirectory=python/common/business-registry-account",
     "business-registry-common @ git+https://github.com/bcgov/lear.git@main#subdirectory=python/common/business-registry-common",
     "gcp-queue @ git+https://github.com/bcgov/sbc-connect-common.git@main#subdirectory=python/gcp-queue",
     "structured-logging @ git+https://github.com/bcgov/sbc-connect-common.git@main#subdirectory=python/structured-logging",

legal-api/src/legal_api/config.py

@@ -241,9 +241,6 @@ class TestConfig(_Config):  # pylint: disable=too-few-public-methods
             f"postgresql://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}/{DB_NAME}"
         )
 
-    # URLs
-    AUTH_SVC_URL = os.getenv("AUTH_SVC_URL", "http://test-auth-url")
-
     # Transparency Register - test cases set this explicitly as needed
     TR_START_DATE = ""
 
@@ -316,6 +313,8 @@ class TestConfig(_Config):  # pylint: disable=too-few-public-methods
 
     LEGAL_API_BASE_URL = "https://LEGAL_API_BASE_URL/api/v2/businesses"
     PAYMENT_SVC_URL = "https://PAY_SVC_URL/api/v1/payment-requests"
+    AUTH_SVC_URL = "https://AUTH_SVC_URL"
+    ACCOUNT_SVC_AUTH_URL = "https://ACCOUNT_SVC_AUTH_URL"
 
     BUSINESS_SCHEMA_ID = os.getenv("BUSINESS_SCHEMA_ID", "TEST_BUSINESS_SCHEMA_ID")
     BUSINESS_CRED_DEF_ID = os.getenv("BUSINESS_CRED_DEF_ID", "TEST_BUSINESS_SCHEMA_ID")

legal-api/src/legal_api/reports/document_service.py

@@ -16,11 +16,11 @@
 import requests
 from flask import current_app, jsonify
 
+from business_account import AccountService
 from business_common.utils.base import BaseEnum
 from business_model.models import Business, Document, Filing
 from legal_api.core.meta.filing import FILINGS
 from legal_api.exceptions import BusinessException
-from legal_api.services import AccountService
 
 BUSINESS_DOCS_PATH: str = "{url}/application-reports/history/{product}/{business_id}?includeDocuments=true"
 GET_REPORT_PATH: str = "{url}/application-reports/{product}/{drsId}"

legal-api/src/legal_api/resources/v2/business/business.py

@@ -22,13 +22,13 @@
 from flask_babel import _ as babel
 from flask_cors import cross_origin
 
+from business_account import AccountService
 from business_model.models import Business, Filing, RegistrationBootstrap
 from legal_api.core import Filing as CoreFiling
 from legal_api.resources.v2.business.business_filings import saving_filings
 from legal_api.services import (
     ACCOUNT_IDENTITY,
     SYSTEM_ROLE,
-    AccountService,
     RegistrationBootstrapService,
     check_warnings,
     flags,
@@ -92,7 +92,7 @@ def get_businesses(identifier: str):
     q_account = request.args.get("account")
     current_app.logger.info("account info request, for account: %s", q_account)
     if q_account and jwt.has_one_of_roles([SYSTEM_ROLE, ACCOUNT_IDENTITY]):
-        account_response = AccountService.get_account_by_affiliated_identifier(identifier)
+        account_response = AccountService.get_account_by_affiliated_identifier(identifier, flags)
         current_app.logger.info("VALID account request, for accountId: %s, by: %s, jwt: %s, for org account: %s",
                                 q_account,
                                 g.jwt_oidc_token_info.get("preferred_username"),

legal-api/src/legal_api/resources/v2/namerequest.py

@@ -20,8 +20,8 @@
 from flask import Blueprint, current_app, jsonify, make_response, request
 from flask_cors import cross_origin
 
-from legal_api.services import namex
-from legal_api.services.bootstrap import AccountService
+from business_account import AccountService
+from legal_api.services import flags, namex
 from legal_api.services.permissions import ListActionsPermissionsAllowed, PermissionService
 from legal_api.utils.auth import jwt
 from legal_api.utils.formatting import normalize_phone
@@ -52,7 +52,7 @@ def validate_with_contact_info(identifier): # noqa: PLR0911
             return jsonify(nr_json)
 
         # Check the NR is affiliated with this account
-        orgs_response = AccountService.get_account_by_affiliated_identifier(identifier)
+        orgs_response = AccountService.get_account_by_affiliated_identifier(identifier, flags)
 
          # If affiliated with the account, return the NR
         if len(orgs_response["orgs"]):

legal-api/src/legal_api/scripts/document_service_import.py

@@ -21,11 +21,11 @@
 import requests
 from flask import Blueprint, current_app
 
+from business_account import AccountService
 from business_model.models import Filing, db
 from business_model.models.business import Business
 from business_model.models.colin_event_id import ColinEventId
 from business_model.models.document import Document
-from legal_api.services import AccountService
 
 document_service_bp = Blueprint("document_service", __name__)
 

legal-api/src/legal_api/services/__init__.py

@@ -33,7 +33,7 @@
     authorized,
     has_roles,
 )
-from .bootstrap import AccountService, RegistrationBootstrapService
+from .bootstrap import RegistrationBootstrapService
 from .business_details_version import VersionedBusinessDetailsService
 from .colin import ColinService
 from .digital_credentials import DigitalCredentialsService
@@ -64,7 +64,6 @@
     "authorized",
     "has_roles",
     # Services
-    "AccountService",
     "RegistrationBootstrapService",
     "VersionedBusinessDetailsService",
     "ColinService",