From a1eb87acdba64b64f84a295262ebd99df917b64a Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Tue, 7 Jul 2020 13:03:43 +0200
Subject: [PATCH] Update auth/common
---
packages/data-table-view/src/data-table-view.js | 7 +++----
.../data-table-view/src/vpu-data-table-view-demo.js | 10 +++++-----
packages/data-table-view/vendor/auth | 2 +-
packages/data-table-view/vendor/common | 2 +-
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/packages/data-table-view/src/data-table-view.js b/packages/data-table-view/src/data-table-view.js
index cf9f154c..8a226071 100644
--- a/packages/data-table-view/src/data-table-view.js
+++ b/packages/data-table-view/src/data-table-view.js
@@ -316,10 +316,9 @@ export class DataTableView extends LitElement {
}
render() {
- commonUtils.initAssetBaseURL('vpu-data-table-view-src');
- let dt_css = commonUtils.getAssetURL('local/vpu-data-table-view/css/jquery.dataTables.min.css');
- let rs_css = commonUtils.getAssetURL('local/vpu-data-table-view/css/responsive.dataTables.min.css');
- let bt_css = commonUtils.getAssetURL('local/vpu-data-table-view/css/buttons.dataTables.min.css');
+ let dt_css = commonUtils.getAssetURL('vpu-data-table-view', 'css/jquery.dataTables.min.css');
+ let rs_css = commonUtils.getAssetURL('vpu-data-table-view', 'css/responsive.dataTables.min.css');
+ let bt_css = commonUtils.getAssetURL('vpu-data-table-view', 'css/buttons.dataTables.min.css');
return html`
<link rel="stylesheet" href="${dt_css}">
diff --git a/packages/data-table-view/src/vpu-data-table-view-demo.js b/packages/data-table-view/src/vpu-data-table-view-demo.js
index cd48ad2e..6ad31f9d 100644
--- a/packages/data-table-view/src/vpu-data-table-view-demo.js
+++ b/packages/data-table-view/src/vpu-data-table-view-demo.js
@@ -1,4 +1,4 @@
-import {Auth} from 'vpu-auth';
+import {AuthKeycloak, LoginButton} from 'vpu-auth';
import {DataTableView} from './data-table-view.js';
import {i18n} from './i18n';
import {css, html, LitElement} from 'lit-element';
@@ -16,7 +16,8 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) {
static get scopedElements() {
return {
'vpu-data-table-view': DataTableView,
- 'vpu-auth': Auth,
+ 'vpu-auth-keycloak': AuthKeycloak,
+ 'vpu-login-button': LoginButton,
};
}
@@ -136,7 +137,8 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) {
getAuthComponentHtml() {
return this.noAuth ? html`` : html`
<div class="content">
- <vpu-auth lang="${this.lang}" client-id="${commonUtils.setting('keyCloakClientId')}" load-person></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>
`;
}
@@ -151,8 +153,6 @@ class DataTableViewDemo extends ScopedElementsMixin(LitElement) {
}
render() {
- commonUtils.initAssetBaseURL('vpu-data-table-view-src');
-
return html`
<style>
.box {
diff --git a/packages/data-table-view/vendor/auth b/packages/data-table-view/vendor/auth
index b9fbe487..39d0e356 160000
--- a/packages/data-table-view/vendor/auth
+++ b/packages/data-table-view/vendor/auth
@@ -1 +1 @@
-Subproject commit b9fbe487a8a6117ae90a423a8ba318a0321bf51b
+Subproject commit 39d0e356c029e0f2e92233520660ce307d0741d5
diff --git a/packages/data-table-view/vendor/common b/packages/data-table-view/vendor/common
index 9c6dc1fd..63b49c3a 160000
--- a/packages/data-table-view/vendor/common
+++ b/packages/data-table-view/vendor/common
@@ -1 +1 @@
-Subproject commit 9c6dc1fd5e004eba32e31adf8e4485a26c345fe0
+Subproject commit 63b49c3a2eeae312b4a2aeec4cc2f7f0ee12b749
--
GitLab