Merge pull request #22 from KB-iGOT/4.8.28-ecLogin

4.8.28 ec login

Author: rajeevsathish

keycloak/sms-provider/pom.xml

@@ -121,5 +121,11 @@
 			<!--<scope>test</scope> -->
 		</dependency>
 
-	</dependencies>
+	
+   <dependency>
+     <groupId>org.apache.commons</groupId>
+     <artifactId>commons-lang3</artifactId>
+     <version>3.9</version>
+   </dependency>
+ </dependencies>
 </project>

keycloak/sms-provider/src/main/java/org/sunbird/keycloak/login/PasswordAndOtpAuthenticator.java

@@ -73,7 +73,7 @@ private enum CODE_STATUS {
 	@Override
 	public void authenticate(AuthenticationFlowContext context) {
 		String secretKey = context.getAuthenticationSession().getAuthNote(Constants.SECRET_KEY);
-		if (StringUtils.isBlank(secretKey)) {
+        if (StringUtils.isBlank(secretKey)) {
 			// Generate the secret key
 			secretKey = generateSecretKey();
 			logger.info("Generated new secret key.");
@@ -86,7 +86,13 @@ public void authenticate(AuthenticationFlowContext context) {
 
 		LoginFormsProvider formsProvider = context.form();
 		formsProvider.setAttribute(Constants.SECRET_KEY, secretKey);
-		context.challenge(formsProvider.createForm(Constants.LOGIN_PAGE));
+		if(context.getAuthenticationSession().getRedirectUri().contains(Constants.EC_LOGIN)){
+			logger.info("loading ec login page");
+			context.challenge(formsProvider.createForm(Constants.EC_LOGIN_PAGE));
+		}else{
+			logger.info("loading login page");
+		    context.challenge(formsProvider.createForm(Constants.LOGIN_PAGE));
+		}
 	}
 
 	@Override

keycloak/sms-provider/src/main/java/org/sunbird/keycloak/utils/Constants.java

@@ -106,4 +106,6 @@ private Constants() {
 	public static final String ASYNC = "async";
 	public static final String SECRET_KEY = "secretKey";
 	public static final String IV = "iv";
+	public static final String EC_LOGIN = "/eclogin/";
+	public static final String EC_LOGIN_PAGE="eclogin.ftl";
 }