dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19505
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-06-24 11:39:19 +0700
message:
  enable form-based login for grant type authorization_code (oauth2)
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2015-06-23 19:48:46 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml	2015-06-24 04:39:19 +0000
@@ -31,11 +31,11 @@
     <sec:http-basic />
     <sec:anonymous />
 
-    <!--
-    <form-login authentication-failure-url="/login.jsp?authentication_error=true"
-      default-target-url="http://www.ourwebsite.com/"; login-page="/login.jsp"
-      login-processing-url="/login.do" />
-      -->
+    <sec:form-login authentication-failure-url="/dhis-web-commons/security/login.action?failed=true"
+      username-parameter="j_username" password-parameter="j_password"
+      login-page="/dhis-web-commons/security/login.action"
+      login-processing-url="/dhis-web-commons-security/login.action" />
+
   </sec:http>
 
   <!-- End OAuth2 -->