diff --git a/auth-api/poetry.lock b/auth-api/poetry.lock index d80d97932..501e79baa 100644 --- a/auth-api/poetry.lock +++ b/auth-api/poetry.lock @@ -900,23 +900,22 @@ python-dateutil = ">=2.4" [[package]] name = "flask" -version = "3.1.3" +version = "3.0.2" description = "A simple framework for building complex web applications." optional = false -python-versions = ">=3.9" +python-versions = ">=3.8" groups = ["main"] files = [ - {file = "flask-3.1.3-py3-none-any.whl", hash = "sha256:f4bcbefc124291925f1a26446da31a5178f9483862233b23c0c96a20701f670c"}, - {file = "flask-3.1.3.tar.gz", hash = "sha256:0ef0e52b8a9cd932855379197dd8f94047b359ca0a78695144304cb45f87c9eb"}, + {file = "flask-3.0.2-py3-none-any.whl", hash = "sha256:3232e0e9c850d781933cf0207523d1ece087eb8d87b23777ae38456e2fbe7c6e"}, + {file = "flask-3.0.2.tar.gz", hash = "sha256:822c03f4b799204250a7ee84b1eddc40665395333973dfb9deebfe425fefcb7d"}, ] [package.dependencies] -blinker = ">=1.9.0" +blinker = ">=1.6.2" click = ">=8.1.3" -itsdangerous = ">=2.2.0" -jinja2 = ">=3.1.2" -markupsafe = ">=2.1.1" -werkzeug = ">=3.1.0" +itsdangerous = ">=2.1.2" +Jinja2 = ">=3.1.2" +Werkzeug = ">=3.0.0" [package.extras] async = ["asgiref (>=3.2)"] @@ -2934,7 +2933,7 @@ jaeger-client = "*" [package.source] type = "git" url = "https://github.com/bcgov/sbc-common-components.git" -reference = "master" +reference = "abb9c9c2e6c39895e773604cabe2f525d1398a51" resolved_reference = "abb9c9c2e6c39895e773604cabe2f525d1398a51" subdirectory = "python" @@ -3516,4 +3515,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.1" python-versions = ">=3.12,<3.13" -content-hash = "3beaa654a07af1513866caf9f82a8639b4934cfd1e3bcfbd1132e71071aa748b" +content-hash = "5be3f1eef463afe2e18f603f05e89e055b9aa110645a3684e3a75721d5373b89" diff --git a/auth-api/pyproject.toml b/auth-api/pyproject.toml index c85fccb83..ed1bcfce5 100644 --- a/auth-api/pyproject.toml +++ b/auth-api/pyproject.toml @@ -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" } diff --git a/auth-api/src/auth_api/services/org.py b/auth-api/src/auth_api/services/org.py index 090a7c38e..3499468f6 100644 --- a/auth-api/src/auth_api/services/org.py +++ b/auth-api/src/auth_api/services/org.py @@ -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 diff --git a/queue_services/account-mailer/poetry.lock b/queue_services/account-mailer/poetry.lock index e5196de31..0840effed 100644 --- a/queue_services/account-mailer/poetry.lock +++ b/queue_services/account-mailer/poetry.lock @@ -282,7 +282,7 @@ cachetools = "5.5.0" cattrs = "^23.2.3" certifi = "2024.8.30" cloud-sql-connector = {git = "https://github.com/bcgov/sbc-connect-common.git", branch = "main", subdirectory = "python/cloud-sql-connector"} -flask = "3.1.3" +flask = "3.0.2" flask-caching = {git = "https://github.com/pallets-eco/flask-caching.git", branch = "master"} flask-cors = "^6.0.0" flask-jwt-oidc = {git = "https://github.com/seeker25/flask-jwt-oidc.git", branch = "main"} @@ -309,7 +309,7 @@ pyhumps = "^3.8.0" python-dotenv = "^1.0.1" pytz = "^2024.2" requests = "2.32.4" -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"} sql-versioning = {git = "https://github.com/bcgov/sbc-connect-common.git", branch = "add_column_exclusion", subdirectory = "python/sql-versioning"} sqlalchemy-utils = "^0.41.2" structured-logging = {git = "https://github.com/bcgov/sbc-connect-common.git", branch = "main", subdirectory = "python/structured-logging"} @@ -317,9 +317,9 @@ Werkzeug = "^3.1.5" [package.source] type = "git" -url = "https://github.com/bcgov/sbc-auth.git" -reference = "main" -resolved_reference = "cc63dd5273ff8a612f63f30928466c1074412bde" +url = "https://github.com/jxio/sbc-auth.git" +reference = "32485_1" +resolved_reference = "bafe5215924b9a0f054a23d276af679d46b36f1e" subdirectory = "auth-api" [[package]] @@ -957,23 +957,22 @@ tests = ["coverage", "coveralls", "dill", "mock", "nose"] [[package]] name = "flask" -version = "3.1.3" +version = "3.0.2" description = "A simple framework for building complex web applications." optional = false -python-versions = ">=3.9" +python-versions = ">=3.8" groups = ["main"] files = [ - {file = "flask-3.1.3-py3-none-any.whl", hash = "sha256:f4bcbefc124291925f1a26446da31a5178f9483862233b23c0c96a20701f670c"}, - {file = "flask-3.1.3.tar.gz", hash = "sha256:0ef0e52b8a9cd932855379197dd8f94047b359ca0a78695144304cb45f87c9eb"}, + {file = "flask-3.0.2-py3-none-any.whl", hash = "sha256:3232e0e9c850d781933cf0207523d1ece087eb8d87b23777ae38456e2fbe7c6e"}, + {file = "flask-3.0.2.tar.gz", hash = "sha256:822c03f4b799204250a7ee84b1eddc40665395333973dfb9deebfe425fefcb7d"}, ] [package.dependencies] -blinker = ">=1.9.0" +blinker = ">=1.6.2" click = ">=8.1.3" -itsdangerous = ">=2.2.0" -jinja2 = ">=3.1.2" -markupsafe = ">=2.1.1" -werkzeug = ">=3.1.0" +itsdangerous = ">=2.1.2" +Jinja2 = ">=3.1.2" +Werkzeug = ">=3.0.0" [package.extras] async = ["asgiref (>=3.2)"] @@ -2900,8 +2899,8 @@ jaeger-client = "*" [package.source] type = "git" url = "https://github.com/bcgov/sbc-common-components.git" -reference = "master" -resolved_reference = "5570da927853b20bc655bb303c34068aa28d66d7" +reference = "abb9c9c2e6c39895e773604cabe2f525d1398a51" +resolved_reference = "abb9c9c2e6c39895e773604cabe2f525d1398a51" subdirectory = "python" [[package]] @@ -3463,4 +3462,4 @@ test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-it [metadata] lock-version = "2.1" python-versions = ">=3.12,<3.13" -content-hash = "77c66bf75ccc8232327dc6dff2807c32038e5b2d7f5a60136444d3fd068eb2f4" +content-hash = "ea42f2b94f1994e93ac111963dc09b332f2c3604334560057cdd3b00d8f60035" diff --git a/queue_services/account-mailer/pyproject.toml b/queue_services/account-mailer/pyproject.toml index 594fb74fa..cf68dc8ea 100644 --- a/queue_services/account-mailer/pyproject.toml +++ b/queue_services/account-mailer/pyproject.toml @@ -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"