Use correct userId when updating user details (#655)

apache · May 5, 2023 · 0f84a55 · 0f84a55
1 parent 2532e6a
commit 0f84a55
Showing 1 changed file with 4 additions and 4 deletions.
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
@@ -127,7 +127,7 @@ public Response deleteUser(@PathParam("principalId") String principalId) {
   @PUT
   @Produces(MediaType.APPLICATION_JSON)
   public Response updateAppearanceMode(@PathParam("darkMode") boolean darkMode) {
-    String authenticatedUserId = getAuthenticatedUsername();
+    String authenticatedUserId = getAuthenticatedUserSid();
     if (authenticatedUserId != null) {
       UserAccount user = getUser(authenticatedUserId);
       user.setDarkMode(darkMode);
@@ -199,7 +199,7 @@ public Response createNewApiToken(@PathParam("userId") String userId,
   @Produces(MediaType.APPLICATION_JSON)
   public Response updateUserAccountDetails(@PathParam("principalId") String principalId,
                                            UserAccount user) {
-    String authenticatedUserId = getAuthenticatedUsername();
+    String authenticatedUserId = getAuthenticatedUserSid();
     if (user != null && (authenticatedUserId.equals(principalId) || isAdmin())) {
       UserAccount existingUser = (UserAccount) getPrincipalById(principalId);
       updateUser(existingUser, user, isAdmin(), existingUser.getPassword());
@@ -217,7 +217,7 @@ public Response updateUserAccountDetails(@PathParam("principalId") String princi
   @Produces(MediaType.APPLICATION_JSON)
   public Response updateUsername(@PathParam("principalId") String principalId,
                                  UserAccount user) {
-    String authenticatedUserId = getAuthenticatedUsername();
+    String authenticatedUserId = getAuthenticatedUserSid();
     if (user != null && (authenticatedUserId.equals(principalId) || isAdmin())) {
       UserAccount existingUser = (UserAccount) getPrincipalById(principalId);
       try {
@@ -279,7 +279,7 @@ public Response updatePassword(@PathParam("principalId") String principalId,
   @Produces(MediaType.APPLICATION_JSON)
   public Response updateServiceAccountDetails(@PathParam("principalId") String principalId,
                                               ServiceAccount user) {
-    String authenticatedUserId = getAuthenticatedUsername();
+    String authenticatedUserId = getAuthenticatedUserSid();
     if (user != null && (authenticatedUserId.equals(principalId) || isAdmin())) {
       Principal existingUser = getPrincipalById(principalId);
       user.setRev(existingUser.getRev());