Merge pull request #52 from companieshouse/fix-interceptor-order

Make transactionInterceptor run after authentication

Author: markpit

src/main/java/uk/gov/companieshouse/limitedpartnershipsapi/config/InterceptorConfig.java

@@ -37,12 +37,12 @@ public InterceptorConfig(LoggingInterceptor loggingInterceptor,
     @Override
     public void addInterceptors(@NonNull InterceptorRegistry registry) {
         registry.addInterceptor(loggingInterceptor);
-        registry.addInterceptor(transactionInterceptor())
-                .addPathPatterns(FILINGS, TRANSACTIONS);
         registry.addInterceptor(new TokenPermissionsInterceptor())
                 .addPathPatterns(PARTNERSHIP);
         registry.addInterceptor(customUserAuthenticationInterceptor)
                 .addPathPatterns(PARTNERSHIP);
+        registry.addInterceptor(transactionInterceptor())
+                .addPathPatterns(FILINGS, TRANSACTIONS);
     }
 
     @Bean

src/test/java/uk/gov/companieshouse/limitedpartnershipsapi/config/InterceptorConfigTest.java

@@ -45,9 +45,9 @@ void addInterceptorsTest() {
 
         InOrder inOrder = inOrder(interceptorRegistry, interceptorRegistration);
         inOrder.verify(interceptorRegistry).addInterceptor(loggingInterceptor);
-        inOrder.verify(interceptorRegistry).addInterceptor(any(TransactionInterceptor.class));
         inOrder.verify(interceptorRegistry).addInterceptor(any(TokenPermissionsInterceptor.class));
         inOrder.verify(interceptorRegistry).addInterceptor(customUserAuthenticationInterceptor);
+        inOrder.verify(interceptorRegistry).addInterceptor(any(TransactionInterceptor.class));
 
         verify(interceptorRegistry, times(4)).addInterceptor(any());
     }