Configuration Changes

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@49 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

1 files changed, 98 insertions, 14 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java
index c9254317..1ea265ad 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java
@@ -16,9 +16,18 @@
 package at.asit.pdfover.gui.workflow.states.mobilebku;
 
 // Imports
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.gui.composites.MobileBKUEnterNumberComposite;
+import at.asit.pdfover.gui.exceptions.InvalidNumberException;
+import at.asit.pdfover.gui.exceptions.InvalidPasswordException;
+import at.asit.pdfover.gui.exceptions.PasswordTooLongException;
+import at.asit.pdfover.gui.exceptions.PasswordTooShortException;
+
 /**
  * 
  */
@@ -30,36 +39,111 @@ public class ATrustHelper {
 			.getLogger(ATrustHelper.class);
 
 	/**
+	 * Regular expression for mobile phone numbers: this allows the entrance of
+	 * mobile numbers in the following formats:
+	 * 
+	 * +(countryCode)99999999999 00(countryCode)99999999999 099999999999
+	 * 1030199999999999 (A-Trust Test bku)
+	 */
+	private static final String NUMBER_REGEX = "^((\\+[\\d]{2})|(00[\\d]{2})|(0)|(10301))([1-9][\\d]+)$"; //$NON-NLS-1$
+
+	/**
+	 * Extracts a substring from data starting after start and ending with end
+	 * 
 	 * @param data
+	 *            the whole data string
 	 * @param start
+	 *            the start marker
 	 * @param end
-	 * @return
+	 *            the end marker
+	 * @return the substring
 	 * @throws Exception
 	 */
-	public static String extractTag(String data, String start, String end) throws Exception {
+	public static String extractTag(String data, String start, String end)
+			throws Exception {
 		int startidx = data.indexOf(start);
-		if(startidx > 0) {
-			startidx = startidx+start.length();
+		if (startidx > 0) {
+			startidx = startidx + start.length();
 			int endidx = data.indexOf(end, startidx);
-			if(endidx > startidx) {
+			if (endidx > startidx) {
 				return data.substring(startidx, endidx);
-			} else {
-				// TODO: throw exception
-				throw new Exception("end tag not available!");
 			}
-		} else {
-			// TODO: throw exception
-			throw new Exception("start tag not available!");
+			// TODO: throw proper exception
+			log.error("extracting Tag: end tag not valid!: " + start + " ... " + end); //$NON-NLS-1$//$NON-NLS-2$
+			throw new Exception("end tag not available!"); //$NON-NLS-1$
 		}
+		// TODO: throw proper exception
+		log.error("extracting Tag: start tag not valid!: " + start + " ... " + end); //$NON-NLS-1$//$NON-NLS-2$
+		throw new Exception("start tag not available!"); //$NON-NLS-1$
 	}
-	
+
+	/**
+	 * Validates the Mobile phone number
+	 * 
+	 * @param number
+	 * @return the normalized Phone number
+	 * @throws InvalidNumberException
+	 */
+	public static String normalizeMobileNumber(String number)
+			throws InvalidNumberException {
+		// Verify number and normalize
+
+		// Compile and use regular expression
+		Pattern pattern = Pattern.compile(NUMBER_REGEX);
+		Matcher matcher = pattern.matcher(number);
+
+		if (!matcher.find()) {
+			throw new InvalidNumberException();
+		}
+
+		if (matcher.groupCount() != 6) {
+			throw new InvalidNumberException();
+		}
+
+		String countryCode = matcher.group(1);
+
+		String normalNumber = matcher.group(6);
+
+		if (countryCode.equals("10301")) { //$NON-NLS-1$
+			// A-Trust Testnumber! Don't change
+			return number;
+		}
+
+		countryCode = countryCode.replace("00", "+"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		if (countryCode.equals("0")) { //$NON-NLS-1$
+			countryCode = "+43"; //$NON-NLS-1$
+		}
+
+		return countryCode + normalNumber;
+	}
+
+	/**
+	 * Validate given Password for Mobile BKU
+	 * 
+	 * @param password
+	 * @throws InvalidPasswordException
+	 */
+	public static void validatePassword(String password)
+			throws InvalidPasswordException {
+		if (password.length() < 6 || password.length() > 20) {
+			if (password.length() < 6) {
+				throw new PasswordTooShortException();
+			}
+			throw new PasswordTooLongException();
+		}
+	}
+
 	/**
+	 * Removes file extension from URL
+	 * 
 	 * @param query
-	 * @return
+	 *            the url string
+	 * @return the stripped url
 	 */
 	public static String stripQueryString(String query) {
 		int pathidx = query.lastIndexOf('/');
-		if(pathidx > 0) {
+		if (pathidx > 0) {
 			return query.substring(0, pathidx);
 		}
 		return query;