Commit 16bf35c6 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 802736e5 89d85bf2

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

+2 −2
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.activiti.security.identity.service.config.JwtAuthenticationConverter;

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

import com.nimbusds.oauth2.sdk.ParseException;



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



    @Autowired

    private JwtAuthenticationConverter jwtAuthenticationConverter;

    private SyncingJwtAuthenticationConverter jwtAuthenticationConverter;



    @Autowired

    private ActivitiAppRequestHeaderService appRequestHeaderService;