Skip to content

Commit 1372479

Browse files
Fix oidc config
1 parent f3b768f commit 1372479

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

salt/metalk8s/addons/ui/config/metalk8s-shell-ui-config.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
providerUrl: "/oidc"
2424
redirectUrl: "{{ salt.metalk8s_network.get_control_plane_ingress_endpoint() }}/{{ metalk8s_ui_config.spec.basePath.lstrip('/') }}"
2525
clientId: "metalk8s-ui"
26-
responseType: "id_token"
26+
responseType: "code"
2727
scopes: "openid profile email groups offline_access audience:server:client_id:oidc-auth-client"
2828
userGroupsMapping:
2929
{%- for user in dex.spec.config.staticPasswords | map(attribute='email') %}

salt/metalk8s/addons/ui/config/metalk8s-ui-config.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
providerUrl: "/oidc"
2424
redirectUrl: "{{ salt.metalk8s_network.get_control_plane_ingress_endpoint() }}/"
2525
clientId: "metalk8s-ui"
26-
responseType: "id_token"
26+
responseType: "code"
2727
scopes: "openid profile email groups offline_access audience:server:client_id:oidc-auth-client"
2828
{%- endif %}
2929

shell-ui/src/navbar/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as WebComponent from './index.js';
55
<solutions-navbar
66
oidc-provider-url="https://10.200.4.157:8443/oidc"
77
client-id="metalk8s-ui"
8-
response-type="id_token"
8+
response-type="code"
99
redirect-url="http://localhost:8082"
1010
scopes="openid profile email groups offline_access audience:server:client_id:oidc-auth-client"
1111
options={

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ def dex_login(username, password, should_fail, control_plane_ingress_ep):
431431
auth_page = session.get(
432432
control_plane_ingress_ep + "/oidc/auth/local?",
433433
params={
434-
"response_type": "id_token",
434+
"response_type": "code",
435435
"client_id": "metalk8s-ui",
436436
"scope": "openid audience:server:client_id:oidc-auth-client",
437437
"redirect_uri": control_plane_ingress_ep + "/",

ui/cypress/fixtures/runtime-app-configuration

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"providerUrl": "/oidc",
2525
"redirectUrl": "/",
2626
"clientId": "metalk8s-ui",
27-
"responseType": "id_token",
27+
"responseType": "code",
2828
"scopes": "openid profile email groups offline_access audience:server:client_id:oidc-auth-client"
2929
}
3030
}

ui/cypress/fixtures/shell-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"providerUrl": "/oidc",
55
"redirectUrl": "/",
66
"clientId": "metalk8s-ui",
7-
"responseType": "id_token",
7+
"responseType": "code",
88
"scopes": "openid profile email groups offline_access audience:server:client_id:oidc-auth-client"
99
},
1010
"options": {

ui/public/.well-known/runtime-app-configuration

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"providerUrl": "/oidc",
2727
"redirectUrl": "http://localhost:8084/",
2828
"clientId": "metalk8s-ui",
29-
"responseType": "id_token",
29+
"responseType": "code",
3030
"scopes": "openid profile email groups offline_access audience:server:client_id:oidc-auth-client",
3131
"providerLogout": true
3232
}

0 commit comments

Comments
 (0)