diff --git a/packages/knowledge-base-web-page-element-view/README.md b/packages/knowledge-base-web-page-element-view/README.md
index 93086003f1770e11bf3634dedee9dd9b6f73a80e..82a96017d95f50635d4e0afdd2edc721cce6a0d6 100644
--- a/packages/knowledge-base-web-page-element-view/README.md
+++ b/packages/knowledge-base-web-page-element-view/README.md
@@ -23,6 +23,8 @@ npm i @dbp-toolkit/knowledge-base-web-page-element-view
- example `<dbp-knowledge-base-web-page-element-view entry-point-url="http://127.0.0.1:8000"></dbp-knowledge-base-web-page-element-view>`
- `text` (optional): text to click to show the information loaded from the webpage
- example `<dbp-knowledge-base-web-page-element-view text="Click me to show more information"></dbp-knowledge-base-web-page-element-view>`
+- `auth` object: you need to set that object property for the auth token
+ - example auth property: `{token: "THE_BEARER_TOKEN"}`
## Local development
diff --git a/packages/knowledge-base-web-page-element-view/assets/index.html b/packages/knowledge-base-web-page-element-view/assets/index.html
index bc9b5c5d0ba29a1303eb817e5a93d12be3fe3a76..bd187181e4406404da0690ae98840c453a63a1b1 100644
--- a/packages/knowledge-base-web-page-element-view/assets/index.html
+++ b/packages/knowledge-base-web-page-element-view/assets/index.html
@@ -14,7 +14,7 @@
</style>
<body>
-<dbp-knowledge-base-web-page-element-view-demo lang="de" entry-point-url="http://127.0.0.1:8000"></dbp-knowledge-base-web-page-element-view-demo>
+<dbp-knowledge-base-web-page-element-view-demo auth lang="de" entry-point-url="http://127.0.0.1:8000"></dbp-knowledge-base-web-page-element-view-demo>
</body>
</html>
diff --git a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
index d72d83d88b3e1cc7aafbb2c73386c6c2eddd4571..d4ad245daff9437dceee12f1be1df30d8eaba783 100644
--- a/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
+++ b/packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
@@ -86,23 +86,23 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(DBP
<div class="container">
<h2 class="subtitle">Deutsch</h2>
<p>Ein erster Schritt</p>
- <dbp-knowledge-base-web-page-element-view lang="de" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></dbp-knowledge-base-web-page-element-view>
+ <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" lang="de" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Ein Buch ausleihen"></dbp-knowledge-base-web-page-element-view>
</div>
<div class="container">
<h2 class="subtitle">Englisch</h2>
<p>A first step</p>
- <dbp-knowledge-base-web-page-element-view lang="en" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></dbp-knowledge-base-web-page-element-view>
+ <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" lang="en" entry-point-url="${this.entryPointUrl}" value="bedienstete/bibliothek/buch-ausleihen" text="Borrow a book"></dbp-knowledge-base-web-page-element-view>
</div>
<hr>
<div class="container">
<p>mit Text in der WebComponent:</p>
- <dbp-knowledge-base-web-page-element-view lang="${this.lang}" value="abc/def/xyz" text="FAQ"></dbp-knowledge-base-web-page-element-view>
+ <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" lang="${this.lang}" value="abc/def/xyz" text="FAQ"></dbp-knowledge-base-web-page-element-view>
</div>
<hr>
<div class="container">
<p>ohne Text in der WebComponent:</p>
Kontaktieren Sie uns unter...
- <dbp-knowledge-base-web-page-element-view class="opt" lang="${this.lang}" value="abc/def/klm"></dbp-knowledge-base-web-page-element-view>
+ <dbp-knowledge-base-web-page-element-view subscribe="auth:auth" class="opt" lang="${this.lang}" value="abc/def/klm"></dbp-knowledge-base-web-page-element-view>
</div>
</section>
`;
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 c56aac2ffeb37cd8e0a5c342201b43ca2358f284..9b34f065e3f921b2b545fc24db7d9753d728023f 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
@@ -1,14 +1,15 @@
import {i18n} from './i18n';
-import {html, LitElement} from 'lit-element';
+import {html} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import {MiniSpinner} from '@dbp-toolkit/common';
import * as commonUtils from "@dbp-toolkit/common/utils";
import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
+import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
/**
* KnowledgeBaseWebPageElementView web component
*/
-export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElement) {
+export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(AdapterLitElement) {
constructor() {
super();
this.lang = 'de';
@@ -21,6 +22,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElem
//this.css = 'kb.css';
this.text = '';
this.class = '';
+ this.auth = {};
}
static get scopedElements() {
@@ -46,6 +48,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElem
error: { type: String, attribute: false},
//css: { type: String },
text: { type: String },
+ auth: { type: Object },
};
}
@@ -53,7 +56,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElem
* Loads the data from the web page element
*/
loadWebPageElement() {
- if (window.DBPAuthToken === undefined || window.DBPAuthToken === "") {
+ if (this.auth.token === undefined || this.auth.token === "") {
return;
}
@@ -66,7 +69,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElem
fetch(apiUrl, {
headers: {
'Content-Type': 'application/ld+json',
- 'Authorization': 'Bearer ' + window.DBPAuthToken,
+ 'Authorization': 'Bearer ' + this.auth.token,
},
})
.then(function (res) {
diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/person-profile.js
index cffea426b5d4a3792198dbfadb89e2fec9c41265..03e47b90dec90a6eb87b597e2f6af50f7c1e4203 100644
--- a/packages/person-profile/src/person-profile.js
+++ b/packages/person-profile/src/person-profile.js
@@ -56,7 +56,7 @@ export class PersonProfile extends DBPLitElement {
fetch(apiUrl, {
headers: {
'Content-Type': 'application/ld+json',
- 'Authorization': 'Bearer ' + window.DBPAuthToken,
+ 'Authorization': 'Bearer ' + this.auth.token,
},
})
.then(response => response.json())
diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js
index 8811f957fb9e02c3276b0e07b1c4d0258c8ea057..d105d7648e59ea4fa49b47fd7e6edbeaa425d218 100644
--- a/packages/person-select/src/person-select.js
+++ b/packages/person-select/src/person-select.js
@@ -156,7 +156,7 @@ export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) {
url: apiUrl,
contentType: "application/ld+json",
beforeSend: function (jqXHR) {
- jqXHR.setRequestHeader('Authorization', 'Bearer ' + window.DBPAuthToken);
+ jqXHR.setRequestHeader('Authorization', 'Bearer ' + that.auth.token);
that.isSearching = true;
},
data: function (params) {
@@ -223,7 +223,7 @@ export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) {
fetch(apiUrl, {
headers: {
'Content-Type': 'application/ld+json',
- 'Authorization': 'Bearer ' + this.auth.token || window.DBPAuthToken,
+ 'Authorization': 'Bearer ' + this.auth.token,
},
})
.then(result => {
diff --git a/toolkit-showcase/assets/check-in-place-select.metadata.json b/toolkit-showcase/assets/check-in-place-select.metadata.json
index cc76f8534372f6f13e4807a9fd6f55f2331987a0..c3abf5527b49826bd9a24ae4ceb2343c8c665317 100644
--- a/toolkit-showcase/assets/check-in-place-select.metadata.json
+++ b/toolkit-showcase/assets/check-in-place-select.metadata.json
@@ -14,5 +14,5 @@
"de": "Ort Web Component",
"en": "Check-in place select web component"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth"
}
diff --git a/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs b/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
index 7c9f567a49a1045b890a9eea462b826528d36692..d4a9e251a056609aed2eb51a5415ffb1de41c9a7 100644
--- a/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
+++ b/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
@@ -61,6 +61,7 @@
nextcloud-file-url="<%= nextcloudFileURL %>">
<<%= name %>
src="<%= getUrl(name + '.topic.metadata.json') %>"
+ auth
base-path="<%= getUrl('') %>"
keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>"
diff --git a/toolkit-showcase/assets/file-handling.metadata.json b/toolkit-showcase/assets/file-handling.metadata.json
index edd171f0fa22a6877a07b6c6c9eb73b17c068e5e..005f2f637c7f3a2e2936b45ff4f4f5cd17ccbcc0 100644
--- a/toolkit-showcase/assets/file-handling.metadata.json
+++ b/toolkit-showcase/assets/file-handling.metadata.json
@@ -14,5 +14,5 @@
"de": "Web Komponenten für file sink und file source. Für mehrere verschiedenen Quellen.",
"en": "Web components for file sink and file source. For several different sources."
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url,nextcloud-auth-url:nextcloud-auth-url,nextcloud-web-dav-url:nextcloud-web-dav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker"
+ "subscribe": "lang:lang,entry-point-url:entry-point-url,nextcloud-auth-url:nextcloud-auth-url,nextcloud-web-dav-url:nextcloud-web-dav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker,auth:auth"
}
diff --git a/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json b/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
index d5f59a3035b93a24ed79185f4c1a76e0f9ec5eb0..e60976c0f6f18569a1c1e40cd5889ecc87322510 100644
--- a/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
+++ b/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
@@ -14,5 +14,5 @@
"de": "Erlaubt das Einfügen von Webinhalten",
"en": "Allows the inserting of web content"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth"
}
diff --git a/toolkit-showcase/assets/person-profile.metadata.json b/toolkit-showcase/assets/person-profile.metadata.json
index 93e534167268e333dea21a4645e382c3d7c38943..d6732f3e67d6645a3efa995155bdd62e322fca31 100644
--- a/toolkit-showcase/assets/person-profile.metadata.json
+++ b/toolkit-showcase/assets/person-profile.metadata.json
@@ -14,5 +14,5 @@
"de": "Gemeinsame Web Components",
"en": "Person profile web components"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth"
}
diff --git a/toolkit-showcase/assets/person-select.metadata.json b/toolkit-showcase/assets/person-select.metadata.json
index 3c67077d64be87597189cea28172fa6bb1c948b5..4ad3e1169f708012e6e604d8876a214309f308f9 100644
--- a/toolkit-showcase/assets/person-select.metadata.json
+++ b/toolkit-showcase/assets/person-select.metadata.json
@@ -14,5 +14,5 @@
"de": "Erlaubt das Suchen von Personen",
"en": "Allows searching for persons"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth"
}
diff --git a/toolkit-showcase/assets/qr-code-scanner.metadata.json b/toolkit-showcase/assets/qr-code-scanner.metadata.json
index c58d7eda4684e958ce73de0507d6007dfa796ee4..5b9621348a30425ce9d31a3699008cd256d4e31c 100644
--- a/toolkit-showcase/assets/qr-code-scanner.metadata.json
+++ b/toolkit-showcase/assets/qr-code-scanner.metadata.json
@@ -14,5 +14,5 @@
"de": "Scannt Qr Codes",
"en": "Scans Qr Codes"
},
- "subscribe": "lang:lang,entry-point-url:entry-point-url"
+ "subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth"
}