From 8275ceb12b546bb2143a887866881f4d78ecf494 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Tue, 1 Nov 2022 17:01:38 +0600 Subject: [PATCH 1/4] 458-polish_rebanding issue: https://gitlab.e.foundation/e/os/backlog/-/issues/458 Update the ecloud.global links to their murena.io counterparts for better consistency --- src/main/java/ecorp/easy/installer/AppConstants.java | 4 ++-- src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java | 2 +- .../java/ecorp/easy/installer/tasks/UploadToEcloudTask.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java index 0bf77658..c0a94c6c 100644 --- a/src/main/java/ecorp/easy/installer/AppConstants.java +++ b/src/main/java/ecorp/easy/installer/AppConstants.java @@ -38,8 +38,8 @@ public abstract class AppConstants { public final static String AdbFolderName = "adb"; - public final static String FEEDBACK_STORAGE_URL ="https://ecloud.global/s/QLwyiZ4fysodiz3"; - public final static String LOG_STORAGE_URL ="https://ecloud.global/s/4qRxWjeM5Yb72b4"; + public final static String FEEDBACK_STORAGE_URL ="https://murena.io/s/QLwyiZ4fysodiz3"; + public final static String LOG_STORAGE_URL ="https://murena.io/s/4qRxWjeM5Yb72b4"; private final static String BuildSrcFolderName = "buildSrc"; //step type key diff --git a/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java b/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java index af08892e..df83bb24 100644 --- a/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java +++ b/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java @@ -98,7 +98,7 @@ public class AskAccountTask extends Task{ .POST(datas) .setHeader("User-Agent", "Java 11 HttpClient Bot") // add request header .header("Content-Type", "application/x-www-form-urlencoded") - .uri(URI.create("https://welcome.ecloud.global/process_email_invite.php")) + .uri(URI.create("https://murena.io/signup/process_email_invite.php")) .build(); return request; diff --git a/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java b/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java index d92bacf1..b6f760fe 100644 --- a/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java +++ b/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java @@ -58,7 +58,7 @@ public class UploadToEcloudTask extends Task{ var request = HttpRequest.newBuilder() .header("Referer", URL) .header("Authorization", "Basic "+autorizationToken) //the value is defined for the folder and is required! I've no idea how to automaticaly get it - .uri(URI.create("https://ecloud.global/public.php/webdav/"+file.getName())) + .uri(URI.create("https://murena.io/public.php/webdav/"+file.getName())) .PUT(HttpRequest.BodyPublishers.ofFile(Paths.get(filePath))) .build(); -- GitLab From 8d44fb02374151d79b5a7593dbebefd8048e87b0 Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Wed, 2 Nov 2022 13:16:43 +0600 Subject: [PATCH 2/4] extract murena.io base url --- src/main/java/ecorp/easy/installer/AppConstants.java | 6 ++++-- .../java/ecorp/easy/installer/tasks/AskAccountTask.java | 4 +++- .../java/ecorp/easy/installer/tasks/UploadToEcloudTask.java | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java index c0a94c6c..598d9ec7 100644 --- a/src/main/java/ecorp/easy/installer/AppConstants.java +++ b/src/main/java/ecorp/easy/installer/AppConstants.java @@ -38,8 +38,10 @@ public abstract class AppConstants { public final static String AdbFolderName = "adb"; - public final static String FEEDBACK_STORAGE_URL ="https://murena.io/s/QLwyiZ4fysodiz3"; - public final static String LOG_STORAGE_URL ="https://murena.io/s/4qRxWjeM5Yb72b4"; + public final static String MURENA_BASE_URL = "https://murena.io/"; + + public final static String FEEDBACK_STORAGE_URL = MURENA_BASE_URL + "s/QLwyiZ4fysodiz3"; + public final static String LOG_STORAGE_URL = MURENA_BASE_URL + "s/4qRxWjeM5Yb72b4"; private final static String BuildSrcFolderName = "buildSrc"; //step type key diff --git a/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java b/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java index df83bb24..8346f9ce 100644 --- a/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java +++ b/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java @@ -19,6 +19,8 @@ import java.net.URI; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Map; + +import ecorp.easy.installer.AppConstants; import javafx.concurrent.Task; import java.net.http.HttpClient; import java.net.http.HttpRequest; @@ -98,7 +100,7 @@ public class AskAccountTask extends Task{ .POST(datas) .setHeader("User-Agent", "Java 11 HttpClient Bot") // add request header .header("Content-Type", "application/x-www-form-urlencoded") - .uri(URI.create("https://murena.io/signup/process_email_invite.php")) + .uri(URI.create(AppConstants.MURENA_BASE_URL + "signup/process_email_invite.php")) .build(); return request; diff --git a/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java b/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java index b6f760fe..7b546a34 100644 --- a/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java +++ b/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java @@ -24,6 +24,8 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.nio.file.Paths; import java.util.Base64; + +import ecorp.easy.installer.AppConstants; import javafx.concurrent.Task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +60,7 @@ public class UploadToEcloudTask extends Task{ var request = HttpRequest.newBuilder() .header("Referer", URL) .header("Authorization", "Basic "+autorizationToken) //the value is defined for the folder and is required! I've no idea how to automaticaly get it - .uri(URI.create("https://murena.io/public.php/webdav/"+file.getName())) + .uri(URI.create(AppConstants.MURENA_BASE_URL + "public.php/webdav/"+file.getName())) .PUT(HttpRequest.BodyPublishers.ofFile(Paths.get(filePath))) .build(); -- GitLab From 1f9b5d7779b93d7c1639e81c30ac761edcafa9da Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Wed, 2 Nov 2022 08:33:42 +0000 Subject: [PATCH 3/4] Apply 3 suggestion(s) to 3 file(s) --- src/main/java/ecorp/easy/installer/AppConstants.java | 2 +- src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java | 2 +- .../java/ecorp/easy/installer/tasks/UploadToEcloudTask.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java index 598d9ec7..260f37b4 100644 --- a/src/main/java/ecorp/easy/installer/AppConstants.java +++ b/src/main/java/ecorp/easy/installer/AppConstants.java @@ -38,7 +38,7 @@ public abstract class AppConstants { public final static String AdbFolderName = "adb"; - public final static String MURENA_BASE_URL = "https://murena.io/"; + public final static String MURENA_BASE_URL = "https://murena.io"; public final static String FEEDBACK_STORAGE_URL = MURENA_BASE_URL + "s/QLwyiZ4fysodiz3"; public final static String LOG_STORAGE_URL = MURENA_BASE_URL + "s/4qRxWjeM5Yb72b4"; diff --git a/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java b/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java index 8346f9ce..174eb926 100644 --- a/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java +++ b/src/main/java/ecorp/easy/installer/tasks/AskAccountTask.java @@ -100,7 +100,7 @@ public class AskAccountTask extends Task{ .POST(datas) .setHeader("User-Agent", "Java 11 HttpClient Bot") // add request header .header("Content-Type", "application/x-www-form-urlencoded") - .uri(URI.create(AppConstants.MURENA_BASE_URL + "signup/process_email_invite.php")) + .uri(URI.create(AppConstants.MURENA_BASE_URL + "/signup/process_email_invite.php")) .build(); return request; diff --git a/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java b/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java index 7b546a34..d5cf22db 100644 --- a/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java +++ b/src/main/java/ecorp/easy/installer/tasks/UploadToEcloudTask.java @@ -60,7 +60,7 @@ public class UploadToEcloudTask extends Task{ var request = HttpRequest.newBuilder() .header("Referer", URL) .header("Authorization", "Basic "+autorizationToken) //the value is defined for the folder and is required! I've no idea how to automaticaly get it - .uri(URI.create(AppConstants.MURENA_BASE_URL + "public.php/webdav/"+file.getName())) + .uri(URI.create(AppConstants.MURENA_BASE_URL + "/public.php/webdav/" + file.getName())) .PUT(HttpRequest.BodyPublishers.ofFile(Paths.get(filePath))) .build(); -- GitLab From 9d859cdf307cb36f2d76d3c51440205bf66a433c Mon Sep 17 00:00:00 2001 From: Fahim Salam Chowdhury Date: Wed, 2 Nov 2022 08:36:10 +0000 Subject: [PATCH 4/4] Apply 1 suggestion(s) to 1 file(s) --- src/main/java/ecorp/easy/installer/AppConstants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java index 260f37b4..08220ff1 100644 --- a/src/main/java/ecorp/easy/installer/AppConstants.java +++ b/src/main/java/ecorp/easy/installer/AppConstants.java @@ -40,8 +40,8 @@ public abstract class AppConstants { public final static String MURENA_BASE_URL = "https://murena.io"; - public final static String FEEDBACK_STORAGE_URL = MURENA_BASE_URL + "s/QLwyiZ4fysodiz3"; - public final static String LOG_STORAGE_URL = MURENA_BASE_URL + "s/4qRxWjeM5Yb72b4"; + public final static String FEEDBACK_STORAGE_URL = MURENA_BASE_URL + "/s/QLwyiZ4fysodiz3"; + public final static String LOG_STORAGE_URL = MURENA_BASE_URL + "/s/4qRxWjeM5Yb72b4"; private final static String BuildSrcFolderName = "buildSrc"; //step type key -- GitLab