Commit 60d844b1 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents efcf80df 95aaaa5f

src/main/java/com/inteligr8/activiti/auth/oauth/IdentityServiceConfigurationOverride.java

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.activiti.security.ActivitiAppRequestHeaderService; 
import com.activiti.security.ActivitiRestAuthorizationService;

import com.activiti.security.ProtectedPaths;

import com.activiti.security.identity.service.config.IdentityServiceEnabledCondition;

import com.inteligr8.activiti.auth.service.JwtAuthenticationProvider;

import com.activiti.security.identity.service.config.JwtAuthenticationConverter;

import com.nimbusds.oauth2.sdk.ParseException;



/**
@@ -48,7 +48,7 @@ public class IdentityServiceConfigurationOverride { 
    private ApplicationContext appContext;



    @Autowired

    private JwtAuthenticationProvider jwtAuthenticationProvider;

    private JwtAuthenticationConverter jwtAuthenticationConverter;



    @Autowired

    private ActivitiAppRequestHeaderService appRequestHeaderService;
@@ -118,7 +118,7 @@ public class IdentityServiceConfigurationOverride { 
            .oauth2ResourceServer(oauth2 ->

                oauth2.jwt(jwtConfigurer -> {

                    // here is where we are injecting a Spring extendible `JwtAuthenticationConverter`.

                    jwtConfigurer.jwtAuthenticationConverter(this.jwtAuthenticationProvider.create());

                    jwtConfigurer.jwtAuthenticationConverter(this.jwtAuthenticationConverter);

                })

            )

            .authorizeHttpRequests(request ->

src/main/java/com/inteligr8/activiti/auth/service/JwtAuthenticationProvider.java

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
package com.inteligr8.activiti.auth.service;



import org.springframework.core.convert.converter.Converter;

import org.springframework.security.authentication.AbstractAuthenticationToken;

import org.springframework.security.oauth2.jwt.Jwt;



public interface JwtAuthenticationProvider {

    

    Converter<Jwt, AbstractAuthenticationToken> create();



}

src/main/java/com/inteligr8/activiti/auth/service/SyncingJwtAuthenticationConverter.java

+11 −9
Original line number Diff line number Diff line
@@ -11,27 +11,29 @@ import org.springframework.security.core.userdetails.UserDetails; 
import org.springframework.security.core.userdetails.UserDetailsService;

import org.springframework.security.oauth2.core.oidc.StandardClaimNames;

import org.springframework.security.oauth2.jwt.Jwt;

import org.springframework.stereotype.Component;



import com.activiti.security.identity.service.config.JwtAuthenticationToken;

import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;



@Component

public class SyncingJwtAuthenticationConverter implements Converter<Jwt, AbstractAuthenticationToken> {

    

    private final Logger logger = LoggerFactory.getLogger(this.getClass());

    private final UserDetailsService userDetailsService;

    private final UserSyncService userSyncService;

    private final GroupSyncService groupSyncService;

    

    @Autowired

    private TokenRecaller tokenRecaller;

    private UserDetailsService userDetailsService;

    

    public SyncingJwtAuthenticationConverter(UserDetailsService userDetailsService, UserSyncService userSyncService, GroupSyncService groupSyncService) {

        this.userDetailsService = userDetailsService;

        this.userSyncService = userSyncService;

        this.groupSyncService = groupSyncService;

    }

    @Autowired

    private UserSyncService userSyncService;

    

    @Autowired

    private GroupSyncService groupSyncService;

    

    @Autowired

    private TokenRecaller tokenRecaller;

    

    @Override

    public AbstractAuthenticationToken convert(Jwt source) {

src/main/java/com/inteligr8/activiti/auth/service/SyncingJwtAuthenticationProvider.java

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
package com.inteligr8.activiti.auth.service;



import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.core.convert.converter.Converter;

import org.springframework.security.authentication.AbstractAuthenticationToken;

import org.springframework.security.core.userdetails.UserDetailsService;

import org.springframework.security.oauth2.jwt.Jwt;

import org.springframework.stereotype.Component;



@Component

public class SyncingJwtAuthenticationProvider implements JwtAuthenticationProvider {

    

    @Autowired

    private UserDetailsService userDetailsService;

    

    @Autowired

    private UserSyncService userSyncService;

    

    @Autowired

    private GroupSyncService groupSyncService;

    

    @Override

    public Converter<Jwt, AbstractAuthenticationToken> create() {

        return new SyncingJwtAuthenticationConverter(this.userDetailsService, this.userSyncService, this.groupSyncService);

    }



}