diff --git a/assets/dbp-official-signature-pdf-upload.metadata.json b/assets/dbp-official-signature-pdf-upload.metadata.json index 7a487d584eff50e3e4bd4aa0e557b222d2fe000c..35abc31bc15ad82d1ca99cafa6a185335bfc6a3b 100644 --- a/assets/dbp-official-signature-pdf-upload.metadata.json +++ b/assets/dbp-official-signature-pdf-upload.metadata.json @@ -14,5 +14,5 @@ "de": "Erlaubt das Hochladen von PDF-Dokumenten, um sie mit einer Amtssignatur zu versehen", "en": "Allows upload of PDF-documents to officially sign them" }, - "subscribe": "lang:lang,entry-point-url:entry-point-url,nextcloud-web-app-password-url:nextcloud-web-app-password-url,nextcloud-webdav-url:nextcloud-webdav-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-web-app-password-url:nextcloud-web-app-password-url,nextcloud-webdav-url:nextcloud-webdav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker,auth:auth" } diff --git a/assets/dbp-qualified-signature-pdf-upload.metadata.json b/assets/dbp-qualified-signature-pdf-upload.metadata.json index ba42a8c41c7826e2087ae249ee99110816a1b155..9b5f6f48914ec72a115c02c1cfafc19c872649ca 100644 --- a/assets/dbp-qualified-signature-pdf-upload.metadata.json +++ b/assets/dbp-qualified-signature-pdf-upload.metadata.json @@ -14,5 +14,5 @@ "de": "Erlaubt das Hochladen von PDF-Dokumenten, um sie mit einer persönlichen elektronischen Signatur zu versehen", "en": "Allows upload of PDF-documents to personally sign them" }, - "subscribe": "lang:lang,entry-point-url:entry-point-url,nextcloud-web-app-password-url:nextcloud-web-app-password-url,nextcloud-webdav-url:nextcloud-webdav-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-web-app-password-url:nextcloud-web-app-password-url,nextcloud-webdav-url:nextcloud-webdav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker,auth:auth" } diff --git a/assets/dbp-signature-verification-full.metadata.json b/assets/dbp-signature-verification-full.metadata.json index 40059518cad2f8256b9d2d6b5401468472ebf61c..672fc0e7a4a5d0b8b18ab0a6af6d5f4bc11e61f1 100644 --- a/assets/dbp-signature-verification-full.metadata.json +++ b/assets/dbp-signature-verification-full.metadata.json @@ -14,5 +14,5 @@ "de": "Erlaubt das Verifizieren von signierten PDF-Dokumenten", "en": "Allows verification of signed PDF-documents" }, - "subscribe": "lang:lang,entry-point-url:entry-point-url,nextcloud-web-app-password-url:nextcloud-web-app-password-url,nextcloud-webdav-url:nextcloud-webdav-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-web-app-password-url:nextcloud-web-app-password-url,nextcloud-webdav-url:nextcloud-webdav-url,nextcloud-name:nextcloud-name,nextcloud-file-url:nextcloud-file-url,show-nextcloud-file-picker:show-nextcloud-file-picker,auth:auth" } diff --git a/assets/dbp-signature-verification.metadata.json b/assets/dbp-signature-verification.metadata.json index 926c19294d42a399c2fb13bfb51b1443c11863db..e8393a0816e8a1d52964a6f381e4d0d3680a139c 100644 --- a/assets/dbp-signature-verification.metadata.json +++ b/assets/dbp-signature-verification.metadata.json @@ -14,5 +14,5 @@ "de": "Erlaubt das Verifizieren von signierten PDF-Dokumenten", "en": "Allows verification of signed PDF-documents" }, - "subscribe": "lang:lang,entry-point-url:entry-point-url" + "subscribe": "lang:lang,entry-point-url:entry-point-url,auth:auth" } diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs index c8d50ad329d9bf3ee769a2d61031e6ce68682e2a..b73a0ff4461ce11cb2ba965e781d2345fd377f63 100644 --- a/assets/dbp-signature.html.ejs +++ b/assets/dbp-signature.html.ejs @@ -63,6 +63,7 @@ nextcloud-file-url="<%= nextcloudFileURL %>"> <<%= name %> subscribe="lang:lang,entry-point-url:entry-point-url" + auth src="<%= getUrl(name + '.topic.metadata.json') %>" base-path="<%= getUrl('') %>" keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}' diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js index 6b39cc43f7f037cec9d5f9d47e7fd8c92994e3fe..04625ec48bbe3adc5ca3148056f12bbb0d779731 100644 --- a/src/dbp-qualified-signature-pdf-upload.js +++ b/src/dbp-qualified-signature-pdf-upload.js @@ -318,7 +318,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle fetch(apiUrl, { headers: { 'Content-Type': 'application/ld+json', - 'Authorization': 'Bearer ' + window.DBPAuthToken, + 'Authorization': 'Bearer ' + that.auth.token, }, }) .then(result => { diff --git a/src/dbp-signature-lit-element.js b/src/dbp-signature-lit-element.js index c9882105ebbee719bd745ab08f21f4f9e4260f1f..2bf3edff5b5451a0bb22c111a9ce152a2b88a043 100644 --- a/src/dbp-signature-lit-element.js +++ b/src/dbp-signature-lit-element.js @@ -5,6 +5,14 @@ import {AdapterLitElement} from "@dbp-toolkit/provider/src/adapter-lit-element"; export class DBPSignatureBaseLitElement extends AdapterLitElement { constructor() { super(); + this.auth = {}; + } + + static get properties() { + return { + ...super.properties, + auth: { type: Object }, + }; } _(selector) { @@ -48,7 +56,7 @@ export class DBPSignatureBaseLitElement extends AdapterLitElement { isLoading() { if (this._loginStatus === "logged-out") return false; - return (!this.isLoggedIn() && window.DBPAuthToken !== undefined); + return (!this.isLoggedIn() && this.auth.token !== undefined); } } @@ -157,7 +165,7 @@ export default class DBPSignatureLitElement extends DBPSignatureBaseLitElement { await fetch(url, { method: 'POST', headers: { - 'Authorization': 'Bearer ' + window.DBPAuthToken, + 'Authorization': 'Bearer ' + this.auth.token, }, body: formData })