32356 - Remove Old Director Search (#3613)

Author: seeker25

auth-api/migrations/versions/9c58b78727c8_users_type.py

@@ -31,9 +31,6 @@ def upgrade():
         login_source = user.login_source
         if user.login_source in [LoginSource.BCEID.value, LoginSource.BCSC.value]:
             user_type = Role.PUBLIC_USER.name
-        elif user.login_source == LoginSource.BCROS.value or user.username.startswith("bcros/"):
-            user_type = Role.ANONYMOUS_USER.name
-            login_source = LoginSource.BCSC.value
         elif user.login_source == LoginSource.STAFF.value:
             user_type = Role.STAFF.name
 

auth-api/src/auth_api/config.py

@@ -119,12 +119,6 @@ class _Config:  # pylint: disable=too-few-public-methods
     ENTITY_SVC_CLIENT_ID = os.getenv("ENTITY_SVC_CLIENT_ID")
     ENTITY_SVC_CLIENT_SECRET = os.getenv("ENTITY_SVC_CLIENT_SECRET")
 
-    # Upstream Keycloak setting - should be removed
-    KEYCLOAK_BCROS_BASE_URL = os.getenv("KEYCLOAK_BCROS_BASE_URL")
-    KEYCLOAK_BCROS_REALMNAME = os.getenv("KEYCLOAK_BCROS_REALMNAME")
-    KEYCLOAK_BCROS_ADMIN_CLIENTID = os.getenv("KEYCLOAK_BCROS_ADMIN_CLIENTID")
-    KEYCLOAK_BCROS_ADMIN_SECRET = os.getenv("KEYCLOAK_BCROS_ADMIN_SECRET")
-
     # API Endpoints
     BCOL_API_URL = os.getenv("BCOL_API_URL", "") + os.getenv("BCOL_API_VERSION", "")
     NAMEX_API_URL = os.getenv("NAMEX_API_URL", "") + os.getenv("NAMEX_API_VERSION", "")
@@ -277,10 +271,10 @@ class TestConfig(_Config):  # pylint: disable=too-few-public-methods
 4H8UZcVFN95vEKxJiLRjAmj6g273pu9kK4ymXNEjWWJn
 -----END RSA PRIVATE KEY-----"""
 
-    KEYCLOAK_ADMIN_USERNAME = KEYCLOAK_BCROS_ADMIN_CLIENTID = os.getenv("KEYCLOAK_TEST_ADMIN_CLIENTID")
-    KEYCLOAK_ADMIN_SECRET = KEYCLOAK_BCROS_ADMIN_SECRET = os.getenv("KEYCLOAK_TEST_ADMIN_SECRET")
-    KEYCLOAK_BASE_URL = KEYCLOAK_BCROS_BASE_URL = os.getenv("KEYCLOAK_TEST_BASE_URL")
-    KEYCLOAK_REALMNAME = KEYCLOAK_BCROS_REALMNAME = os.getenv("KEYCLOAK_TEST_REALMNAME")
+    KEYCLOAK_ADMIN_USERNAME = os.getenv("KEYCLOAK_TEST_ADMIN_CLIENTID")
+    KEYCLOAK_ADMIN_SECRET = os.getenv("KEYCLOAK_TEST_ADMIN_SECRET")
+    KEYCLOAK_BASE_URL = os.getenv("KEYCLOAK_TEST_BASE_URL")
+    KEYCLOAK_REALMNAME = os.getenv("KEYCLOAK_TEST_REALMNAME")
     JWT_OIDC_AUDIENCE = os.getenv("JWT_OIDC_TEST_AUDIENCE")
     JWT_OIDC_CLIENT_SECRET = os.getenv("JWT_OIDC_TEST_CLIENT_SECRET")
     JWT_OIDC_ISSUER = os.getenv("JWT_OIDC_TEST_ISSUER")

auth-api/src/auth_api/exceptions/errors.py

@@ -82,8 +82,7 @@ class Error(Enum):
     ORG_CANNOT_BE_DISSOLVED = "Organization cannot be dissolved", HTTPStatus.NOT_ACCEPTABLE
     FAILED_ADDING_USER_IN_KEYCLOAK = "Error adding user to keycloak", HTTPStatus.INTERNAL_SERVER_ERROR
     ACCCESS_TYPE_MANDATORY = "staff created orgs needs access type", HTTPStatus.BAD_REQUEST
-    USER_CANT_CREATE_ANONYMOUS_ORG = "Only staff can create anonymous org", HTTPStatus.UNAUTHORIZED
-    USER_CANT_CREATE_GOVM_ORG = "Only staff can create govt  ministy org", HTTPStatus.UNAUTHORIZED
+    USER_CANT_CREATE_GOVM_ORG = "Only staff can create govt ministry org", HTTPStatus.UNAUTHORIZED
 
     USER_CANT_CREATE_EXTRA_PROVINCIAL_ORG = (
         "Only out of province users can create extra provincial org",

auth-api/src/auth_api/exceptions/exceptions.py

@@ -7,7 +7,7 @@
 status_code - where possible use HTTP Error Codes
 """
 
-from auth_api.exceptions.errors import Error  # noqa: I001, I003
+from auth_api.exceptions.errors import Error  # noqa: I001
 
 
 class BusinessException(Exception):  # noqa: N818

auth-api/src/auth_api/models/org.py

@@ -53,7 +53,7 @@ class Org(Versioned, BaseModel):  # pylint: disable=too-few-public-methods,too-m
     status_code = Column(ForeignKey("org_statuses.code"), nullable=False)
     name = Column(String(250), index=True)
     branch_name = Column(String(100), nullable=True, default="")  # used for any additional info as branch name
-    access_type = Column(String(250), index=True, nullable=True)  # for ANONYMOUS ACCESS
+    access_type = Column(String(250), index=True, nullable=True)
     decision_made_by = Column(String(250))
     decision_made_on = Column(DateTime, nullable=True)
     bcol_user_id = Column(String(20))
@@ -259,16 +259,9 @@ def _search_for_statuses(cls, query, statuses):
                 .outerjoin(Invitation, Invitation.id == InvitationMembership.invitation_id)
                 .filter(Invitation.invitation_status_code == InvitationStatus.PENDING.value)
                 .filter(
-                    (
-                        (Invitation.type == InvitationType.DIRECTOR_SEARCH.value)
-                        & (Org.status_code == OrgStatusEnum.ACTIVE.value)
-                        & (Org.access_type == AccessType.ANONYMOUS.value)
-                    )
-                    | (
-                        (Invitation.type == InvitationType.GOVM.value)
-                        & (Org.status_code == OrgStatusEnum.PENDING_INVITE_ACCEPT.value)
-                        & (Org.access_type == AccessType.GOVM.value)
-                    )
+                    (Invitation.type == InvitationType.GOVM.value)
+                    & (Org.status_code == OrgStatusEnum.PENDING_INVITE_ACCEPT.value)
+                    & (Org.access_type == AccessType.GOVM.value)
                 )
             )
             query = query.filter(Org.id.notin_(pending_inv_subquery))
@@ -284,16 +277,9 @@ def search_pending_activation_orgs(cls, name: str):
             .options(contains_eager(Org.invitations).load_only(InvitationMembership.invitation_id))
             .filter(Invitation.invitation_status_code == InvitationStatus.PENDING.value)
             .filter(
-                (
-                    (Invitation.type == InvitationType.DIRECTOR_SEARCH.value)
-                    & (Org.status_code == OrgStatusEnum.ACTIVE.value)
-                    & (Org.access_type == AccessType.ANONYMOUS.value)
-                )
-                | (
-                    (Invitation.type == InvitationType.GOVM.value)
-                    & (Org.status_code == OrgStatusEnum.PENDING_INVITE_ACCEPT.value)
-                    & (Org.access_type == AccessType.GOVM.value)
-                )
+                (Invitation.type == InvitationType.GOVM.value)
+                & (Org.status_code == OrgStatusEnum.PENDING_INVITE_ACCEPT.value)
+                & (Org.access_type == AccessType.GOVM.value)
             )
         )
         if name:

auth-api/src/auth_api/models/user.py

@@ -52,13 +52,13 @@ class User(Versioned, BaseModel):
         "keycloak_guid",
         UUID(as_uuid=True),
         unique=True,
-        nullable=True,  # bcros users comes with no guid
+        nullable=True,
     )
 
     is_terms_of_use_accepted = Column(Boolean(), default=False, nullable=True)
     terms_of_use_accepted_version = Column(ForeignKey("documents.version_id"), nullable=True)
 
-    # a type for the user to identify what kind of user it is..ie anonymous , bcsc etc ..similar to login source
+    # a type for the user to identify what kind of user it is..bcsc etc ..similar to login source
     type = Column("type", String(200), nullable=True)
     status = Column(ForeignKey("user_status_codes.id"))
     idp_userid = Column("idp_userid", String(256), index=True)
@@ -272,12 +272,7 @@ def _get_type(cls, user_from_context: UserContext) -> str:
         """Return type of the user from the token info."""
         user_type: str = None
         if user_from_context.roles:
-            if (
-                Role.ANONYMOUS_USER.value in user_from_context.roles
-                or user_from_context.login_source == LoginSource.BCROS.value
-            ):
-                user_type = Role.ANONYMOUS_USER.name
-            elif user_from_context.is_staff():
+            if user_from_context.is_staff():
                 user_type = Role.STAFF.name
             elif Role.GOV_ACCOUNT_USER.value in user_from_context.roles:
                 user_type = Role.GOV_ACCOUNT_USER.name

auth-api/src/auth_api/resources/v1/__init__.py

@@ -24,7 +24,6 @@
 from .activity_log import bp as activity_log_bp
 from .affiliation_invitation import bp as affiliation_invitation_bp
 from .bcol_profiles import bp as bcol_profiles_bp
-from .bulk_user import bp as bulk_user_bp
 from .codes import bp as codes_bp
 from .documents import bp as documents_bp
 from .documents_affidavit import bp as documents_affidavit_bp
@@ -60,7 +59,6 @@ def init_app(self, app):
         self.app.register_blueprint(activity_log_bp)
         self.app.register_blueprint(affiliation_invitation_bp)
         self.app.register_blueprint(bcol_profiles_bp)
-        self.app.register_blueprint(bulk_user_bp)
         self.app.register_blueprint(codes_bp)
         self.app.register_blueprint(documents_bp)
         self.app.register_blueprint(documents_affidavit_bp)

auth-api/src/auth_api/resources/v1/bulk_user.py

@@ -24,7 +24,7 @@
 from auth_api.services.google_store import GoogleStoreService
 from auth_api.utils.auth import jwt as _jwt
 from auth_api.utils.endpoints_enums import EndpointEnum
-from auth_api.utils.enums import AccessType, DocumentType, LoginSource
+from auth_api.utils.enums import DocumentType, LoginSource
 
 bp = Blueprint("DOCUMENTS", __name__, url_prefix=f"{EndpointEnum.API_V1.value}/documents")
 
@@ -37,11 +37,7 @@ def get_document_by_type(document_type):
     try:
         if document_type == DocumentType.TERMS_OF_USE.value:
             token = g.jwt_oidc_token_info
-            if token.get("accessType", None) == AccessType.ANONYMOUS.value:
-                document_type = DocumentType.TERMS_OF_USE_DIRECTOR_SEARCH.value
-            elif (
-                token.get("loginSource", None) == LoginSource.STAFF.value
-            ):  # ideally for govm user who logs in with IDIR
+            if token.get("loginSource", None) == LoginSource.STAFF.value:  # ideally for govm user who logs in with IDIR
                 document_type = DocumentType.TERMS_OF_USE_GOVM.value
 
         doc = DocumentService.fetch_latest_document(document_type)

auth-api/src/auth_api/resources/v1/documents.py

@@ -126,7 +126,7 @@ def accept_invitation_token(invitation_token):
             response, status = (
                 InvitationService.accept_invitation(invitation_id, user, origin).as_dict(),
                 HTTPStatus.OK,
-            )  # noqa:E127
+            )
 
     except BusinessException as exception:
         response, status = {"code": exception.code, "message": exception.message}, exception.status_code