Exthex Version 0.2

1 files changed, 16 insertions, 11 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java
index 3d2e35ec5..63aa1a1cb 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAOAuth20Config.java
@@ -29,22 +29,27 @@ public class OAOAuth20Config {
 		
 		AuthComponentOA authdata = dbOAConfig.getAuthComponentOA();
 		if (authdata != null) {
-			OAOAUTH20 config = authdata.getOAOAUTH20();
 			// set client id to public url prefix
 			this.clientId = dbOAConfig.getPublicURLPrefix();
 			
-			// validate secret
-			if (config != null && StringUtils.isNotEmpty(config.getOAuthClientSecret())) {
-				this.clientSecret = config.getOAuthClientSecret();
-			} else {
-				this.generateClientSecret();
-			}
+			OAOAUTH20 config = authdata.getOAOAUTH20();
 			
-			// validate redirectUri
-			if (config != null && StringUtils.isNotEmpty(config.getOAuthRedirectUri()) && OAuth20Util.isUrl(config.getOAuthRedirectUri())) {
-				this.redirectUri = config.getOAuthRedirectUri();
+			if (config != null) {
+				// validate secret
+				if (StringUtils.isNotEmpty(config.getOAuthClientSecret())) {
+					this.clientSecret = config.getOAuthClientSecret();
+				} else {
+					this.generateClientSecret();
+				}
+				
+				// validate redirectUri
+				if (StringUtils.isNotEmpty(config.getOAuthRedirectUri()) && OAuth20Util.isUrl(config.getOAuthRedirectUri())) {
+					this.redirectUri = config.getOAuthRedirectUri();
+				} else {
+					errors.add(LanguageHelper.getErrorString("error.oa.oauth.redirecturi"));
+				}
 			} else {
-				errors.add(LanguageHelper.getErrorString("error.oa.oauth.redirecturi"));
+				this.generateClientSecret();
 			}
 		}