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

Migrate from nextcloud constants to attributes and subscribes (#32)

parent 1634d288
No related branches found
No related tags found
No related merge requests found
Pipeline #15779 passed
Stage: test
Stage: e2e-stage1
Stage: e2e-stage2
Stage: e2e-stage3
Show whitespace changes
Inline Side-by-side
Showing
with 53 additions and 33 deletions
assets/dbp-official-signature-pdf-upload.metadata.json
+ 1
− 1
View file @ 193bc09a
......@@ -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:global-entry-point-url"
"subscribe": "lang:lang,entry-point-url:global-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"
}
assets/dbp-qualified-signature-pdf-upload.metadata.json
+ 1
− 1
View file @ 193bc09a
......@@ -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:global-entry-point-url"
"subscribe": "lang:lang,entry-point-url:global-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"
}
assets/dbp-signature-verification-full.metadata.json
+ 1
− 1
View file @ 193bc09a
......@@ -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:global-entry-point-url"
"subscribe": "lang:lang,entry-point-url:global-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"
}
assets/dbp-signature.html.ejs
+ 1
− 1
View file @ 193bc09a
......@@ -55,7 +55,7 @@
<body>
<dbp-provider id="root"
init="lang=de,global-entry-point-url=<%= entryPointURL %>">
init="lang=de,global-entry-point-url=<%= entryPointURL %>,nextcloud-web-app-password-url=<%= nextcloudWebAppPasswordURL %>,nextcloud-webdav-url=<%= nextcloudWebDavURL %>,nextcloud-name=<%= nextcloudName %>,nextcloud-file-url=<%= nextcloudFileURL %>">
<<%= name %>
subscribe="lang:lang,entry-point-url:global-entry-point-url"
src="<%= getUrl(name + '.topic.metadata.json') %>"
......
rollup.config.js
+ 4
− 4
View file @ 193bc09a
......@@ -223,11 +223,7 @@ export default (async () => {return {
consts({
environment: build,
buildinfo: getBuildInfo(),
nextcloudWebAppPasswordURL: nextcloudWebAppPasswordURL,
nextcloudWebDavURL: nextcloudWebDavURL,
nextcloudBaseURL: nextcloudBaseURL,
nextcloudFileURL: nextcloudFileURL,
nextcloudName: nextcloudName,
}),
emitEJS({
src: 'assets',
......@@ -241,7 +237,11 @@ export default (async () => {return {
},
name: pkg.name,
entryPointURL: entryPointURL,
nextcloudWebAppPasswordURL: nextcloudWebAppPasswordURL,
nextcloudWebDavURL: nextcloudWebDavURL,
nextcloudBaseURL: nextcloudBaseURL,
nextcloudFileURL: nextcloudFileURL,
nextcloudName: nextcloudName,
keyCloakServer: keyCloakServer,
keyCloakBaseURL: keyCloakBaseURL,
keyCloakClientId: keyCloakClientId,
......
src/dbp-official-signature-pdf-upload.js
+ 16
− 9
View file @ 193bc09a
......@@ -12,9 +12,6 @@ import {classMap} from 'lit-html/directives/class-map.js';
import {FileSource} from '@dbp-toolkit/file-handling';
import JSONLD from "@dbp-toolkit/common/jsonld";
import {TextSwitch} from './textswitch.js';
import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL';
import nextcloudWebDavURL from 'consts:nextcloudWebDavURL';
import nextcloudName from 'consts:nextcloudName';
import {FileSink} from "@dbp-toolkit/file-handling";
import {name as pkgName} from './../package.json';
import {getPDFSignatureCount} from './utils.js';
......@@ -27,6 +24,10 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
super();
this.lang = i18n.language;
this.entryPointUrl = commonUtils.getAPiUrl();
this.nextcloudWebAppPasswordURL = "";
this.nextcloudWebDavURL = "";
this.nextcloudName = "";
this.nextcloudFileURL = "";
this.signedFiles = [];
this.signedFilesCount = 0;
this.signedFilesToDownload = 0;
......@@ -64,6 +65,10 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
nextcloudWebAppPasswordURL: { type: String, attribute: 'nextcloud-web-app-password-url' },
nextcloudWebDavURL: { type: String, attribute: 'nextcloud-webdav-url' },
nextcloudName: { type: String, attribute: 'nextcloud-name' },
nextcloudFileURL: { type: String, attribute: 'nextcloud-file-url' },
signedFiles: { type: Array, attribute: false },
signedFilesCount: { type: Number, attribute: false },
signedFilesToDownload: { type: Number, attribute: false },
......@@ -778,9 +783,10 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
context="${i18n.t('qualified-pdf-upload.upload-field-label')}"
allowed-mime-types="application/pdf"
enabled-sources="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${nextcloudWebDavURL}"
nextcloud-name="${nextcloudName}"
nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
nextcloud-name="${this.nextcloudName}"
nextcloud-file-url="${this.nextcloudFileURL}"
decompress-zip
lang="${this.lang}"
?disabled="${this.signingProcessActive}"
......@@ -918,9 +924,10 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
context="${i18n.t('qualified-pdf-upload.save-field-label', {count: this.signedFilesToDownload})}"
filename="signed-documents.zip"
enabled-destinations="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${nextcloudWebDavURL}"
nextcloud-name="${nextcloudName}"
nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
nextcloud-name="${this.nextcloudName}"
nextcloud-file-url="${this.nextcloudFileURL}"
lang="${this.lang}"
></dbp-file-sink>
`;
......
src/dbp-qualified-signature-pdf-upload.js
+ 16
− 9
View file @ 193bc09a
......@@ -12,9 +12,6 @@ import {classMap} from 'lit-html/directives/class-map.js';
import {FileSource} from '@dbp-toolkit/file-handling';
import JSONLD from "@dbp-toolkit/common/jsonld";
import {TextSwitch} from './textswitch.js';
import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL';
import nextcloudWebDavURL from 'consts:nextcloudWebDavURL';
import nextcloudName from 'consts:nextcloudName';
import {FileSink} from "@dbp-toolkit/file-handling";
import {name as pkgName} from './../package.json';
import {getPDFSignatureCount} from './utils.js';
......@@ -27,6 +24,10 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
super();
this.lang = i18n.language;
this.entryPointUrl = commonUtils.getAPiUrl();
this.nextcloudWebAppPasswordURL = "";
this.nextcloudWebDavURL = "";
this.nextcloudName = "";
this.nextcloudFileURL = "";
this.externalAuthInProgress = false;
this.signedFiles = [];
this.signedFilesCount = 0;
......@@ -68,6 +69,10 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
nextcloudWebAppPasswordURL: { type: String, attribute: 'nextcloud-web-app-password-url' },
nextcloudWebDavURL: { type: String, attribute: 'nextcloud-webdav-url' },
nextcloudName: { type: String, attribute: 'nextcloud-name' },
nextcloudFileURL: { type: String, attribute: 'nextcloud-file-url' },
signedFiles: { type: Array, attribute: false },
signedFilesCount: { type: Number, attribute: false },
signedFilesToDownload: { type: Number, attribute: false },
......@@ -937,9 +942,10 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
context="${i18n.t('qualified-pdf-upload.upload-field-label')}"
allowed-mime-types="application/pdf"
enabled-sources="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${nextcloudWebDavURL}"
nextcloud-name="${nextcloudName}"
nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
nextcloud-name="${this.nextcloudName}"
nextcloud-file-url="${this.nextcloudFileURL}"
decompress-zip
lang="${this.lang}"
?disabled="${this.signingProcessActive}"
......@@ -1089,9 +1095,10 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
context="${i18n.t('qualified-pdf-upload.save-field-label', {count: this.signedFilesToDownload})}"
filename="signed-documents.zip"
enabled-destinations="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${nextcloudWebDavURL}"
nextcloud-name="${nextcloudName}"
nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
nextcloud-name="${this.nextcloudName}"
nextcloud-file-url="${this.nextcloudFileURL}"
lang="${this.lang}"
></dbp-file-sink>
`;
......
src/dbp-signature-verification-full.js
+ 12
− 6
View file @ 193bc09a
......@@ -10,9 +10,6 @@ import * as commonStyles from '@dbp-toolkit/common/styles';
import {classMap} from 'lit-html/directives/class-map.js';
import {FileSource} from '@dbp-toolkit/file-handling';
import JSONLD from "@dbp-toolkit/common/jsonld";
import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL';
import nextcloudWebDavURL from 'consts:nextcloudWebDavURL';
import nextcloudName from 'consts:nextcloudName';
import {name as pkgName} from './../package.json';
const i18n = createI18nInstance();
......@@ -22,6 +19,10 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme
super();
this.lang = i18n.language;
this.entryPointUrl = commonUtils.getAPiUrl();
this.nextcloudWebAppPasswordURL = "";
this.nextcloudWebDavURL = "";
this.nextcloudName = "";
this.nextcloudFileURL = "";
this.verifiedFiles = [];
this.verifiedFilesCount = 0;
this.errorFiles = [];
......@@ -55,6 +56,10 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme
return this.getProperties({
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
nextcloudWebAppPasswordURL: { type: String, attribute: 'nextcloud-web-app-password-url' },
nextcloudWebDavURL: { type: String, attribute: 'nextcloud-webdav-url' },
nextcloudName: { type: String, attribute: 'nextcloud-name' },
nextcloudFileURL: { type: String, attribute: 'nextcloud-file-url' },
verifiedFiles: { type: Array, attribute: false },
verifiedFilesCount: { type: Number, attribute: false },
queuedFilesCount: { type: Number, attribute: false },
......@@ -695,9 +700,10 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme
id="file-source"
allowed-mime-types="application/pdf"
enabled-sources="local${this.showTestNextcloudFilePicker ? ",nextcloud" : ""}"
nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${nextcloudWebDavURL}"
nextcloud-name="${nextcloudName}"
nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}"
nextcloud-web-dav-url="${this.nextcloudWebDavURL}"
nextcloud-name="${this.nextcloudName}"
nextcloud-file-url="${this.nextcloudFileURL}"
decompress-zip
lang="${this.lang}"
?disabled="${this.verificationProcessActive}"
......
toolkit @ c5b4c413
Compare 1972b2ce...c5b4c413
Subproject commit 1972b2cea217bc732da1d65499e6070e8fcb0a8f
Subproject commit c5b4c4132b27d1ca61aa81418f07bdcde20f8523
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment