Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/client/.env-example
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SERVER_PORT=4000
# Domaine (host:port) du serveur Keycloak pour l'authentification
KEYCLOAK_DOMAIN=localhost:8090
# Nom du royaume Keycloak utilisé par la console
KEYCLOAK_REALM=cloud-pi-native
KEYCLOAK_REALM=dso
# Protocole de communication avec Keycloak (http | https)
KEYCLOAK_PROTOCOL=http
# Identifiant du client Keycloak côté frontend
Expand Down
2 changes: 1 addition & 1 deletion apps/client/.env.docker-example
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SERVER_PORT=8080
# Domaine (host:port) du serveur Keycloak pour l'authentification
KEYCLOAK_DOMAIN=localhost:8090
# Nom du royaume Keycloak utilisé par la console
KEYCLOAK_REALM=cloud-pi-native
KEYCLOAK_REALM=dso
# Protocole de communication avec Keycloak (http | https)
KEYCLOAK_PROTOCOL=http
# Identifiant du client Keycloak côté frontend
Expand Down
2 changes: 1 addition & 1 deletion apps/server-nestjs/.env-example
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SESSION_SECRET=a-very-strong-secret-with-more-than-32-char
# Domaine (host:port) du serveur Keycloak pour l'authentification
KEYCLOAK_DOMAIN=localhost:8090
# Nom du royaume Keycloak utilisé par la console
KEYCLOAK_REALM=cloud-pi-native
KEYCLOAK_REALM=dso
# Protocole de communication avec Keycloak (http | https)
KEYCLOAK_PROTOCOL=http
# Identifiant du client Keycloak côté backend
Expand Down
2 changes: 1 addition & 1 deletion apps/server-nestjs/.env.docker-example
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SESSION_SECRET=a-very-strong-secret-with-more-than-32-char
# Domaine du Keycloak (nom du service Docker Compose + port interne)
KEYCLOAK_DOMAIN=keycloak:8080
# Nom du royaume Keycloak utilisé par la console
KEYCLOAK_REALM=cloud-pi-native
KEYCLOAK_REALM=dso
# Protocole de communication avec Keycloak (http en Docker local)
KEYCLOAK_PROTOCOL=http
# Identifiant du client Keycloak côté backend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ Idem dev (avec Watch) + volumes kubeconfig.

### Tâche 3.5 : `docker/docker-compose.local.yml` ✅

`nginx-strangler` ajouté avec `host.docker.internal`, port `8082:8080`.
`nginx-strangler` ajouté avec `host.docker.internal`, port `8082:8080`, `extra_hosts: host-gateway`.

### Tâche 3.6 : `apps/client/nginx/default.docker.conf` ✅

Expand Down
2 changes: 1 addition & 1 deletion apps/server/.env-example
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SESSION_SECRET=a-very-strong-secret-with-more-than-32-char
# Domaine (host:port) du serveur Keycloak pour l'authentification
KEYCLOAK_DOMAIN=localhost:8090
# Nom du royaume Keycloak utilisé par la console
KEYCLOAK_REALM=cloud-pi-native
KEYCLOAK_REALM=dso
# Protocole de communication avec Keycloak (http | https)
KEYCLOAK_PROTOCOL=http
# Identifiant du client Keycloak côté backend
Expand Down
2 changes: 1 addition & 1 deletion apps/server/.env.docker-example
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SESSION_SECRET=a-very-strong-secret-with-more-than-32-char
# Domaine du Keycloak (nom du service Docker Compose + port interne)
KEYCLOAK_DOMAIN=keycloak:8080
# Nom du royaume Keycloak utilisé par la console
KEYCLOAK_REALM=cloud-pi-native
KEYCLOAK_REALM=dso
# Protocole de communication avec Keycloak (http en Docker local)
KEYCLOAK_PROTOCOL=http
# Identifiant du client Keycloak côté backend
Expand Down
2 changes: 2 additions & 0 deletions docker/docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ services:
dockerfile: apps/nginx-strangler/Dockerfile
image: dso-console/nginx-strangler:local
container_name: dso-console_nginx-strangler
extra_hosts:
- host.docker.internal:${HOST_GATEWAY_IP:-host-gateway}
ports:
- 4000:8080
environment:
Expand Down
128 changes: 39 additions & 89 deletions keycloak/realms/realm-dev.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"realm": "cloud-pi-native",
"realm": "dso",
"enabled": true,
"accessTokenLifespan": 300,
"accessCodeLifespan": 60,
Expand All @@ -10,9 +10,10 @@
"registrationAllowed": false,
"privateKey": "MIICXAIBAAKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQABAoGAfmO8gVhyBxdqlxmIuglbz8bcjQbhXJLR2EoS8ngTXmN1bo2L90M0mUKSdc7qF10LgETBzqL8jYlQIbt+e6TH8fcEpKCjUlyq0Mf/vVbfZSNaVycY13nTzo27iPyWQHK5NLuJzn1xvxxrUeXI6A2WFpGEBLbHjwpx5WQG9A+2scECQQDvdn9NE75HPTVPxBqsEd2z10TKkl9CZxu10Qby3iQQmWLEJ9LNmy3acvKrE3gMiYNWb6xHPKiIqOR1as7L24aTAkEAtyvQOlCvr5kAjVqrEKXalj0Tzewjweuxc0pskvArTI2Oo070h65GpoIKLc9jf+UA69cRtquwP93aZKtW06U8dQJAF2Y44ks/mK5+eyDqik3koCI08qaC8HYq2wVl7G2QkJ6sbAaILtcvD92ToOvyGyeE0flvmDZxMYlvaZnaQ0lcSQJBAKZU6umJi3/xeEbkJqMfeLclD27XGEFoPeNrmdx0q10Azp4NfJAY+Z8KRyQCR2BEG+oNitBOZ+YXF9KCpH3cdmECQHEigJhYg+ykOvr1aiZUMFT72HU0jnmQe2FVekuG+LJUt2Tm7GtMjTFoGpf0JwrVuZN39fOYAlo+nTixgeW7X8Y=",
"publicKey": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB",
"requiredCredentials": [
"password"
],
"requiredCredentials": ["password"],
"attributes": {
"frontendUrl": "http://localhost:8090"
},
"browserSecurityHeaders": {
"contentSecurityPolicyReportOnly": "",
"xContentTypeOptions": "nosniff",
Expand Down Expand Up @@ -48,14 +49,9 @@
"value": "test"
}
],
"realmRoles": [
"user",
"offline_access"
],
"realmRoles": ["user", "offline_access"],
"clientRoles": {
"account": [
"manage-account"
]
"account": ["manage-account"]
}
},
{
Expand All @@ -72,18 +68,11 @@
"value": "test"
}
],
"realmRoles": [
"user",
"offline_access"
],
"realmRoles": ["user", "offline_access"],
"clientRoles": {
"account": [
"manage-account"
]
"account": ["manage-account"]
},
"groups": [
"admin"
]
"groups": ["admin"]
},
{
"id": "cb8e5b4b-7b7b-40f5-935f-594f48ae6567",
Expand All @@ -99,14 +88,9 @@
"value": "test"
}
],
"realmRoles": [
"user",
"offline_access"
],
"realmRoles": ["user", "offline_access"],
"clientRoles": {
"account": [
"manage-account"
]
"account": ["manage-account"]
}
},
{
Expand All @@ -123,14 +107,9 @@
"value": "test"
}
],
"realmRoles": [
"user",
"offline_access"
],
"realmRoles": ["user", "offline_access"],
"clientRoles": {
"account": [
"manage-account"
]
"account": ["manage-account"]
}
},
{
Expand All @@ -147,14 +126,9 @@
"value": "test"
}
],
"realmRoles": [
"user",
"offline_access"
],
"realmRoles": ["user", "offline_access"],
"clientRoles": {
"account": [
"manage-account"
]
"account": ["manage-account"]
}
},
{
Expand All @@ -171,14 +145,9 @@
"value": "test"
}
],
"realmRoles": [
"user",
"offline_access"
],
"realmRoles": ["user", "offline_access"],
"clientRoles": {
"account": [
"manage-account"
]
"account": ["manage-account"]
}
},
{
Expand All @@ -195,21 +164,12 @@
"value": "admin"
}
],
"realmRoles": [
"user",
"admin"
],
"realmRoles": ["user", "admin"],
"clientRoles": {
"realm-management": [
"realm-admin"
],
"account": [
"manage-account"
]
"realm-management": ["realm-admin"],
"account": ["manage-account"]
},
"groups": [
"admin"
]
"groups": ["admin"]
}
],
"roles": {
Expand Down Expand Up @@ -237,12 +197,8 @@
"enabled": true,
"alwaysDisplayInConsole": false,
"clientAuthenticatorType": "client-secret",
"redirectUris": [
"*"
],
"webOrigins": [
"*"
],
"redirectUris": ["*"],
"webOrigins": ["*"],
"notBefore": 0,
"bearerOnly": false,
"consentRequired": false,
Expand Down Expand Up @@ -280,10 +236,7 @@
"authenticationFlowBindingOverrides": {},
"fullScopeAllowed": true,
"nodeReRegistrationTimeout": -1,
"defaultClientScopes": [
"generic",
"basic"
],
"defaultClientScopes": ["generic", "basic"],
"optionalClientScopes": [
"address",
"phone",
Expand Down Expand Up @@ -348,9 +301,7 @@
"authenticationFlowBindingOverrides": {},
"fullScopeAllowed": true,
"nodeReRegistrationTimeout": -1,
"defaultClientScopes": [
"generic"
],
"defaultClientScopes": ["generic"],
"optionalClientScopes": [
"address",
"phone",
Expand Down Expand Up @@ -386,17 +337,19 @@
"gui.order": "",
"consent.screen.text": ""
},
"protocolMappers": [{
"id": "910359ad-0368-44dd-b10c-d1cae6c6dd17",
"name": "sub",
"protocol": "openid-connect",
"protocolMapper": "oidc-sub-mapper",
"consentRequired": false,
"config": {
"introspection.token.claim": "true",
"access.token.claim": "true"
"protocolMappers": [
{
"id": "910359ad-0368-44dd-b10c-d1cae6c6dd17",
"name": "sub",
"protocol": "openid-connect",
"protocolMapper": "oidc-sub-mapper",
"consentRequired": false,
"config": {
"introspection.token.claim": "true",
"access.token.claim": "true"
}
}
}]
]
},
{
"id": "1611458d-38ab-4a9f-859e-1812d251c1ac",
Expand Down Expand Up @@ -619,9 +572,6 @@
"adminTheme": "DSFR",
"emailTheme": "DSFR",
"internationalizationEnabled": true,
"supportedLocales": [
"en",
"fr"
],
"supportedLocales": ["en", "fr"],
"defaultLocale": "fr"
}
2 changes: 0 additions & 2 deletions playwright/e2e-tests/clusters.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ test.describe('Clusters page', () => {
})
// Validate
await page.getByTestId(`clusterLink-${clusterName}`).click()
await expect(page.getByTestId('cpin-loader')).toHaveCount(0)
await expect(page.getByTestId('infosInput')).toHaveValue(informations)
})

Expand All @@ -138,7 +137,6 @@ test.describe('Clusters page', () => {
await signInCloudPiNative({ page, credentials: adminUser })
await page.getByTestId('menuAdministrationBtn').click()
await page.getByTestId('menuAdministrationClusters').click()
await expect(page.getByTestId('cpin-loader')).toHaveCount(0)
await page.getByTestId('addClusterLink').click()
await page.getByTestId('labelInput').fill(clusterName)
await page.getByTestId('infosInput').fill(informations)
Expand Down
Loading
Loading