Skip to content
Snippets Groups Projects
Commit 2d44527e authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Don't hardcode keycloak related urls/config

Fetch it from the common environ
parent 4ff13bae
No related branches found
No related tags found
No related merge requests found
import {i18n} from './i18n.js'; import {i18n} from './i18n.js';
import {html, css} from 'lit-element'; import {html, css} from 'lit-element';
import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
import JSONLD from 'vpu-common/jsonld' import JSONLD from 'vpu-common/jsonld';
import * as commonUtils from 'vpu-common/utils'; import * as commonUtils from 'vpu-common/utils';
import * as commonStyles from 'vpu-common/styles'; import * as commonStyles from 'vpu-common/styles';
import * as events from 'vpu-common/events.js'; import * as events from 'vpu-common/events.js';
...@@ -18,10 +18,19 @@ const LoginStatus = Object.freeze({ ...@@ -18,10 +18,19 @@ const LoginStatus = Object.freeze({
}); });
async function importKeycloak() { /**
const keycloakSrc = '//auth-dev.tugraz.at/auth/js/keycloak.min.js'; * Imports the keycloak JS API as if it was a module.
*
* @param baseUrl {string}
*/
async function importKeycloak(baseUrl) {
const keycloakSrc = baseUrl + '/js/keycloak.min.js';
await import(keycloakSrc); await import(keycloakSrc);
return window.Keycloak; if (importKeycloak._keycloakMod !== undefined)
return importKeycloak._keycloakMod;
importKeycloak._keycloakMod = {Keycloak: window.Keycloak};
delete window.Keycloak;
return importKeycloak._keycloakMod;
} }
...@@ -150,14 +159,16 @@ class VPUAuth extends VPULitElement { ...@@ -150,14 +159,16 @@ class VPUAuth extends VPULitElement {
loadKeycloak() { loadKeycloak() {
const that = this; const that = this;
const baseURL = commonUtils.setting('keyCloakBaseURL');
const realm = commonUtils.setting('keyCloakRealm');
if (!this.keyCloakInitCalled) { if (!this.keyCloakInitCalled) {
importKeycloak().then((Keycloak) => { importKeycloak(baseURL).then((module) => {
that.keyCloakInitCalled = true; that.keyCloakInitCalled = true;
that._keycloak = Keycloak({ that._keycloak = module.Keycloak({
url: 'https://auth-dev.tugraz.at/auth', url: baseURL,
realm: 'tugraz', realm: realm,
clientId: that.clientId, clientId: that.clientId,
}); });
......
common @ 9ed776cf
Subproject commit f5502b7a903ddd9bfbf966fafdae9cc3c4a2ed87 Subproject commit 9ed776cf9d9709cf4839dc6e66c0b7bac3143811
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment