From 8049b1c7822f5a59ef3eacf44da51739b5fbab3b Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 30 Apr 2015 09:08:05 +0200
Subject: [PATCH] OO-1534: search the provider with "ignore case"
---
.../java/org/olat/login/LoginAuthprovidersController.java | 7 +++++--
src/main/java/org/olat/login/LoginModule.java | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/login/LoginAuthprovidersController.java b/src/main/java/org/olat/login/LoginAuthprovidersController.java
index 31badd48ef9..7062d3529c4 100644
--- a/src/main/java/org/olat/login/LoginAuthprovidersController.java
+++ b/src/main/java/org/olat/login/LoginAuthprovidersController.java
@@ -141,10 +141,13 @@ public class LoginAuthprovidersController extends MainLayoutBasicController impl
contentBorn.contextPut("browserWarningOn", bwo ? Boolean.TRUE : Boolean.FALSE);
// prepare login
- if (provider == null) provider = loginModule.getDefaultProviderName();
+ if (provider == null) {
+ provider = loginModule.getDefaultProviderName();
+ }
AuthenticationProvider authProvider = loginModule.getAuthenticationProvider(provider);
- if (authProvider == null)
+ if (authProvider == null) {
throw new AssertException("Invalid authentication provider: " + provider);
+ }
//clean-up controllers
if(authController != null) {
diff --git a/src/main/java/org/olat/login/LoginModule.java b/src/main/java/org/olat/login/LoginModule.java
index 6ccea99d487..25007f6c13a 100644
--- a/src/main/java/org/olat/login/LoginModule.java
+++ b/src/main/java/org/olat/login/LoginModule.java
@@ -190,7 +190,7 @@ public class LoginModule extends AbstractSpringModule {
public AuthenticationProvider getAuthenticationProvider(String provider) {
AuthenticationProvider authenticationProvider = null;
for(AuthenticationProvider authProvider:authenticationProviders) {
- if(authProvider.getName().equals(provider)) {
+ if(authProvider.getName().equalsIgnoreCase(provider)) {
authenticationProvider = authProvider;
}
}
--
GitLab