Merge pull request #968 from CSCfi/hotfix/use-new-oidc-in-oidc-return

Use new OIDC in OIDC return

Author: blankdots

CHANGELOG.md

@@ -56,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Use oidc login Keystone provider for automatically forwarded SSO in oidc return
 - (GH #851) Kill upload sessions upon finishing uploads to allow reuploading same files in all cases
 - (GH #884) Fixed multiple bugs
   - Redirected to AllFolders view whenever the selected project changes

swift_browser_ui/ui/login.py

@@ -98,8 +98,9 @@ async def oidc_end(request: aiohttp.web.Request) -> aiohttp.web.Response:
     )
 
     if session["oidc"]["userinfo"].get("homeFederation", "") == "Haka":
-        response.headers["Location"] = HAKA_ENDPOINT(
+        response.headers["Location"] = HAKA_OIDC_ENDPOINT(
             endpoint=str(setd["auth_endpoint_url"]),
+            oidc=str(setd["keystone_oidc_provider"]),
             origin=str(setd["set_origin_address"]),
         )