style: fix linting issues met Prettier
This commit is contained in:
parent
441bf990e7
commit
4c5f6196f6
5 changed files with 37 additions and 18 deletions
|
@ -50,7 +50,7 @@ services:
|
||||||
- 'traefik.http.routers.idp.rule=PathPrefix(`/idp`)'
|
- 'traefik.http.routers.idp.rule=PathPrefix(`/idp`)'
|
||||||
- 'traefik.http.services.idp.loadbalancer.server.port=7080'
|
- 'traefik.http.services.idp.loadbalancer.server.port=7080'
|
||||||
env_file:
|
env_file:
|
||||||
- ./config/idp/.env
|
- ./config/idp/.env
|
||||||
environment:
|
environment:
|
||||||
KC_HOSTNAME: 'sel2-1.ugent.be'
|
KC_HOSTNAME: 'sel2-1.ugent.be'
|
||||||
PROXY_ADDRESS_FORWARDING: 'true'
|
PROXY_ADDRESS_FORWARDING: 'true'
|
||||||
|
@ -65,25 +65,25 @@ services:
|
||||||
- '443:443/tcp'
|
- '443:443/tcp'
|
||||||
command:
|
command:
|
||||||
# Add Docker provider
|
# Add Docker provider
|
||||||
- "--providers.docker=true"
|
- '--providers.docker=true'
|
||||||
- "--providers.docker.exposedbydefault=false"
|
- '--providers.docker.exposedbydefault=false'
|
||||||
|
|
||||||
# Add web entrypoint
|
# Add web entrypoint
|
||||||
- "--entrypoints.web.address=:80/tcp"
|
- '--entrypoints.web.address=:80/tcp'
|
||||||
- "--entrypoints.web.http.redirections.entryPoint.to=websecure"
|
- '--entrypoints.web.http.redirections.entryPoint.to=websecure'
|
||||||
- "--entrypoints.web.http.redirections.entryPoint.scheme=https"
|
- '--entrypoints.web.http.redirections.entryPoint.scheme=https'
|
||||||
|
|
||||||
# Add websecure entrypoint
|
# Add websecure entrypoint
|
||||||
- "--entrypoints.websecure.address=:443/tcp"
|
- '--entrypoints.websecure.address=:443/tcp'
|
||||||
- "--entrypoints.websecure.http.tls=true"
|
- '--entrypoints.websecure.http.tls=true'
|
||||||
- "--entrypoints.websecure.http.tls.certResolver=letsencrypt"
|
- '--entrypoints.websecure.http.tls.certResolver=letsencrypt'
|
||||||
- "--entrypoints.websecure.http.tls.domains[0].main=sel2-1.ugent.be"
|
- '--entrypoints.websecure.http.tls.domains[0].main=sel2-1.ugent.be'
|
||||||
|
|
||||||
# Certificates
|
# Certificates
|
||||||
- "--certificatesresolvers.letsencrypt.acme.httpchallenge=true"
|
- '--certificatesresolvers.letsencrypt.acme.httpchallenge=true'
|
||||||
- "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"
|
- '--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web'
|
||||||
- "--certificatesresolvers.letsencrypt.acme.email=timo.demeyst@ugent.be"
|
- '--certificatesresolvers.letsencrypt.acme.email=timo.demeyst@ugent.be'
|
||||||
- "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
|
- '--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json'
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
|
|
|
@ -21,7 +21,7 @@ services:
|
||||||
ports:
|
ports:
|
||||||
- '7080:7080'
|
- '7080:7080'
|
||||||
# - '7443:7443'
|
# - '7443:7443'
|
||||||
command: [ 'start-dev', '--http-port', '7080', '--https-port', '7443', '--import-realm' ]
|
command: ['start-dev', '--http-port', '7080', '--https-port', '7443', '--import-realm']
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ./config/idp:/opt/keycloak/data/import
|
- ./config/idp:/opt/keycloak/data/import
|
||||||
|
|
|
@ -620,7 +620,15 @@
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"alwaysDisplayInConsole": false,
|
"alwaysDisplayInConsole": false,
|
||||||
"clientAuthenticatorType": "client-jwt",
|
"clientAuthenticatorType": "client-jwt",
|
||||||
"redirectUris": ["urn:ietf:wg:oauth:2.0:oob", "http://localhost:5173/*", "http://localhost:5173", "http://localhost/*", "http://localhost", "https://sel2-1.ugent.be/*", "https://sel2-1.ugent.be"],
|
"redirectUris": [
|
||||||
|
"urn:ietf:wg:oauth:2.0:oob",
|
||||||
|
"http://localhost:5173/*",
|
||||||
|
"http://localhost:5173",
|
||||||
|
"http://localhost/*",
|
||||||
|
"http://localhost",
|
||||||
|
"https://sel2-1.ugent.be/*",
|
||||||
|
"https://sel2-1.ugent.be"
|
||||||
|
],
|
||||||
"webOrigins": ["+"],
|
"webOrigins": ["+"],
|
||||||
"notBefore": 0,
|
"notBefore": 0,
|
||||||
"bearerOnly": false,
|
"bearerOnly": false,
|
||||||
|
|
|
@ -620,7 +620,15 @@
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"alwaysDisplayInConsole": false,
|
"alwaysDisplayInConsole": false,
|
||||||
"clientAuthenticatorType": "client-secret",
|
"clientAuthenticatorType": "client-secret",
|
||||||
"redirectUris": ["urn:ietf:wg:oauth:2.0:oob", "http://localhost:5173/*", "http://localhost:5173", "http://localhost/*", "http://localhost", "https://sel2-1.ugent.be/*", "https://sel2-1.ugent.be"],
|
"redirectUris": [
|
||||||
|
"urn:ietf:wg:oauth:2.0:oob",
|
||||||
|
"http://localhost:5173/*",
|
||||||
|
"http://localhost:5173",
|
||||||
|
"http://localhost/*",
|
||||||
|
"http://localhost",
|
||||||
|
"https://sel2-1.ugent.be/*",
|
||||||
|
"https://sel2-1.ugent.be"
|
||||||
|
],
|
||||||
"webOrigins": ["+"],
|
"webOrigins": ["+"],
|
||||||
"notBefore": 0,
|
"notBefore": 0,
|
||||||
"bearerOnly": false,
|
"bearerOnly": false,
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
export const apiConfig = {
|
export const apiConfig = {
|
||||||
baseUrl: (window.location.hostname === "localhost" && !(window.location.port === '80' || window.location.port === '')) ? "http://localhost:3000/api" : window.location.origin + "/api",
|
baseUrl:
|
||||||
|
window.location.hostname === "localhost" && !(window.location.port === "80" || window.location.port === "")
|
||||||
|
? "http://localhost:3000/api"
|
||||||
|
: window.location.origin + "/api",
|
||||||
};
|
};
|
||||||
|
|
||||||
export const loginRoute = "/login";
|
export const loginRoute = "/login";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue