Commit f0155e8c authored by Matija Obreza's avatar Matija Obreza
Browse files

Spring security.xml and oauth-security.xml conflicted in authenticationManager bean

parent 55e216c2
......@@ -29,7 +29,7 @@
<!-- Authentication manager -->
<bean name="passwordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" />
<sec:authentication-manager alias="authenticationManager">
<sec:authentication-manager id="authenticationManager">
<sec:authentication-provider user-service-ref="authUserDetailsService">
<sec:password-encoder ref="passwordEncoder" />
</sec:authentication-provider>
......@@ -49,7 +49,7 @@
<sec:http pattern="/webapi/**" security="none" create-session="stateless" />
<!-- Closed page and Authentication filter -->
<sec:http auto-config="true" use-expressions="true">
<sec:http auto-config="true" use-expressions="true" authentication-manager-ref="authenticationManager">
<!-- <intercept-url pattern="/data/**" access="isAuthenticated()" /> -->
<sec:intercept-url pattern="/admin/**" access="hasRole('ADMINISTRATOR')" />
<sec:intercept-url pattern="/1/admin/**" access="hasRole('ADMINISTRATOR')" />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment