feat: #1386 Add an api to load and update user information to match records in IDIM

.github/workflows/ci_infrastructure.yml

@@ -50,6 +50,7 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"
 
   frontend-terraform-plan:
     needs: backend-terraform-plan
@@ -83,3 +84,4 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"

.github/workflows/dev_deployment.yml

@@ -33,6 +33,7 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"
 
   aws-dev-deployment-frontend:
     needs: aws-dev-deployment-server

.github/workflows/dev_destruction.yml

@@ -28,6 +28,7 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"
 
   # Commenting out the destroy because we want cloudfront domain to be persistent
   # for DNS configuration reasons

.github/workflows/prod_deployment.yml

@@ -31,6 +31,7 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"
 
   aws-prod-deployment-frontend:
     needs: aws-prod-deployment-server

.github/workflows/prod_destruction.yml

@@ -30,6 +30,7 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"
 
   # Commenting out the destroy because we want cloudfront domain to be persistent
   # for DNS configuration reasons

.github/workflows/reusable_terraform_server.yml

@@ -42,6 +42,8 @@ on:
         required: true
       gc_notify_email_api_key:
         required: true
+      fam_update_user_info_api_key:
+        required: true
 
 env:
   TF_VERSION: 1.2.2
@@ -176,6 +178,7 @@ jobs:
           prod_oidc_bcsc_idp_client_secret = "${{ secrets.prod_oidc_bcsc_idp_client_secret }}"
           idim_proxy_api_api_key = "${{ secrets.idim_proxy_api_api_key }}"
           gc_notify_email_api_key = "${{ secrets.gc_notify_email_api_key }}"
+          fam_update_user_info_api_key = "${{ secrets.fam_update_user_info_api_key }}"
           EOF
 
       - name: Terragrunt ${{ inputs.tf_subcommand }}

.github/workflows/test_deployment.yml

@@ -30,6 +30,7 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"
 
   aws-test-deployment-frontend:
     needs: aws-test-deployment-server

.github/workflows/test_destruction.yml

@@ -28,6 +28,7 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"
 
   # Commenting out the destroy because we want cloudfront domain to be persistent
   # for DNS configuration reasons

.github/workflows/tools_deployment.yml

@@ -35,6 +35,7 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"
 
   aws-tools-deployment-frontend:
     needs: aws-tools-deployment-server

.github/workflows/tools_destruction.yml

@@ -28,6 +28,7 @@ jobs:
       prod_oidc_bcsc_idp_client_secret: "${{ secrets.PROD_OIDC_BCSC_IDP_CLIENT_SECRET }}"
       idim_proxy_api_api_key: "${{ secrets.IDIM_PROXY_API_API_KEY }}"
       gc_notify_email_api_key: "${{ secrets.GC_NOTIFY_EMAIL_API_KEY }}"
+      fam_update_user_info_api_key: "${{ secrets.FAM_UPDATE_USER_INFO_API_KEY }}"
 
   # Commenting out the destroy because we want cloudfront domain to be persistent
   # for DNS configuration reasons

infrastructure/server/fam_api.tf

@@ -138,6 +138,7 @@ resource "aws_lambda_function" "fam-api-function" {
       FC_API_TOKEN_TEST = "${var.forest_client_api_api_key_test}"
       FC_API_BASE_URL_PROD = "${var.forest_client_api_base_url_prod}"
       FC_API_TOKEN_PROD = "${var.forest_client_api_api_key_prod}"
+      FAM_UPDATE_USER_INFO_API_KEY = "${var.fam_update_user_info_api_key}"
 
       ENABLE_BCSC_JWKS_ENDPOINT = "True"
       IDIM_PROXY_BASE_URL_PROD = "${var.idim_proxy_api_base_url_prod}"

infrastructure/server/variables_provided.tf

@@ -206,6 +206,11 @@ variable "gc_notify_email_api_key" {
   sensitive = true
 }
 
+variable "fam_update_user_info_api_key" {
+  type = string
+  sensitive = true
+}
+
 
 # Variables for Cognito Client config
 

server/backend/api/app/crud/crud_user.py

@@ -1,9 +1,12 @@
 import logging
+from sqlalchemy.orm import Session, joinedload
+from sqlalchemy import select
 
-from api.app.constants import UserType
+from api.app.constants import UserType, ApiInstanceEnv, IdimSearchUserParamType
 from api.app.models import model as models
-from sqlalchemy import select
-from sqlalchemy.orm import Session, joinedload
+from api.app.crud import crud_utils
+from api.app.crud.validator.target_user_validator import TargetUserValidator
+from api.app.integration.idim_proxy import IdimProxyService
 
 from .. import schemas
 
@@ -186,7 +189,10 @@ def update_user_name(
 
 
 def update_user_properties_from_verified_target_user(
-    db: Session, user_id: int, target_user: schemas.TargetUser, requester: str  # cognito_user_id
+    db: Session,
+    user_id: int,
+    target_user: schemas.TargetUser,
+    requester: str,  # cognito_user_id
 ):
     """
     This is to update fam_user's properties from verified_target_user.
@@ -210,7 +216,7 @@ def update_user_properties_from_verified_target_user(
     properties_to_update = {
         models.FamUser.first_name: first_name,
         models.FamUser.last_name: last_name,
-        models.FamUser.email: email
+        models.FamUser.email: email,
     }
     # update business_guid when necessary
     business_guid = target_user.business_guid
@@ -219,20 +225,15 @@ def update_user_properties_from_verified_target_user(
         # add additional property to 'properties_to_update'
         properties_to_update = {
             **properties_to_update,
-            models.FamUser.business_guid: business_guid
+            models.FamUser.business_guid: business_guid,
         }
 
     update(db, user_id, properties_to_update, requester)
-    LOGGER.debug(
-        f"fam_user {user_id} properties were updated."
-    )
+    LOGGER.debug(f"fam_user {user_id} properties were updated.")
     return get_user(db, user_id)
 
 
-def fetch_initial_requester_info(
-    db: Session,
-    cognito_user_id: str
-):
+def fetch_initial_requester_info(db: Session, cognito_user_id: str):
     """
     Note!
     The purpose: only to be used to find out initial essential requester information
@@ -246,9 +247,142 @@ def fetch_initial_requester_info(
         select(models.FamUser)
         .options(
             joinedload(models.FamUser.fam_access_control_privileges),
-            joinedload(models.FamUser.fam_user_terms_conditions)
+            joinedload(models.FamUser.fam_user_terms_conditions),
         )
         .filter(models.FamUser.cognito_user_id == cognito_user_id)
     )
     user = db.scalars(q_stm).unique().one_or_none()
     return user
+
+
+def update_user_info_from_idim_source(
+    db: Session, use_pagination: bool, page: int, per_page: int
+) -> schemas.FamUserUpdateResponse:
+    """
+    Go through each user record in the database,
+    update the user information to match the record in IDIM web service,
+    only for IDIR and Business BCeID users, ignore bc service card users
+    """
+    # get a requester from the database
+    requester = (
+        db.query(models.FamUser)
+        .filter(models.FamUser.user_name == "CMENG")
+        .one_or_none()
+    )
+    # setup IDIM web service
+    api_instance_env = (
+        ApiInstanceEnv.PROD if crud_utils.is_on_aws_prod() else ApiInstanceEnv.TEST
+    )
+    idim_proxy_service = IdimProxyService(requester, api_instance_env)
+
+    # grab fam users from user table
+    fam_users = get_users(db)
+    total_users_count = len(fam_users)
+    LOGGER.debug(f"Total number of users: {total_users_count}")
+    if use_pagination:
+        fam_users = (
+            db.query(models.FamUser)
+            .order_by(models.FamUser.user_id.asc())
+            .offset((page - 1) * per_page)
+            .limit(per_page)
+            .all()
+        )
+        LOGGER.debug(
+            f"Updating information for users on page {page}, there are {per_page} users on each page"
+        )
+
+    success_user_list = []
+    failed_user_list = []
+    ignored_user_list = []
+
+    for user in fam_users:
+        try:
+            LOGGER.debug(
+                f"Updating information for user: {user.user_name}, type: {user.user_type_code}, guid: {user.user_guid}"
+            )
+            search_result = None
+            properties_to_update = {}
+
+            if user.user_type_code == UserType.IDIR:
+                # IDIM web service doesn't support search IDIR by user_guid, so we search by userID
+                search_result = idim_proxy_service.search_idir(
+                    schemas.IdimProxySearchParam(**{"userId": user.user_name})
+                )
+
+                if not user.user_guid:
+                    # if user has no user_guid in our database, add it
+                    properties_to_update = {
+                        models.FamUser.user_guid: search_result.get("guid"),
+                    }
+
+                # if found user's user_guid does not match our record
+                # which is the edge case that could cause by the username change, ignore this situation
+                # our auth lambda and grant access apis will cover this situation
+
+            elif user.user_type_code == UserType.BCEID:
+                if user.user_guid:
+                    # if found business bceid user by user_guid, update username if necessary
+                    search_result = idim_proxy_service.search_business_bceid(
+                        schemas.IdimProxyBceidSearchParam(
+                            **{
+                                "searchUserBy": IdimSearchUserParamType.USER_GUID,
+                                "searchValue": user.user_guid,
+                            }
+                        )
+                    )
+                    properties_to_update = {
+                        models.FamUser.user_name: search_result.get("userId"),
+                    }
+
+                else:
+                    # if user has no user_guid in our database, find by user_name and add user_guid to database
+                    search_result = idim_proxy_service.search_business_bceid(
+                        schemas.IdimProxyBceidSearchParam(
+                            **{
+                                "searchUserBy": IdimSearchUserParamType.USER_ID,
+                                "searchValue": user.user_name,
+                            }
+                        )
+                    )
+                    properties_to_update = {
+                        models.FamUser.user_guid: search_result.get("guid"),
+                    }
+            else:
+                # ignore bc service card users
+                ignored_user_list.append(user.user_id)
+                LOGGER.debug(f"Updating information for user {user.user_name} is ignored because we only focus on IDIR and Business BCeID")
+                continue
+
+            # Update various target_user fields from idim search if exists
+            if search_result and search_result.get("found"):
+                properties_to_update = {
+                    **properties_to_update,
+                    models.FamUser.first_name: search_result.get("firstName"),
+                    models.FamUser.last_name: search_result.get("lastName"),
+                    models.FamUser.email: search_result.get("email"),
+                    models.FamUser.business_guid: search_result.get("businessGuid"),
+                }
+
+                update(db, user.user_id, properties_to_update, requester.cognito_user_id)
+                LOGGER.debug(f"Updating information for user {user.user_name} is done")
+                success_user_list.append(user.user_id)
+            else:
+                LOGGER.debug(
+                    f"Invalid request, cannot find user {user.user_name} {user.user_guid} with user type {user.user_type_code}"
+                )
+                failed_user_list.append(user.user_id)
+
+        except Exception as e:
+            LOGGER.debug(f"Failed to update user info: {e}")
+            failed_user_list.append(user.user_id)
+
+    return schemas.FamUserUpdateResponse(
+        **{
+            "total_users_count": total_users_count,
+            "current_page": page,
+            "users_count_on_page": len(fam_users),
+            "success_user_id_list": success_user_list,
+            "failed_user_id_list": failed_user_list,
+            "ignored_user_id_list": ignored_user_list
+        }
+    )

server/backend/api/app/main.py

@@ -26,6 +26,7 @@
     router_user_role_assignment,
     router_user_terms_conditions,
     router_guards,
+    router_user
 )
 
 logConfigFile = os.path.join(
@@ -129,6 +130,13 @@ def main():
     dependencies=[Depends(router_guards.authorize)],
     tags=["FAM User Terms and Conditions"],
 )
+app.include_router(
+    router_user.router,
+    prefix=apiPrefix + "/user",
+    dependencies=[Depends(router_guards.verify_api_key_for_update_user_info)],
+    tags=["FAM User"],
+)
+
 
 
 # This router is used to proxy the BCSC userinfo endpoint