You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2015/06/29 01:35:58 UTC
svn commit: r1688078 - in
/manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans:
APIProfile.java AdminProfile.java
Author: kwright
Date: Sun Jun 28 23:35:57 2015
New Revision: 1688078
URL: http://svn.apache.org/r1688078
Log:
Hook up auth into API and UI logins
Modified:
manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/APIProfile.java
manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/AdminProfile.java
Modified: manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/APIProfile.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/APIProfile.java?rev=1688078&r1=1688077&r2=1688078&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/APIProfile.java (original)
+++ manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/APIProfile.java Sun Jun 28 23:35:57 2015
@@ -85,8 +85,9 @@ public class APIProfile implements HttpS
sessionCleanup();
try
{
+ IAuth auth = AuthFactory.make(threadContext);
// Check if everything is in place.
- if (ManifoldCF.verifyAPILogin(threadContext,userID,userPassword))
+ if (auth.verifyAPILogin(userID,userPassword))
{
isLoggedIn = true;
loginTime = System.currentTimeMillis();
Modified: manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/AdminProfile.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/AdminProfile.java?rev=1688078&r1=1688077&r2=1688078&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/AdminProfile.java (original)
+++ manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/beans/AdminProfile.java Sun Jun 28 23:35:57 2015
@@ -98,8 +98,9 @@ public class AdminProfile implements Htt
sessionCleanup();
try
{
+ IAuth auth = AuthFactory.make(threadContext);
// Check if everything is in place.
- if (ManifoldCF.verifyLogin(threadContext,userID,userPassword))
+ if (auth.verifyUILogin(userID,userPassword))
{
isLoggedIn = true;
loginTime = System.currentTimeMillis();