Fixes #342

Author: oharsta

client/src/styles/vars.scss

@@ -2,4 +2,3 @@ $background: #eaebf0;
 $br: 6px;
 // Screen
 $medium: 824px;
-$tablet-max: 824px;

client/src/tabs/Tokens.scss

@@ -64,7 +64,7 @@ div.mod-tokens {
         width: 100%;
         margin: 40px auto 25px auto;
 
-        @media (max-width: $tablet-max) {
+        @media (max-width: $medium) {
             flex-direction: column;
         }
 
@@ -86,7 +86,7 @@ div.mod-tokens {
         div.new-token {
             width: 60%;
 
-            @media (max-width: $tablet-max) {
+            @media (max-width: $medium) {
                 padding: 15px;
                 width: 100%;
             }

server/pom.xml

@@ -38,6 +38,11 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>1.15.1</version>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback.contrib</groupId>
             <artifactId>logback-json-classic</artifactId>

…java/invite/AccessServerApplication.java …java/invite/InviteServerApplication.javaserver/src/main/java/invite/AccessServerApplication.java renamed to server/src/main/java/invite/InviteServerApplication.java server/src/main/java/invite/AccessServerApplication.java renamed to server/src/main/java/invite/InviteServerApplication.java

@@ -4,10 +4,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class AccessServerApplication {
+public class InviteServerApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(AccessServerApplication.class, args);
+        SpringApplication.run(InviteServerApplication.class, args);
     }
 
 }

server/src/main/java/invite/api/MetricsController.java

@@ -0,0 +1,66 @@
+package invite.api;
+
+import invite.model.Authority;
+import invite.model.Status;
+import invite.repository.*;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.swagger.v3.oas.annotations.Hidden;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.stream.Stream;
+
+@RestController
+@Hidden
+public class MetricsController {
+
+    public MetricsController(UserRepository userRepository,
+                             RoleRepository roleRepository,
+                             InvitationRepository invitationRepository,
+                             UserRoleRepository userRoleRepository,
+                             ApplicationRepository applicationRepository,
+                             MeterRegistry meterRegistry) {
+
+        Gauge.builder("total_number_of_users", () ->
+                        userRepository.count())
+                .description("Total number of Users")
+                .register(meterRegistry);
+
+        Gauge.builder("total_number_of_access_roles", () ->
+                        roleRepository.count())
+                .description("Total number of Access Roles")
+                .register(meterRegistry);
+
+        Stream.of(Authority.values())
+                .filter(authority -> !authority.equals(Authority.SUPER_USER) && !authority.equals(Authority.INSTITUTION_ADMIN))
+                .forEach(authority -> Gauge
+                        .builder("total_number_of_" + authority.name().toLowerCase() + "_users",
+                                () -> userRoleRepository.countByAuthority(authority))
+                        .description("Total number of " + authority.name().toLowerCase() + "-users")
+                        .register(meterRegistry));
+
+        Gauge
+                .builder("total_number_of_institution_admins",
+                        () -> userRepository.countBySuperUserTrue())
+                .description("Total number of Institution Admins")
+                .register(meterRegistry);
+
+        Gauge
+                .builder("total_number_of_super_users",
+                        () -> userRepository.countBySuperUserTrue())
+                .description("Total number of Super users")
+                .register(meterRegistry);
+
+        Gauge.builder("total_number_of_applications",
+                        () -> applicationRepository.count())
+                .description("Total number of applications")
+                .register(meterRegistry);
+
+        Gauge.builder("total_number_of_pending_invitations",
+                        () -> invitationRepository.countByStatus(Status.OPEN))
+                .description("Total number of pending invitations")
+                .register(meterRegistry);
+
+    }
+
+}

server/src/main/java/invite/repository/InvitationRepository.java

@@ -1,5 +1,6 @@
 package invite.repository;
 
+import invite.model.Authority;
 import invite.model.Invitation;
 import invite.model.Role;
 import invite.model.Status;
@@ -29,6 +30,8 @@ public interface InvitationRepository extends JpaRepository<Invitation, Long>, Q
 
     List<Invitation> findByStatusAndRoles_role(Status status, Role role);
 
+    long countByStatus(Status status);
+
     @Query(value = """
             SELECT i.id, i.email, i.remote_api_user, i.intended_authority, i.created_at, i.expiry_date,
             u.id as user_id, u.name, u.email as inviter_email

server/src/main/java/invite/repository/UserRepository.java

@@ -23,6 +23,10 @@ public interface UserRepository extends JpaRepository<User, Long>, QueryRewriter
 
     List<User> findBySuperUserTrue();
 
+    long countBySuperUserTrue();
+
+    long countByInstitutionAdminTrue();
+
     Optional<User> findByEduPersonPrincipalNameIgnoreCase(String eppn);
 
     Optional<User> findByEmailIgnoreCase(String email);

server/src/main/java/invite/repository/UserRoleRepository.java

@@ -31,6 +31,8 @@ public interface UserRoleRepository extends JpaRepository<UserRole, Long>, Query
 
     List<UserRole> findByRoleName(String roleName);
 
+    long countByAuthority(Authority authority);
+
     @Modifying
     @Query(value = "DELETE FROM user_roles WHERE id = ?1", nativeQuery = true)
     @Transactional(isolation = Isolation.SERIALIZABLE)

server/src/main/java/invite/security/Scope.java

@@ -1,5 +1,5 @@
 package invite.security;
 
 public enum Scope {
-    voot, teams, attribute_aggregation, lifecycle, profile, sp_dashboard, access
+    voot, teams, attribute_aggregation, lifecycle, profile, sp_dashboard, access, actuator
 }

server/src/main/java/invite/security/SecurityConfig.java

@@ -144,7 +144,8 @@ SecurityFilterChain sessionSecurityFilterChain(HttpSecurity http,
                                 "/api/v1/users/ms-accept-return/**",
                                 "/api/v1/validations/**",
                                 "/ui/**",
-                                "/internal/**")
+                                "/internal/health",
+                                "/internal/info")
                         .permitAll()
                         .anyRequest()
                         .authenticated()
@@ -201,10 +202,12 @@ SecurityFilterChain basicAuthenticationSecurityFilterChain(HttpSecurity http) th
                         "/api/deprovision/**",
                         "/api/external/v1/deprovision/**",
                         "/api/internal/invite/**",
-                        "/api/external/v1/internal/invite/**"
+                        "/api/external/v1/internal/invite/**",
+                        "/internal/prometheus"
                 ).sessionManagement(c -> c
                         .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                )
+                ).authorizeHttpRequests(auth -> auth
+                        .requestMatchers("/internal/prometheus").hasRole("ACTUATOR"))
                 .authorizeHttpRequests(c -> c
                         //The API token is secured in the UserHandlerMethodArgumentResolver
                         .requestMatchers(apiTokenRequestMatcher)