Skip to content

Commit

Permalink
Merge branch 'isolated-deploy-main' into isolated-deploy-main
Browse files Browse the repository at this point in the history
  • Loading branch information
wcater803 authored Feb 27, 2025
2 parents cd4df1b + e20c6c0 commit 7fa7c58
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions backend/ibutsu_server/controllers/login_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ def auth(provider):
)
provider_config = _get_provider_config(provider)
user = _get_user_from_provider(provider, provider_config, code)
print(f"Using provider: {provider} ")
if not user:
return HTTPStatus.UNAUTHORIZED.phrase, HTTPStatus.UNAUTHORIZED
jwt_token = generate_token(user.id)
Expand Down
3 changes: 2 additions & 1 deletion backend/ibutsu_server/util/keycloak.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ def get_keycloak_config(is_private=False):
"authorization_url": build_url(realm_base_url, "protocol/openid-connect/auth"),
"realm": realm,
"client_id": current_app.config.get("KEYCLOAK_CLIENT_ID"),
"redirect_uri": backend_url + "/login/auth/keycloak",
"redirect_uri": backend_url + "/login/keycloak",
}
print(f"authorization_url: {config['authorization_url']} ")
if current_app.config.get("KEYCLOAK_ICON"):
config["icon"] = current_app.config["KEYCLOAK_ICON"]
if current_app.config.get("KEYCLOAK_NAME"):
Expand Down

0 comments on commit 7fa7c58

Please sign in to comment.