Merge OpenOLAT 12.1 to OpenOLAT default branch with d42b30984bcf855d3935f95da2418f43854a016b

src/main/java/org/olat/course/nodes/GTACourseNode.java

@@ -990,7 +990,7 @@ public class GTACourseNode extends AbstractAccessableCourseNode implements Persi
 	public void incrementUserAttempts(UserCourseEnvironment userCourseEnv, Role by) {
 		AssessmentManager am = userCourseEnv.getCourseEnvironment().getAssessmentManager();
 		Identity assessedIdentity = userCourseEnv.getIdentityEnvironment().getIdentity();
-		am.updateLastModifications(this, assessedIdentity, userCourseEnv, by);
+		am.incrementNodeAttempts(this, assessedIdentity, userCourseEnv, by);
 	}
 
 	@Override

src/main/java/org/olat/login/oauth/OAuthLoginModule.java

@@ -63,6 +63,7 @@ public class OAuthLoginModule extends AbstractSpringModule {
 	private boolean adfsEnabled;
 	private boolean adfsRootEnabled;
 	private String adfsApiKey;
+	private String adfsApiSecret;
 	private String adfsOAuth2Endpoint;
 	
 	private boolean openIdConnectIFEnabled;
@@ -128,6 +129,7 @@ public class OAuthLoginModule extends AbstractSpringModule {
 		String adfsRootEnabledObj = getStringPropertyValue("adfsRootEnabled", true);
 		adfsRootEnabled = "true".equals(adfsRootEnabledObj);
 		adfsApiKey = getStringPropertyValue("adfsApiKey", false);
+		adfsApiSecret = getStringPropertyValue("adfsApiSecret", false);
 		adfsOAuth2Endpoint = getStringPropertyValue("adfsOAuth2Endpoint", false);
 		
 		String openIdConnectIFEnabledObj = getStringPropertyValue("openIdConnectIFEnabled", true);
@@ -407,6 +409,15 @@ public class OAuthLoginModule extends AbstractSpringModule {
 		this.adfsApiKey = adfsApiKey;
 		setStringProperty("adfsApiKey", adfsApiKey, true);
 	}
+	
+	public String getAdfsApiSecret() {
+		return adfsApiSecret;
+	}
+
+	public void setAdfsApiSecret(String adfsApiSecret) {
+		this.adfsApiSecret = adfsApiSecret;
+		setStringProperty("adfsApiSecret", adfsApiSecret, true);
+	}
 
 	public String getAdfsOAuth2Endpoint() {
 		return adfsOAuth2Endpoint;

src/main/java/org/olat/login/oauth/spi/ADFSApi.java

@@ -93,8 +93,8 @@ public class ADFSApi extends DefaultApi20 {
         private static final String GRANT_TYPE_AUTHORIZATION_CODE = "authorization_code";
         private static final String GRANT_TYPE = "grant_type";
     	
-    	private final ADFSApi api;
-    	private OAuthConfig config;
+		private final ADFSApi api;
+		private OAuthConfig config;
     	
         public ADFSOAuth2Service(ADFSApi api, OAuthConfig config) {
             super(api, config);

src/main/java/org/olat/login/oauth/spi/ADFSProvider.java

@@ -89,7 +89,8 @@ public class ADFSProvider implements OAuthSPI {
 
 	@Override
 	public String getAppSecret() {
-		return "n/A";
+		return StringHelper.containsNonWhitespace(oauthModule.getAdfsApiSecret())
+				? oauthModule.getAdfsApiSecret() : "n/A";
 	}
 
 	@Override

src/main/java/org/olat/login/oauth/ui/OAuthAdminController.java

@@ -79,6 +79,7 @@ public class OAuthAdminController extends FormBasicController {
 	private MultipleSelectionElement adfsEl;
 	private MultipleSelectionElement adfsDefaultEl;
 	private TextElement adfsApiKeyEl;
+	private TextElement adfsApiSecretEl;
 	private TextElement adfsOAuth2EndpointEl;
 	
 	private MultipleSelectionElement openIdConnectIFEl;
@@ -217,10 +218,15 @@ public class OAuthAdminController extends FormBasicController {
 		
 		String adfsApiKey = oauthModule.getAdfsApiKey();
 		adfsApiKeyEl = uifactory.addTextElement("adfs.id", "adfs.api.id", 256, adfsApiKey, adfsCont);
+		String adfsApiSecret = oauthModule.getAdfsApiSecret();
+		adfsApiSecretEl = uifactory.addTextElement("adfs.secret", "adfs.api.secret", 256, adfsApiSecret, adfsCont);
+		adfsApiSecretEl.setHelpText("adfs.api.secret.hint");
+		
 		if(oauthModule.isAdfsEnabled()) {
 			adfsEl.select(keys[0], true);
 		} else {
 			adfsApiKeyEl.setVisible(false);
+			adfsApiSecretEl.setVisible(false);
 			adfsDefaultEl.setVisible(false);
 			adfsOAuth2EndpointEl.setVisible(false);
 		}
@@ -399,6 +405,7 @@ public class OAuthAdminController extends FormBasicController {
 			facebookApiSecretEl.setVisible(facebookEl.isAtLeastSelected(1));
 		} else if(source == adfsEl) {
 			adfsApiKeyEl.setVisible(adfsEl.isAtLeastSelected(1));
+			adfsApiSecretEl.setVisible(adfsEl.isAtLeastSelected(1));
 			adfsDefaultEl.setVisible(adfsEl.isAtLeastSelected(1));
 			adfsOAuth2EndpointEl.setVisible(adfsEl.isAtLeastSelected(1));
 		} else if(source == openIdConnectIFEl) {
@@ -466,11 +473,13 @@ public class OAuthAdminController extends FormBasicController {
 		if(adfsEl.isAtLeastSelected(1)) {
 			oauthModule.setAdfsEnabled(true);
 			oauthModule.setAdfsApiKey(adfsApiKeyEl.getValue());
+			oauthModule.setAdfsApiSecret(adfsApiSecretEl.getValue());
 			oauthModule.setAdfsRootEnabled(adfsDefaultEl.isAtLeastSelected(1));
 			oauthModule.setAdfsOAuth2Endpoint(adfsOAuth2EndpointEl.getValue());
 		} else {
 			oauthModule.setAdfsEnabled(false);
 			oauthModule.setAdfsApiKey("");
+			oauthModule.setAdfsApiSecret("");
 			oauthModule.setAdfsRootEnabled(false);
 			oauthModule.setAdfsOAuth2Endpoint("");
 		}

src/main/java/org/olat/login/oauth/ui/_i18n/LocalStrings_de.properties

@@ -3,6 +3,8 @@ add.openidconnectif.custom=Custom Open ID Connect erstellen
 adfs.admin.title=Active directory federation system
 adfs.admin.title.alt=Active directory federation system
 adfs.api.id=Client ID
+adfs.api.secret=Client secret
+adfs.api.secret.hint=Nur f\u00FCr ADFS 2016
 adfs.default.enabled=Automatische Umleitung (Lokaler Login \u00FCber /maintenance/)
 adfs.enabled=ADFS
 adfs.oauth2.endpoint=OAuth2 endpoint (oAuthEndpoint)

src/main/java/org/olat/login/oauth/ui/_i18n/LocalStrings_en.properties

@@ -3,6 +3,8 @@ add.openidconnectif.custom=Add custom Open ID Connect
 adfs.admin.title=Active directory federation system
 adfs.admin.title.alt=Active directory federation system
 adfs.api.id=Client ID
+adfs.api.secret=Client secret
+adfs.api.secret.hint=Only for ADFS 2016
 adfs.default.enabled=Automatic redirect (local login via /maintenance)
 adfs.enabled=ADFS
 adfs.oauth2.endpoint=OAuth2 endpoint (oAuthEndpoint)

src/main/java/org/olat/login/oauth/ui/_i18n/LocalStrings_fr.properties

@@ -3,6 +3,7 @@ add.openidconnectif.custom=Ajouter un Open ID Connect personnalis\u00E9
 adfs.admin.title=Active directory federation system
 adfs.admin.title.alt=Active directory federation system
 adfs.api.id=ID client
+adfs.api.secret=Secret client
 adfs.default.enabled=Login au niveau racine ( redirig\u00E9 dmz )
 adfs.enabled=ADFS
 adfs.oauth2.endpoint=OAuth2 endpoint (oAuthEndpoint)

src/main/java/org/olat/login/oauth/ui/_i18n/LocalStrings_it.properties

@@ -3,6 +3,7 @@ add.openidconnectif.custom=Aggiungere Open ID Connect personalizzato
 adfs.admin.title=Active directory federation system
 adfs.admin.title.alt=Active directory federation system
 adfs.api.id=Client ID
+adfs.api.secret=Client secret
 adfs.default.enabled=Root login (redirezione dmz)
 adfs.enabled=ADFS
 adfs.oauth2.endpoint=OAuth2 endpoint (oAuthEndpoint)

src/main/java/org/olat/login/oauth/ui/_i18n/LocalStrings_pt_BR.properties

@@ -3,6 +3,7 @@ add.openidconnectif.custom=Adicionar Open ID Connect personalizado
 adfs.admin.title=Sistema federativo de diret\u00F3rio ativo
 adfs.admin.title.alt=Sistema federativo de diret\u00F3rio ativo
 adfs.api.id=Client ID
+adfs.api.secret=Client secret
 adfs.default.enabled=Root login (redirect dmz)
 adfs.enabled=ADFS
 adfs.oauth2.endpoint=OAuth2 endpoint (oAuthEndpoint)