You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2023/04/28 19:05:06 UTC
[streampipes] branch 1527-fix-logo-url-of-email-templates updated: Fix logo url of email templates (#1527)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch 1527-fix-logo-url-of-email-templates
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/1527-fix-logo-url-of-email-templates by this push:
new 9cbd23534 Fix logo url of email templates (#1527)
9cbd23534 is described below
commit 9cbd23534110171660f638f7178fccf52dad9e06
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Fri Apr 28 21:04:42 2023 +0200
Fix logo url of email templates (#1527)
---
.../streampipes/mail/template/AccountActiviationMailTemplate.java | 6 ------
.../java/org/apache/streampipes/mail/template/part/LogoPart.java | 2 +-
.../main/java/org/apache/streampipes/rest/impl/UserResource.java | 7 +++----
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/AccountActiviationMailTemplate.java b/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/AccountActiviationMailTemplate.java
index 3e8b60151..7bd0a7974 100644
--- a/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/AccountActiviationMailTemplate.java
+++ b/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/AccountActiviationMailTemplate.java
@@ -22,7 +22,6 @@ import org.apache.streampipes.mail.template.part.LinkPart;
import org.apache.streampipes.mail.template.part.MailTemplatePart;
import org.apache.streampipes.mail.utils.MailUtils;
-import java.io.IOException;
import java.util.Map;
public class AccountActiviationMailTemplate extends AbstractMailTemplate {
@@ -33,11 +32,6 @@ public class AccountActiviationMailTemplate extends AbstractMailTemplate {
this.activationCode = activationCode;
}
- public static void main(String[] args) throws IOException {
- String template = new PasswordRecoveryMailTemplate("asd").generateTemplate();
- System.out.println(template);
- }
-
@Override
protected String getTitle() {
return "Account Activation";
diff --git a/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/part/LogoPart.java b/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/part/LogoPart.java
index 662f0506b..2e835f58c 100644
--- a/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/part/LogoPart.java
+++ b/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/part/LogoPart.java
@@ -21,7 +21,7 @@ import org.apache.streampipes.mail.utils.MailUtils;
public class LogoPart extends AbstractPart {
- private static final String LOGO_PATH = "/assets/img/login/logo.png";
+ private static final String LOGO_PATH = "/assets/img/sp/logo.png";
private final String baseUrl;
diff --git a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/UserResource.java b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/UserResource.java
index ab6c53129..6abed4191 100644
--- a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/UserResource.java
+++ b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/UserResource.java
@@ -126,8 +126,7 @@ public class UserResource extends AbstractAuthGuardedRestResource {
@Path("{userId}/appearance/mode/{darkMode}")
@PUT
@Produces(MediaType.APPLICATION_JSON)
- public Response updateAppearanceMode(@PathParam("userId") String userId,
- @PathParam("darkMode") boolean darkMode) {
+ public Response updateAppearanceMode(@PathParam("darkMode") boolean darkMode) {
String authenticatedUserId = getAuthenticatedUsername();
if (authenticatedUserId != null) {
UserAccount user = getUser(authenticatedUserId);
@@ -145,8 +144,8 @@ public class UserResource extends AbstractAuthGuardedRestResource {
@JacksonSerialized
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
+ @PreAuthorize(AuthConstants.IS_ADMIN_ROLE)
public Response registerUser(UserAccount userAccount) {
- // TODO check if userId is already taken
try {
if (getUserStorage().getUser(userAccount.getUsername()) == null) {
String property = userAccount.getPassword();
@@ -171,8 +170,8 @@ public class UserResource extends AbstractAuthGuardedRestResource {
@JacksonSerialized
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
+ @PreAuthorize(AuthConstants.IS_ADMIN_ROLE)
public Response registerService(ServiceAccount serviceAccount) {
- // TODO check if userId is already taken
if (getUserStorage().getUser(serviceAccount.getUsername()) == null) {
serviceAccount.setClientSecret(SecretEncryptionManager.encrypt(serviceAccount.getClientSecret()));
serviceAccount.setSecretEncrypted(true);