Merge branch 'master' of gitlab.tugraz.at:dbp/web-components/toolkit

packages/app-shell/src/app-shell.js

@@ -7,7 +7,6 @@ import {AuthKeycloak} from '@dbp-toolkit/auth';
 import {AuthMenuButton} from './auth-menu-button.js';
 import {Notification} from '@dbp-toolkit/notification';
 import * as commonStyles from '@dbp-toolkit/common/styles';
-import * as commonUtils from '@dbp-toolkit/common/utils';
 import {classMap} from 'lit-html/directives/class-map.js';
 import {Router} from './router.js';
 import {BuildInfo} from './build-info.js';
@@ -47,7 +46,7 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
         super();
         this.lang = i18n.language;
         this.activeView = '';
-        this.entryPointUrl = commonUtils.getAPiUrl();
+        this.entryPointUrl = '';
         this.subtitle = '';
         this.description = '';
         this.routes = [];
@@ -815,7 +814,7 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
 
         return html`
             <slot class="${slotClassMap}"></slot>
-            <dbp-auth-keycloak lang="${this.lang}" url="${kc.url}" realm="${kc.realm}" client-id="${kc.clientId}" silent-check-sso-redirect-uri="${kc.silentCheckSsoRedirectUri || ''}" scope="${kc.scope || ''}"  idp-hint="${kc.idpHint || ''}" load-person ?force-login="${kc.forceLogin}" ?try-login="${!kc.forceLogin}"></dbp-auth-keycloak>
+            <dbp-auth-keycloak lang="${this.lang}" entry-point-url="${this.entryPointUrl}" url="${kc.url}" realm="${kc.realm}" client-id="${kc.clientId}" silent-check-sso-redirect-uri="${kc.silentCheckSsoRedirectUri || ''}" scope="${kc.scope || ''}"  idp-hint="${kc.idpHint || ''}" load-person ?force-login="${kc.forceLogin}" ?try-login="${!kc.forceLogin}"></dbp-auth-keycloak>
             <dbp-matomo endpoint="${this.matomoUrl}" site-id="${this.matomoSiteId}" git-info="${this.gitInfo}"></dbp-matomo>
             <div class="${mainClassMap}">
             <div id="main">

packages/auth/src/auth-keycloak.js

 import {i18n} from './i18n.js';
 import JSONLD from '@dbp-toolkit/common/jsonld';
-import * as commonUtils from '@dbp-toolkit/common/utils';
 import {EventBus} from '@dbp-toolkit/common';
 import  {KeycloakWrapper} from './keycloak.js';
 import {LoginStatus} from './util.js';
@@ -33,7 +32,7 @@ export class AuthKeycloak extends AdapterLitElement {
         this.personId = "";
         this.tryLogin = false;
         this.person = null;
-        this.entryPointUrl = commonUtils.getAPiUrl();
+        this.entryPointUrl = '';
         this._loginStatus = LoginStatus.UNKNOWN;
 
         // Keycloak config

packages/file-handling/src/file-source.js

@@ -198,7 +198,8 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
             }
 
             // check if we want to decompress the zip and queue the contained files
-            if (this.decompressZip && file.type === "application/zip") {
+            if (this.decompressZip
+                && (file.type === "application/zip" || file.type === "application/x-zip-compressed")) {
                 // add decompressed files to tempFilesToHandle
                 await commonUtils.asyncArrayForEach(
                     await this.decompressZIP(file), (file) => this.sendFileEvent(file));
@@ -438,7 +439,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
         let allowedMimeTypes = this.allowedMimeTypes;
 
         if (this.decompressZip) {
-            allowedMimeTypes += ",application/zip";
+            allowedMimeTypes += ",application/zip,application/x-zip-compressed";
         }
 
         return html`