implement user self service api for user detail information #3723 | r…

…emove unused sechub-web-server module
mercedes-benz · Jan 17, 2025 · 4f051e4 · 4f051e4
1 parent b2a6ec0
commit 4f051e4
Show file tree

Hide file tree

Showing 124 changed files with 438 additions and 5,456 deletions.
diff --git a/.github/workflows/release-web-server.yml b/.github/workflows/release-web-server.yml
diff --git a/gradle/projects.gradle b/gradle/projects.gradle
@@ -106,12 +106,11 @@ projectType = [
                    project(':sechub-pds'),
                    project(':sechub-wrapper-checkmarx'),
                    project(':sechub-wrapper-prepare'),
-                   project(':sechub-web-server'),
                    project(':sechub-wrapper-secretvalidation'),
             ],
 
             springBootWebApplicationProjects:[
-                    project('sechub-web-server')
+
             ],
 
             /* documentation projects */
@@ -128,8 +127,7 @@ projectType = [
                     project(':sechub-pds-solutions'),
 					project(':sechub-solution'),
 					project(':sechub-solutions-shared'),
-					project(':sechub-wrapper-xray'),
-					project(':sechub-web-server-solution'),
+					project(':sechub-wrapper-xray')
             ],
 
             asciiDoctorProjects: [

diff --git a/...c/main/java/com/mercedesbenz/sechub/domain/administration/AdministrationAPIConstants.java b/...c/main/java/com/mercedesbenz/sechub/domain/administration/AdministrationAPIConstants.java
@@ -64,7 +64,16 @@ private AdministrationAPIConstants() {
     public static final String API_LIST_USER_SIGNUPS = API_ADMINISTRATION + "signups";
 
     /* +-----------------------------------------------------------------------+ */
-    /* +............................ Users ....................................+ */
+    /* +......................... Users (Self Service).........................+ */
+    /* +-----------------------------------------------------------------------+ */
+
+    /**
+     * Fetch user detail information for authenticated user
+     */
+    public static final String API_USER_DETAIL_INFO = API_MANAGEMENT + "user";
+
+    /* +-----------------------------------------------------------------------+ */
+    /* +............................ Users (Admin) ............................+ */
     /* +-----------------------------------------------------------------------+ */
     /**
      * shows all users names

diff --git a/.../com/mercedesbenz/sechub/domain/administration/user/UserAdministrationRestController.java b/.../com/mercedesbenz/sechub/domain/administration/user/UserAdministrationRestController.java
@@ -93,7 +93,7 @@ public List<String> listAdministrators() {
 	@RequestMapping(path = AdministrationAPIConstants.API_SHOW_USER_DETAILS, method = RequestMethod.GET, produces= {MediaType.APPLICATION_JSON_VALUE})
 	public UserDetailInformation showUserDetails(@PathVariable(name="userId") String userId) {
 		/* @formatter:on */
-        return detailsService.fetchDetails(userId);
+        return detailsService.fetchDetailsById(userId);
     }
 
     /* @formatter:off */

diff --git a/...c/main/java/com/mercedesbenz/sechub/domain/administration/user/UserDetailInformation.java b/...c/main/java/com/mercedesbenz/sechub/domain/administration/user/UserDetailInformation.java
@@ -20,15 +20,15 @@ public class UserDetailInformation {
     public static final String PROPERTY_OWNED_PROJECTS = "ownedProjects";
     public static final String PROPERTY_SUPERADMIN = "superAdmin";
 
-    private String userId;
+    private final String userId;
 
-    private String email;
+    private final String email;
 
-    private boolean superAdmin;
+    private final boolean superAdmin;
 
-    private List<String> projects = new ArrayList<>();
+    private final List<String> projects = new ArrayList<>();
 
-    private List<String> ownedProjects = new ArrayList<>();
+    private final List<String> ownedProjects = new ArrayList<>();
 
     public UserDetailInformation(User user) {
         this.userId = user.getName();