Add proper ordering to login plugins config opts

[cascardo/ipsilon.git] / ipsilon / login / authform.py

diff --git a/ipsilon/login/authform.py b/ipsilon/login/authform.py
index 9e8e56c..d372eff 100755 (executable)
--- a/ipsilon/login/authform.py
+++ b/ipsilon/login/authform.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipsilon.login.common import LoginPageBase, LoginManagerBase
+from ipsilon.login.common import LoginFormBase, LoginManagerBase
 from ipsilon.login.common import FACILITY
 from ipsilon.util.plugin import PluginObject
 from ipsilon.util.user import UserSession
@@ -26,19 +26,14 @@ import cherrypy
 import subprocess
 
 
-class Form(LoginPageBase):
-
-    def GET(self, *args, **kwargs):
-        context = self.create_tmpl_context()
-        # pylint: disable=star-args
-        return self._template('login/form.html', **context)
+class Form(LoginFormBase):
 
     def POST(self, *args, **kwargs):
         us = UserSession()
         us.remote_login()
         user = us.get_user()
         if not user.is_anonymous:
-            return self.lm.auth_successful(user.name)
+            return self.lm.auth_successful(user.name, 'password')
         else:
             try:
                 error = cherrypy.request.headers['EXTERNAL_AUTH_ERROR']
@@ -47,28 +42,6 @@ class Form(LoginPageBase):
                 cherrypy.log.error("Error: %s" % error)
             return self.lm.auth_failed()
 
-    def root(self, *args, **kwargs):
-        op = getattr(self, cherrypy.request.method, self.GET)
-        if callable(op):
-            return op(*args, **kwargs)
-
-    def create_tmpl_context(self, **kwargs):
-        next_url = None
-        if self.lm.next_login is not None:
-            next_url = self.lm.next_login.path
-
-        context = {
-            "title": 'Login',
-            "action": '%s/login/form' % self.basepath,
-            "service_name": self.lm.service_name,
-            "username_text": self.lm.username_text,
-            "password_text": self.lm.password_text,
-            "description": self.lm.help_text,
-            "next_url": next_url,
-        }
-        context.update(kwargs)
-        return context
-
 
 class LoginManager(LoginManagerBase):
 
@@ -77,15 +50,11 @@ class LoginManager(LoginManagerBase):
         self.name = 'form'
         self.path = 'form'
         self.page = None
+        self.service_name = 'form'
         self.description = """
 Form based login Manager. Relies on mod_intercept_form_submit plugin for
  actual authentication. """
         self._options = {
-            'service name': [
-                """ The name of the PAM service used to authenticate. """,
-                'string',
-                'remote'
-            ],
             'help text': [
                 """ The text shown to guide the user at login time. """,
                 'string',
@@ -102,10 +71,7 @@ Form based login Manager. Relies on mod_intercept_form_submit plugin for
                 'Password'
             ],
         }
-
-    @property
-    def service_name(self):
-        return self.get_config_value('service name')
+        self.conf_opt_order = ['username text', 'password text', 'help text']
 
     @property
     def help_text(self):
@@ -120,7 +86,7 @@ Form based login Manager. Relies on mod_intercept_form_submit plugin for
         return self.get_config_value('password text')
 
     def get_tree(self, site):
-        self.page = Form(site, self)
+        self.page = Form(site, self, 'login/form')
         return self.page