Merged #191 "Allow authentication providers to control user and team role c...

James Moger

2014-09-26 3636765f0d46e513cb7aa1c665c49b933f435b22

 src/main/java/com/gitblit/servlet/AuthenticationFilter.java

@@ -36,6 +36,7 @@
import org.slf4j.LoggerFactory;



import com.gitblit.Constants;

import com.gitblit.Constants.Role;
import com.gitblit.manager.IAuthenticationManager;

import com.gitblit.models.UserModel;

import com.gitblit.utils.DeepCopier;

@@ -172,7 +173,7 @@


      @Override

      public boolean isUserInRole(String role) {

         if (role.equals(Constants.ADMIN_ROLE)) {

         if (role.equals(Role.ADMIN.getRole())) {
            return user.canAdmin();

         }

         // Gitblit does not currently use actual roles in the traditional