diff --git a/app-template/index.html b/app-template/index.html index aacddc561937f3b422ddc6c91cfc67f4d3ddec99..5dda7a1f04e12fdc07499a9aae6e7dae627bd11b 100644 --- a/app-template/index.html +++ b/app-template/index.html @@ -65,7 +65,7 @@ html-overrides="global-override" src="/app/dbp-signature.topic.metadata.json" base-path="/" - keycloak-config='{"url": "https://auth-dev.tugraz.at/auth", "realm": "tugraz", "clientId": "auth-dev-mw-frontend-local", "silentCheckSsoRedirectUri": "/silent-check-sso.html"}' + keycloak-config='{"url": "https://auth-dev.tugraz.at/auth", "realm": "tugraz-vpu", "clientId": "auth-dev-mw-frontend-local", "silentCheckSsoRedirectUri": "/silent-check-sso.html"}' env='local' ><dbp-loading-spinner></dbp-loading-spinner> <template slot="name"> diff --git a/app.config.js b/app.config.js index 18ec963e1fda109523aa65a81418be9321505335..7ddd1d97be9273fd64a792570f162f5c8bfd9fab 100644 --- a/app.config.js +++ b/app.config.js @@ -3,6 +3,7 @@ export default { basePath: '/dist/', entryPointURL: 'http://127.0.0.1:8000', keyCloakBaseURL: 'https://auth-dev.tugraz.at/auth', + keyCloakRealm: 'tugraz-vpu', keyCloakClientId: 'auth-dev-mw-frontend-local', matomoUrl: 'https://analytics.tugraz.at/', matomoSiteId: 131, @@ -15,6 +16,7 @@ export default { basePath: '/dist/', entryPointURL: 'http://bs-local.com:8000', keyCloakBaseURL: 'https://auth-test.tugraz.at/auth', + keyCloakRealm: 'tugraz-vpu', keyCloakClientId: 'auth-dev-mw-frontend-local', matomoUrl: 'https://analytics.tugraz.at/', matomoSiteId: 131, @@ -27,6 +29,7 @@ export default { basePath: '/apps/signature/', entryPointURL: 'https://mw-dev.tugraz.at', keyCloakBaseURL: 'https://auth-dev.tugraz.at/auth', + keyCloakRealm: 'tugraz-vpu', keyCloakClientId: 'esign-dev_tugraz_at-ESIGN', matomoUrl: 'https://analytics.tugraz.at/', matomoSiteId: 131, @@ -39,6 +42,7 @@ export default { basePath: '/apps/signature/', entryPointURL: 'https://api-demo.tugraz.at', keyCloakBaseURL: 'https://auth-test.tugraz.at/auth', + keyCloakRealm: 'tugraz', keyCloakClientId: 'esig-demo_tugraz_at-ESIG', matomoUrl: 'https://analytics.tugraz.at/', matomoSiteId: 131, @@ -51,6 +55,7 @@ export default { basePath: '/', entryPointURL: 'https://api.tugraz.at', keyCloakBaseURL: 'https://auth.tugraz.at/auth', + keyCloakRealm: 'tugraz', keyCloakClientId: 'esig_tugraz_at', matomoUrl: 'https://analytics.tugraz.at/', matomoSiteId: 137, diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs index 482da3e9be6103948b49df1779b8329d77116406..ebad63d971a26e52c9dcbd6046d2881267f29fc8 100644 --- a/assets/dbp-signature.html.ejs +++ b/assets/dbp-signature.html.ejs @@ -76,7 +76,7 @@ html-overrides="global-override" src="<%= getUrl(name + '.topic.metadata.json') %>" base-path="<%= getUrl('') %>" - keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}' + keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "<%= keyCloakRealm %>", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}' matomo-url='<%= matomoUrl %>' matomo-site-id='<%= matomoSiteId %>' git-info='<%= buildInfo.info %>' diff --git a/examples/dbp-official-signature-pdf-upload/index.html b/examples/dbp-official-signature-pdf-upload/index.html index 3925306815544f58a78fe2debfa27a9a6ec01737..f53a0a3afcd133cac58287d06860544bd5f695a5 100644 --- a/examples/dbp-official-signature-pdf-upload/index.html +++ b/examples/dbp-official-signature-pdf-upload/index.html @@ -45,7 +45,7 @@ <dbp-provider auth requested-login-status analytics-event lang="de" entry-point-url="https://mw-dev.tugraz.at"> <dbp-auth-keycloak client-id="auth-dev-mw-frontend-local" idp-hint="" - load-person="" realm="tugraz" scope="" + load-person="" realm="tugraz-vpu" scope="" silent-check-sso-redirect-uri="./silent-check-sso.html" subscribe="requested-login-status,entry-point-url,lang" try-login="" diff --git a/examples/dbp-qualified-signature-pdf-upload/index.html b/examples/dbp-qualified-signature-pdf-upload/index.html index f602c88dd2e34acfb38f500e72f8547e02c465ab..b2867331bd82d5f5f826b1df80b9dd2762a272b9 100644 --- a/examples/dbp-qualified-signature-pdf-upload/index.html +++ b/examples/dbp-qualified-signature-pdf-upload/index.html @@ -45,7 +45,7 @@ <dbp-provider auth requested-login-status analytics-event lang="de" entry-point-url="https://mw-dev.tugraz.at"> <dbp-auth-keycloak client-id="auth-dev-mw-frontend-local" idp-hint="" - load-person="" realm="tugraz" scope="" + load-person="" realm="tugraz-vpu" scope="" silent-check-sso-redirect-uri="./silent-check-sso.html" subscribe="requested-login-status,entry-point-url,lang" try-login="" diff --git a/examples/dbp-signature/index.html b/examples/dbp-signature/index.html index b279a45fdc45cdca557382fcff1f8305ff03ceb1..0ac36d51fe87d36ef90f1e9eda7c6c5a3872d548 100644 --- a/examples/dbp-signature/index.html +++ b/examples/dbp-signature/index.html @@ -93,7 +93,7 @@ clipboard-files src="https://unpkg.com/@dbp-topics/signature@1.0.11/dist/dbp-signature.topic.metadata.json" base-path="/" - keycloak-config='{"url": "https://auth-dev.tugraz.at/auth", "realm": "tugraz", "clientId": "auth-dev-mw-frontend-local", "silentCheckSsoRedirectUri": "./silent-check-sso.html"}' + keycloak-config='{"url": "https://auth-dev.tugraz.at/auth", "realm": "tugraz-vpu", "clientId": "auth-dev-mw-frontend-local", "silentCheckSsoRedirectUri": "./silent-check-sso.html"}' matomo-url='https://analytics.tugraz.at/' matomo-site-id='131' env='local' diff --git a/rollup.config.js b/rollup.config.js index 1854a6f743973a39a13142a975c45820cdd93b56..4d765da2998cc367664e3024535e503b47c44fad 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -35,6 +35,7 @@ if (appEnv in appConfig) { entryPointURL: 'https://test', keyCloakBaseURL: 'https://test', keyCloakClientId: '', + keyCloakRealm: '', matomoUrl: '', matomoSiteId: -1, nextcloudBaseURL: 'https://test', @@ -129,6 +130,7 @@ export default (async () => { nextcloudName: config.nextcloudName, keyCloakBaseURL: config.keyCloakBaseURL, keyCloakClientId: config.keyCloakClientId, + keyCloakRealm: config.keyCloakRealm, CSP: config.CSP, matomoUrl: config.matomoUrl, matomoSiteId: config.matomoSiteId,