32485 - Downgrade flask to "3.0.2" and a bug fixing (#3661)

Author: Jxio

auth-api/poetry.lock

@@ -39,7 +39,7 @@ attrs = "24.2.0"
 CacheControl = "0.14.0"
 cachetools = "5.5.0"
 certifi = "2024.8.30"
-flask = "3.1.3"
+flask = "3.0.2"
 itsdangerous = "^2.1.2"
 jinja2 = "^3.1.5"
 jsonschema = "4.17.3"
@@ -52,7 +52,7 @@ Werkzeug = "^3.1.5"
 # VCS dependencies
 sql-versioning = { git = "https://github.com/bcgov/sbc-connect-common.git", subdirectory = "python/sql-versioning", branch = "add_column_exclusion" }
 flask-jwt-oidc = {git = "https://github.com/seeker25/flask-jwt-oidc.git", branch = "main" }
-sbc-common-components = { git = "https://github.com/bcgov/sbc-common-components.git", rev = "master", subdirectory = "python" }
+sbc-common-components = { git = "https://github.com/bcgov/sbc-common-components.git", rev = "abb9c9c2e6c39895e773604cabe2f525d1398a51", subdirectory = "python" }
 cloud-sql-connector = { git = "https://github.com/bcgov/sbc-connect-common.git", subdirectory = "python/cloud-sql-connector", branch = "main" }
 gcp-queue = { git = "https://github.com/bcgov/sbc-connect-common.git", subdirectory = "python/gcp-queue", branch = "main" }
 structured-logging = { git = "https://github.com/bcgov/sbc-connect-common.git", subdirectory = "python/structured-logging", branch = "main" }

auth-api/pyproject.toml

@@ -1005,12 +1005,13 @@ def approve_or_reject(org_id: int, is_approved: bool, client_id: int, task_actio
         org.save()
         # Find admin email addresses
         admin_emails = UserService.get_admin_emails_for_org(org_id)
+        origin_url = current_app.config.get("WEB_APP_URL")
         if admin_emails != "":
             if org.access_type in (AccessType.EXTRA_PROVINCIAL.value, AccessType.REGULAR_BCEID.value):
                 Org.send_approved_rejected_notification(admin_emails, org.name, org.id, org.status_code, client_id)
             elif org.access_type in (AccessType.GOVM.value, AccessType.GOVN.value):
                 Org.send_approved_rejected_govm_govn_notification(
-                    admin_emails, org.name, org.id, org.status_code, client_id
+                    admin_emails, org.name, org.id, org.status_code, origin_url, client_id
                 )
         else:
             # continue but log error

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

@@ -38,7 +38,7 @@ urllib3 = "2.6.3"
 zipp = "3.19.1"
 
 # VCS dependencies
-auth-api = { git = "https://github.com/bcgov/sbc-auth.git", branch = "main", subdirectory = "auth-api" }
+auth-api = { git = "https://github.com/jxio/sbc-auth.git", branch = "32485_1", subdirectory = "auth-api" }
 simple-cloudevent = { git = "https://github.com/daxiom/simple-cloudevent.py.git" }
 cloud-sql-python-connector = "^1.13.0"
 pkginfo = "^1.12.1.2"