From cef3b92646a3de16b0d1d26a094833c09286f19e Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 2 Jul 2020 16:18:26 +0200
Subject: [PATCH] Update auth/common
---
.../src/knowledge-base-web-page-element-view.js | 2 --
.../src/vpu-knowledge-base-web-page-element-view-demo.js | 9 +++++----
.../knowledge-base-web-page-element-view/vendor/auth | 2 +-
.../knowledge-base-web-page-element-view/vendor/common | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js b/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js
index 7991c14d..9fb9e6c6 100644
--- a/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js
+++ b/packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js
@@ -160,8 +160,6 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(VPULitE
}
render() {
- commonUtils.initAssetBaseURL('vpu-knowledge-base-web-page-element-view-src');
-
return html`
<style>
.kb {
diff --git a/packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view-demo.js b/packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view-demo.js
index 636b8901..fa0160d9 100644
--- a/packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view-demo.js
+++ b/packages/knowledge-base-web-page-element-view/src/vpu-knowledge-base-web-page-element-view-demo.js
@@ -1,7 +1,7 @@
import {i18n} from './i18n';
import {css, html, LitElement} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements';
-import {Auth} from 'vpu-auth';
+import {AuthKeycloak, LoginButton} from 'vpu-auth';
import {KnowledgeBaseWebPageElementView} from './knowledge-base-web-page-element-view.js';
import * as commonUtils from 'vpu-common/utils';
import * as commonStyles from 'vpu-common/styles';
@@ -16,7 +16,8 @@ class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(LitElement
static get scopedElements() {
return {
'vpu-knowledge-base-web-page-element-view' : KnowledgeBaseWebPageElementView,
- 'vpu-auth': Auth,
+ 'vpu-auth-keycloak': AuthKeycloak,
+ 'vpu-login-button': LoginButton,
};
}
@@ -61,13 +62,13 @@ class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(LitElement
getAuthComponentHtml() {
return this.noAuth ? html`` : html`
<div class="content">
- <vpu-auth lang="${this.lang}" client-id="${commonUtils.setting('keyCloakClientId')}" load-person remember-login></vpu-auth>
+ <vpu-auth-keycloak lang="${this.lang}" url="https://auth-dev.tugraz.at/auth" realm="tugraz" client-id="auth-dev-mw-frontend-local" load-person try-login></vpu-auth-keycloak>
+ <vpu-login-button lang="${this.lang}" show-image></vpu-login-button>
</div>
`;
}
render() {
- commonUtils.initAssetBaseURL('vpu-knowledge-base-web-page-element-view-src');
return html`
<section class="section">
<div class="container">
diff --git a/packages/knowledge-base-web-page-element-view/vendor/auth b/packages/knowledge-base-web-page-element-view/vendor/auth
index b9fbe487..39d0e356 160000
--- a/packages/knowledge-base-web-page-element-view/vendor/auth
+++ b/packages/knowledge-base-web-page-element-view/vendor/auth
@@ -1 +1 @@
-Subproject commit b9fbe487a8a6117ae90a423a8ba318a0321bf51b
+Subproject commit 39d0e356c029e0f2e92233520660ce307d0741d5
diff --git a/packages/knowledge-base-web-page-element-view/vendor/common b/packages/knowledge-base-web-page-element-view/vendor/common
index 9c6dc1fd..63b49c3a 160000
--- a/packages/knowledge-base-web-page-element-view/vendor/common
+++ b/packages/knowledge-base-web-page-element-view/vendor/common
@@ -1 +1 @@
-Subproject commit 9c6dc1fd5e004eba32e31adf8e4485a26c345fe0
+Subproject commit 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749
--
GitLab