Changeset 5444

Timestamp:

16 Aug 2010, 10:32:46 (14 years ago)

Author:

uli

Message:

Use different fields when authenticating applicants.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/jambtables

Files:

• authentication.py (modified) (5 diffs)
• browser_templates/login_pde.pt (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/jambtables/authentication.py

@@ -38 +38 @@
     IApplicantPrincipalInfo, IApplicantPrincipal, IApplicantSessionCredentials,
     IJAMBApplicantSessionCredentials)
+from waeup.sirp.jambtables.util import get_applicant_data
 
 class PortalUser(grok.Role):
@@ -84 +85 @@
     # def __init__(self, reg_no, access_code):
     def __init__(self, access_code, jamb_reg_no=None):
-        self.id = princial_id(access_code, jamb_reg_no)
+        self.id = principal_id(access_code, jamb_reg_no)
         self.title = u'Applicant'
         self.description = u'An Applicant'
@@ -155 +156 @@
         return self.access_code
 
+    def getLogin(self):
+        """Stay compatible with non-applicant authenticators.
+        """
+        return None
+
+    def getPassword(self):
+        """Stay compatible with non-applicant authenticators.
+        """
+        return None
+    
 class JAMBApplicantCredentials(ApplicantCredentials):
     """Credentials class for JAMB-screened applicants.
@@ -177 +188 @@
 
     loginpagename = 'login'
-    accesscode_field = 'form.access_code'
+    accesscode_prefix_field = 'form.prefix'
+    accesscode_series_field = 'form.ac_series'
+    accesscode_number_field = 'form.ac_number'
     jamb_reg_no_field = 'form.jamb_reg_no'
 
@@ -188 +201 @@
         sessionData = session.get(
             'zope.pluggableauth.browserplugins')
-        access_code = request.get(self.accesscode_field, None)
+        access_code_prefix = request.get(self.accesscode_prefix_field, None)
+        access_code_series = request.get(self.accesscode_series_field, None)
+        access_code_no = request.get(self.accesscode_number_field, None)
         jamb_reg_no = request.get(self.jamb_reg_no_field, None)
+        access_code = '%s-%s-%s' % (
+            access_code_prefix, access_code_series, access_code_no)
+        if None in [access_code_prefix, access_code_series, access_code_no]:
+            access_code = None
         credentials = None
 
+        print "CRED2: %s, %s" % (access_code, jamb_reg_no)
         if access_code and jamb_reg_no:
             credentials = JAMBApplicantCredentials(

main/waeup.sirp/trunk/src/waeup/sirp/jambtables/browser_templates/login_pde.pt

@@ -12 +12 @@
         <td width="30%"><label for="reg_no">JAMB Registration Number</label></td>
         <td>
-          <input type="text" name="reg_no"
+          <input type="text" name="form.jamb_reg_no"
                  value="" tal:attributes="value view/reg_no" /></td>
       </tr>
       <tr>
-        <td><label for="ac_series">Access Code</label></td>
+        <input type="hidden" name="form.prefix" value="PUDE" />
+        <td><label for="form.ac_series">Access Code</label></td>
         <td>
-          PUDE-<input name="ac_series" type="text" size="3" maxlength="3"
+          PUDE-<input name="form.ac_series" type="text" size="3" maxlength="3"
                       value="" tal:attributes="value view/ac_series"
-          />-<input name="ac_number" type="text" size="10" maxlength="10"
+          />-<input name="form.ac_number" type="text" size="10" maxlength="10"
                     value="" tal:attributes="value view/ac_number" />
         </td>