Skip to content

Commit

Permalink
fix cors error
Browse files Browse the repository at this point in the history
  • Loading branch information
robatipoor committed Mar 28, 2024
1 parent 338ea87 commit a9e82fb
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion api/src/configure/cors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ pub fn cors_layer(config: &ServerConfig) -> ApiResult<tower_http::cors::CorsLaye
hyper::Method::DELETE,
])
.allow_origin(allow_origin)
.allow_headers([hyper::header::CONTENT_TYPE]),
.allow_headers([hyper::header::CONTENT_TYPE, hyper::header::AUTHORIZATION]),
)
}
57 changes: 28 additions & 29 deletions api/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ <h2>Paste File</h2>
$("#copyForm").submit(function (e) {
e.preventDefault();
const fileNameLength = 5;
var username = $("#usernameCopyForm").val();
var password = $("#passwordCopyForm").val();
var headers = { "Accept": "application/json" };
const username = $("#usernameCopyForm").val();
const password = $("#passwordCopyForm").val();
let headers = { "Accept": "application/json" };
if (username && password) {
headers['Authorization'] = createBasicAuthHeader(username, password);
} else if (username && !password) {
Expand All @@ -298,21 +298,21 @@ <h2>Paste File</h2>
return;
}
$('.progress-bar').addClass('is-active');
var action = $(this).attr("action");
var codeLength = $("#codeLengthCopyForm").val();
var expireSecs = $("#expireSecsCopyForm").val();
var maxDownload = $("#maxDownloadCopyForm").val();
var uploadUrl = createUploadURL(action, codeLength, expireSecs, maxDownload);
var textData = $("#textInputCopyForm").val();
const action = $(this).attr("action");
const codeLength = $("#codeLengthCopyForm").val();
const expireSecs = $("#expireSecsCopyForm").val();
const maxDownload = $("#maxDownloadCopyForm").val();
const uploadUrl = createUploadURL(action, codeLength, expireSecs, maxDownload);
const textData = $("#textInputCopyForm").val();
if (!textData) {
alert('Please set text');
return;
}
var formData = new FormData();
var blobData = new Blob([textData], {
let formData = new FormData();
const blobData = new Blob([textData], {
type: 'text/plain'
});
var filename = generateRandomString(fileNameLength).concat(".txt");
const filename = generateRandomString(fileNameLength).concat(".txt");
formData.append('file', blobData, filename);
$.ajax({
xhr: function () {
Expand Down Expand Up @@ -345,25 +345,24 @@ <h2>Paste File</h2>

$("#uploadForm").submit(function (e) {
e.preventDefault();
var username = $("#usernameUploadForm").val();
var password = $("#passwordUploadForm").val();
var headers = { "Accept": "application/json" };
const username = $("#usernameUploadForm").val();
const password = $("#passwordUploadForm").val();
let headers = { "Accept": "application/json" };
if (username && password) {
headers['Authorization'] = createBasicAuthHeader(username, password);
} else if (username && !password) {
console.log(password);
alert('Please set password');
return;
} else if (!username && password) {
alert('Please set username');
return;
}
$('.progress-bar').addClass('is-active');
var action = $(this).attr("action");
var codeLength = $("#codeLengthUploadForm").val();
var expireSecs = $("#expireSecsUploadForm").val();
var maxDownload = $("#maxDownloadUploadForm").val();
var uploadUrl = createUploadURL(action, codeLength, expireSecs, maxDownload);
const action = $(this).attr("action");
const codeLength = $("#codeLengthUploadForm").val();
const expireSecs = $("#expireSecsUploadForm").val();
const maxDownload = $("#maxDownloadUploadForm").val();
const uploadUrl = createUploadURL(action, codeLength, expireSecs, maxDownload);
$.ajax({
xhr: function () {
var xhr = new window.XMLHttpRequest();
Expand Down Expand Up @@ -395,16 +394,16 @@ <h2>Paste File</h2>

$("#downloadFile").click(function (e) {
e.preventDefault();
var url = $("#urlDownloadFile").val();
const url = $("#urlDownloadFile").val();
if (!url.startsWith("{{ domain }}")) {
alert('Please set valid URL');
return;
}
var request = new XMLHttpRequest();
let request = new XMLHttpRequest();
request.open("GET", url);
request.setRequestHeader("Accept", "application/json");
var username = $("#usernameDownloadFile").val();
var password = $("#passwordDownloadFile").val();
const username = $("#usernameDownloadFile").val();
const password = $("#passwordDownloadFile").val();
if (username && password) {
request.setRequestHeader("Authorization", createBasicAuthHeader(username, password));
} else if (username && !password) {
Expand All @@ -416,7 +415,7 @@ <h2>Paste File</h2>
}
request.responseType = "blob";
request.onload = function () {
var a = document.createElement("a");
let a = document.createElement("a");
a.href = URL.createObjectURL(this.response);
a.download = getFileName(url);
document.body.appendChild(a);
Expand Down Expand Up @@ -450,9 +449,9 @@ <h2>Paste File</h2>
}

function createUploadURL(base_url, codeLength, expireSecs, maxDownload) {
var result = base_url;
var first = true;
var d = "&";
let result = base_url;
let first = true;
let d = "&";
if (codeLength) {
if (first) {
d = "?";
Expand Down

0 comments on commit a9e82fb

Please sign in to comment.