Skip to content
Snippets Groups Projects
Unverified Commit 3d7e506f authored by Bekerle, Patrizio's avatar Bekerle, Patrizio :fire:
Browse files

Revert "Integrate auth property into dbp-knowledge-base-web-page-element-view" 

This reverts commit 4bf5288d.
parent 4bf5288d
No related branches found
No related tags found
No related merge requests found
Pipeline #16452 failed
Stage: test
Stage: deploy
Show whitespace changes
Inline Side-by-side
Showing
with 18 additions and 24 deletions
packages/knowledge-base-web-page-element-view/README.md
+ 0
− 2
View file @ 3d7e506f
...@@ -23,8 +23,6 @@ npm i @dbp-toolkit/knowledge-base-web-page-element-view ...@@ -23,8 +23,6 @@ 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>` - 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 - `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>` - 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 ## Local development
......
packages/knowledge-base-web-page-element-view/assets/index.html
+ 1
− 1
View file @ 3d7e506f
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</style> </style>
<body> <body>
<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> <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>
</body> </body>
</html> </html>
packages/knowledge-base-web-page-element-view/src/dbp-knowledge-base-web-page-element-view-demo.js
+ 4
− 4
View file @ 3d7e506f
...@@ -86,23 +86,23 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(DBP ...@@ -86,23 +86,23 @@ export class KnowledgeBaseWebPageElementViewDemo extends ScopedElementsMixin(DBP
<div class="container"> <div class="container">
<h2 class="subtitle">Deutsch</h2> <h2 class="subtitle">Deutsch</h2>
<p>Ein erster Schritt</p> <p>Ein erster Schritt</p>
<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> <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>
</div> </div>
<div class="container"> <div class="container">
<h2 class="subtitle">Englisch</h2> <h2 class="subtitle">Englisch</h2>
<p>A first step</p> <p>A first step</p>
<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> <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>
</div> </div>
<hr> <hr>
<div class="container"> <div class="container">
<p>mit Text in der WebComponent:</p> <p>mit Text in der WebComponent:</p>
<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> <dbp-knowledge-base-web-page-element-view lang="${this.lang}" value="abc/def/xyz" text="FAQ"></dbp-knowledge-base-web-page-element-view>
</div> </div>
<hr> <hr>
<div class="container"> <div class="container">
<p>ohne Text in der WebComponent:</p> <p>ohne Text in der WebComponent:</p>
Kontaktieren Sie uns unter... Kontaktieren Sie uns unter...
<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> <dbp-knowledge-base-web-page-element-view class="opt" lang="${this.lang}" value="abc/def/klm"></dbp-knowledge-base-web-page-element-view>
</div> </div>
</section> </section>
`; `;
......
packages/knowledge-base-web-page-element-view/src/knowledge-base-web-page-element-view.js
+ 4
− 7
View file @ 3d7e506f
import {i18n} from './i18n'; import {i18n} from './i18n';
import {html} from 'lit-element'; import {html, LitElement} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import {MiniSpinner} from '@dbp-toolkit/common'; import {MiniSpinner} from '@dbp-toolkit/common';
import * as commonUtils from "@dbp-toolkit/common/utils"; import * as commonUtils from "@dbp-toolkit/common/utils";
import {unsafeHTML} from 'lit-html/directives/unsafe-html.js'; import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element";
/** /**
* KnowledgeBaseWebPageElementView web component * KnowledgeBaseWebPageElementView web component
*/ */
export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(AdapterLitElement) { export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(LitElement) {
constructor() { constructor() {
super(); super();
this.lang = 'de'; this.lang = 'de';
...@@ -22,7 +21,6 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(Adapter ...@@ -22,7 +21,6 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(Adapter
//this.css = 'kb.css'; //this.css = 'kb.css';
this.text = ''; this.text = '';
this.class = ''; this.class = '';
this.auth = {};
} }
static get scopedElements() { static get scopedElements() {
...@@ -48,7 +46,6 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(Adapter ...@@ -48,7 +46,6 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(Adapter
error: { type: String, attribute: false}, error: { type: String, attribute: false},
//css: { type: String }, //css: { type: String },
text: { type: String }, text: { type: String },
auth: { type: Object },
}; };
} }
...@@ -56,7 +53,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(Adapter ...@@ -56,7 +53,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(Adapter
* Loads the data from the web page element * Loads the data from the web page element
*/ */
loadWebPageElement() { loadWebPageElement() {
if (this.auth.token === undefined || this.auth.token === "") { if (window.DBPAuthToken === undefined || window.DBPAuthToken === "") {
return; return;
} }
...@@ -69,7 +66,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(Adapter ...@@ -69,7 +66,7 @@ export class KnowledgeBaseWebPageElementView extends ScopedElementsMixin(Adapter
fetch(apiUrl, { fetch(apiUrl, {
headers: { headers: {
'Content-Type': 'application/ld+json', 'Content-Type': 'application/ld+json',
'Authorization': 'Bearer ' + this.auth.token, 'Authorization': 'Bearer ' + window.DBPAuthToken,
}, },
}) })
.then(function (res) { .then(function (res) {
......
packages/person-profile/src/person-profile.js
+ 1
− 1
View file @ 3d7e506f
...@@ -56,7 +56,7 @@ export class PersonProfile extends DBPLitElement { ...@@ -56,7 +56,7 @@ export class PersonProfile extends DBPLitElement {
fetch(apiUrl, { fetch(apiUrl, {
headers: { headers: {
'Content-Type': 'application/ld+json', 'Content-Type': 'application/ld+json',
'Authorization': 'Bearer ' + this.auth.token, 'Authorization': 'Bearer ' + window.DBPAuthToken,
}, },
}) })
.then(response => response.json()) .then(response => response.json())
......
packages/person-select/src/person-select.js
+ 2
− 2
View file @ 3d7e506f
...@@ -156,7 +156,7 @@ export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) { ...@@ -156,7 +156,7 @@ export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) {
url: apiUrl, url: apiUrl,
contentType: "application/ld+json", contentType: "application/ld+json",
beforeSend: function (jqXHR) { beforeSend: function (jqXHR) {
jqXHR.setRequestHeader('Authorization', 'Bearer ' + that.auth.token); jqXHR.setRequestHeader('Authorization', 'Bearer ' + window.DBPAuthToken);
that.isSearching = true; that.isSearching = true;
}, },
data: function (params) { data: function (params) {
...@@ -223,7 +223,7 @@ export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) { ...@@ -223,7 +223,7 @@ export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) {
fetch(apiUrl, { fetch(apiUrl, {
headers: { headers: {
'Content-Type': 'application/ld+json', 'Content-Type': 'application/ld+json',
'Authorization': 'Bearer ' + this.auth.token, 'Authorization': 'Bearer ' + this.auth.token || window.DBPAuthToken,
}, },
}) })
.then(result => { .then(result => {
......
toolkit-showcase/assets/check-in-place-select.metadata.json
+ 1
− 1
View file @ 3d7e506f
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
"de": "Ort Web Component", "de": "Ort Web Component",
"en": "Check-in place select web component" "en": "Check-in place select web component"
}, },
"subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth" "subscribe": "lang:lang,entry-point-url:entry-point-url"
} }
toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
+ 0
− 1
View file @ 3d7e506f
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
nextcloud-file-url="<%= nextcloudFileURL %>"> nextcloud-file-url="<%= nextcloudFileURL %>">
<<%= name %> <<%= name %>
src="<%= getUrl(name + '.topic.metadata.json') %>" src="<%= getUrl(name + '.topic.metadata.json') %>"
auth
base-path="<%= getUrl('') %>" base-path="<%= getUrl('') %>"
keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}' keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>" matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>"
......
toolkit-showcase/assets/file-handling.metadata.json
+ 1
− 1
View file @ 3d7e506f
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
"de": "Web Komponenten für file sink und file source. Für mehrere verschiedenen Quellen.", "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." "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,auth:auth" "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"
} }
toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
+ 1
− 1
View file @ 3d7e506f
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
"de": "Erlaubt das Einfügen von Webinhalten", "de": "Erlaubt das Einfügen von Webinhalten",
"en": "Allows the inserting of web content" "en": "Allows the inserting of web content"
}, },
"subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth" "subscribe": "lang:lang,entry-point-url:entry-point-url"
} }
toolkit-showcase/assets/person-profile.metadata.json
+ 1
− 1
View file @ 3d7e506f
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
"de": "Gemeinsame Web Components", "de": "Gemeinsame Web Components",
"en": "Person profile web components" "en": "Person profile web components"
}, },
"subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth" "subscribe": "lang:lang,entry-point-url:entry-point-url"
} }
toolkit-showcase/assets/person-select.metadata.json
+ 1
− 1
View file @ 3d7e506f
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
"de": "Erlaubt das Suchen von Personen", "de": "Erlaubt das Suchen von Personen",
"en": "Allows searching for persons" "en": "Allows searching for persons"
}, },
"subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth" "subscribe": "lang:lang,entry-point-url:entry-point-url"
} }
toolkit-showcase/assets/qr-code-scanner.metadata.json
+ 1
− 1
View file @ 3d7e506f
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
"de": "Scannt Qr Codes", "de": "Scannt Qr Codes",
"en": "Scans Qr Codes" "en": "Scans Qr Codes"
}, },
"subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth" "subscribe": "lang:lang,entry-point-url:entry-point-url"
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment