X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Flibraries%2FCatalogPackageManagerUploadDropZone.js;h=690118d54ea10d83bf3e8c39691e55b87a479dd3;hb=refs%2Fchanges%2F96%2F896%2F1;hp=5f1ee24ab9f2d9fcb2947ad9c7b4372bb734d495;hpb=e29efc315df33d546237e270470916e26df391d6;p=osm%2FUI.git diff --git a/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js b/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js index 5f1ee24ab..690118d54 100644 --- a/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js +++ b/skyquake/plugins/composer/src/src/libraries/CatalogPackageManagerUploadDropZone.js @@ -1,6 +1,6 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,18 +35,24 @@ const ACTIONS = { }; function getCatalogPackageManagerServerOrigin() { - return Utils.getSearchParams(window.location).upload_server + ':4567'; + // return Utils.getSearchParams(window.location).upload_server + ':4567'; + return window.location.origin; } function initializeDropZone(element = '#dropzone', button = false, action = ACTIONS.onboard) { + let Auth = 'Basic ' + window.sessionStorage.getItem("auth"); + let dev_download_server = Utils.getSearchParams(window.location).dev_download_server; DropZone.autoDiscover = false; return new DropZone(element, { - paramName: 'descriptor', + paramName: 'package', url() { if (action === ACTIONS.update) { return getCatalogPackageManagerServerOrigin() + '/api/update'; } - return getCatalogPackageManagerServerOrigin() + '/api/upload'; + return getCatalogPackageManagerServerOrigin() + '/composer/upload?api_server=' + Utils.getSearchParams(window.location).api_server + '&upload_server=' + Utils.getSearchParams(window.location).upload_server + '&dev_download_server=' + Utils.getSearchParams(window.location).dev_download_server; + }, + headers: { + 'Authorization': Auth }, maxFilesize: 10000000000, clickable: button,