Changeset 775e15e for phonelux-backend/src/main/java/finki/it/phoneluxbackend/security

Timestamp:

09/17/22 01:23:47 (2 years ago)

Author:

Marko <Marko@…>

Branches:

master

Children:

7e88e46

Parents:

e5b84dc

Message:

Added more controllers

Location:

phonelux-backend/src/main/java/finki/it/phoneluxbackend/security

Files:

• CustomAuthenticationFilter.java (modified) (1 diff)
• configs/WebSecurityConfig.java (modified) (1 diff)

phonelux-backend/src/main/java/finki/it/phoneluxbackend/security/CustomAuthenticationFilter.java

@@ -50 +50 @@
                 .withClaim("role", user.getAuthorities().stream()
                         .map(GrantedAuthority::getAuthority).collect(Collectors.toList()))
+                .withClaim("name", user.getFirstName())
+                .withClaim("id", user.getId())
                 .sign(algorithm);
 
-//        String refresh_token = JWT.create()
-//                .withSubject(user.getEmail())
-//                .withExpiresAt(new Date(System.currentTimeMillis() + 30 * 60 * 1000))
-//                .withIssuer(request.getRequestURL().toString())
-//                .withClaim("role",user.getAuthorities().stream()
-//                        .map(GrantedAuthority::getAuthority).collect(Collectors.toList()))
-//                .sign(algorithm);
 
-
-        Map<String,String> tokens = new HashMap<>();
-        tokens.put("access_token",access_token);
-//        tokens.put("refresh_token",refresh_token);
+        Map<String,String> authInfo = new HashMap<>();
+        authInfo.put("access_token",access_token);
         response.setContentType(APPLICATION_JSON_VALUE);
-        new ObjectMapper().writeValue(response.getOutputStream(),tokens);
+        new ObjectMapper().writeValue(response.getOutputStream(),authInfo);
     }
 }

phonelux-backend/src/main/java/finki/it/phoneluxbackend/security/configs/WebSecurityConfig.java

@@ -29 +29 @@
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-//        http
-//                .csrf().disable()
-//                .authorizeRequests()
-//                .antMatchers("/registration/**")
-//                .permitAll()
-//                .anyRequest()
-//                .authenticated().and()
-//                .formLogin();
+
 
         http.csrf().disable();
         http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
-//        http.authorizeRequests().antMatchers(GET,"/phones").hasAnyAuthority("USER");
-        http.authorizeRequests().anyRequest().permitAll();
+
+        http.authorizeRequests()
+                .and()
+                .authorizeRequests()
+                .antMatchers("/user/**")
+                .hasAnyAuthority("USER","ADMIN", "SUPERADMIN")
+                .and()
+                .authorizeRequests()
+                .antMatchers("/management/**")
+                .hasAnyAuthority("SUPERADMIN")
+                .anyRequest().permitAll();
+
+
+
         http.addFilter(new CustomAuthenticationFilter(authenticationManagerBean()));
         http.addFilterBefore(new CustomAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class);