Revert "Add endpoint to fetch the roles of an authenticated user: Fixes #1187"

horreum-api/src/main/java/io/hyperfoil/tools/horreum/api/internal/services/UserService.java

@@ -24,12 +24,6 @@
 @Produces(MediaType.APPLICATION_JSON)
 @Tag(name = "user", description = "Manage users")
 public interface UserService {
-
-   @GET
-   @Path("roles")
-   @Blocking
-   List<String> getRoles();
-
    @GET
    @Path("search")
    @Blocking

horreum-backend/pom.xml

@@ -148,10 +148,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-keycloak-admin-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-elytron-security-properties-file</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-elasticsearch-rest-client</artifactId>

horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/UserServiceImpl.java

@@ -64,18 +64,6 @@ private static UserData toUserInfo(UserRepresentation rep) {
       return new UserData(rep.getId(), rep.getUsername(), rep.getFirstName(), rep.getLastName(), rep.getEmail());
    }
 
-   @Override public List<String> getRoles() {
-      if (identity.isAnonymous()) {
-         throw ServiceException.forbidden("Please log in and try again");
-      }
-      var representations = keycloak.realm(realm).users().search(identity.getPrincipal().getName(), true);
-      if (representations.isEmpty()) {
-         throw ServiceException.notFound("Username not found");
-      }
-      var roles = keycloak.realm(realm).users().get(representations.get(0).getId()).roles().getAll().getRealmMappings();
-      return roles.stream().map(RoleRepresentation::getName).collect(Collectors.toList());
-   }
-
    @Override
    public List<UserData> searchUsers(String query) {
       if (identity.isAnonymous()) {

horreum-backend/src/main/resources/application.properties

@@ -199,10 +199,3 @@ horreum.dev-services.enabled=true
 quarkus.datasource.devservices.enabled=false
 quarkus.datasource.migration.devservices.enabled=false
 quarkus.keycloak.devservices.enabled=false
-
-## Add a dummy administrator in dev mode with name "user" and password "secret" with Basic HTTP authentication
-%dev.quarkus.http.auth.basic=true
-%dev.quarkus.security.users.embedded.enabled=true
-%dev.quarkus.security.users.embedded.plain-text=true
-%dev.quarkus.security.users.embedded.users.user=secret
-%dev.quarkus.security.users.embedded.roles.user=admin

horreum-web/src/Login.tsx

@@ -4,7 +4,7 @@ import {AppContextType} from "./context/@types/appContextTypes";
 import {Button, Form, FormGroup, Modal, Spinner, TextInput} from "@patternfly/react-core";
 import {userApi} from "./api";
 import store from "./store";
-import {BASIC_AUTH, UPDATE_ROLES, AFTER_LOGOUT, STORE_PROFILE, UPDATE_DEFAULT_TEAM} from "./auth";
+import {BASIC_AUTH, UPDATE_ROLES, AFTER_LOGOUT} from "./auth";
 
 type LoginModalProps = {
     username: string
@@ -38,18 +38,12 @@ export default function LoginModal(props: LoginModalProps) {
                 onClick={() => {
                     setCreating(true)
                     store.dispatch({type: BASIC_AUTH, username, password});
-
-                    userApi.getRoles()
-                        .then(roles => {
-                                alerting.dispatchInfo("LOGIN", "Log in successful", "Successful log in of user " + username, 3000)
-                                store.dispatch({type: UPDATE_ROLES, authenticated: true, roles: roles});
-                                userApi.searchUsers(username!).then(
-                                    userData => store.dispatch({type: STORE_PROFILE, profile: userData.filter(u => u.username == username).at(0)}),
-                                    error => alerting.dispatchInfo("LOGIN", "Unable to get user profile", error, 30000))
-                                userApi.defaultTeam().then(
-                                    response => store.dispatch({ type: UPDATE_DEFAULT_TEAM, team: response }),
-                                    error => alerting.dispatchInfo("LOGIN", "Cannot retrieve default team", error, 30000)
-                                )
+
+                    // TODO: instead of fetching userdata, should be fetching the user roles instead
+                    userApi.info([username || ''])
+                        .then(userdata => {
+                                alerting.dispatchInfo("LOGIN", "Log in successful", "Successful log in of user " + userdata[0].username, 3000)
+                                store.dispatch({type: UPDATE_ROLES, authenticated: true, roles: [/* TODO: the roles fetched */]});
                             },
                             error => {
                                 alerting.dispatchInfo("LOGIN", "Failed to authenticate", error, 30000)

horreum-web/src/api.tsx

@@ -65,7 +65,6 @@ const authMiddleware: Middleware = {
                 url: ctx.url,
                 init: {
                     ...ctx.init,
-                    credentials: "omit", // this prevents the browser from showing the native auth dialog
                     headers: {...ctx.init.headers, Authorization: "Basic " + basicAuthToken},
                 },
             })

horreum-web/src/keycloak.ts

@@ -64,7 +64,7 @@ export function initKeycloak(state: State) {
                     }
                 })
             }
-            store.dispatch({ type: INIT, keycloak: oidc ? keycloak : undefined, initPromise: initPromise })
+            store.dispatch({ type: INIT, keycloak: keycloak, initPromise: initPromise })
         })
         .catch(noop)
 }