Changeset 5907

Timestamp:

31 Mar 2011, 23:00:28 (14 years ago)

Author:

uli

Message:

Move JAMB-related authentication pieces (including ifaces) to jambtables module.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• authentication.py (modified) (3 diffs)
• interfaces.py (modified) (2 diffs)
• jambtables/authentication.py (added)
• jambtables/interfaces.py (modified) (2 diffs)

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

@@ -37 +37 @@
 from waeup.sirp.applicants.interfaces import (
     IApplicantPrincipalInfo, IApplicantPrincipal, IApplicantSessionCredentials,
-    IJAMBApplicantSessionCredentials)
+    )
 from waeup.sirp.applicants import get_applicant_data
 from waeup.sirp.interfaces import IAuthPluginUtility
@@ -135 +135 @@
         return None
     
-class JAMBApplicantCredentials(ApplicantCredentials):
-    """Credentials class for JAMB-screened applicants.
-    """
-    grok.implements(IJAMBApplicantSessionCredentials)
-
-    def __init__(self, access_code):
-        self.access_code = access_code
-
 class WAeUPApplicantCredentialsPlugin(grok.GlobalUtility,
                                       SessionCredentialsPlugin):
@@ -189 +181 @@
             # its structure.
             return None
-
-        # Entered credentials are ordinary applicant credentials,
-        # not JAMB-screened applicant credentials
         return {'accesscode': credentials.getAccessCode()}
 

main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

@@ -710 +710 @@
         )
 
-class IJAMBApplicantsFormChallenger(IApplicantsFormChallenger):
-    """A challenger that uses a browser form to collect applicant
-       credentials for applicants in JAMB process.
-
-       JAMB-screened applicants have to provide an extra registration
-       no. provided by JAMB.
-    """
-    jamb_reg_no_field = schema.TextLine(
-        title = u'JAMB registration no.',
-        description = u'''Field of the login page which is looked up for
-                          the JAMB registration number.''',
-        default = u'jamb_reg_no',
-        )
 
 class IApplicantSessionCredentials(Interface):
@@ -735 +722 @@
         """Return the access code."""
 
-
-class IJAMBApplicantSessionCredentials(IApplicantSessionCredentials):
-    """Interface for storing and accessing JAMB applicant credentials in a
-       session.
-    """
-
-    def __init__(access_code, jamb_reg_no):
-        """Create credentials for JAMB screened applicants."""
-
-    def getJAMBRegNo():
-        """Return the JAMB registration no."""
 
 class IApplicantsContainerProvider(Interface):

main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/interfaces.py

@@ -24 +24 @@
 from zope import schema
 from waeup.sirp.interfaces import IWAeUPObject
-from waeup.sirp.applicants.interfaces import IApplicantBaseData
+from waeup.sirp.applicants.interfaces import (
+    IApplicantBaseData, IApplicantsFormChallenger,
+    IApplicantSessionCredentials,
+    )
 
 
@@ -86 +89 @@
         required = True,
         )
+
+class IJAMBApplicantsFormChallenger(IApplicantsFormChallenger):
+    """A challenger that uses a browser form to collect applicant
+       credentials for applicants in JAMB process.
+
+       JAMB-screened applicants have to provide an extra registration
+       no. provided by JAMB.
+    """
+    jamb_reg_no_field = schema.TextLine(
+        title = u'JAMB registration no.',
+        description = u'''Field of the login page which is looked up for
+                          the JAMB registration number.''',
+        default = u'jamb_reg_no',
+        )
+
+class IJAMBApplicantSessionCredentials(IApplicantSessionCredentials):
+    """Interface for storing and accessing JAMB applicant credentials in a
+       session.
+    """
+
+    def __init__(access_code, jamb_reg_no):
+        """Create credentials for JAMB screened applicants."""
+
+    def getJAMBRegNo():
+        """Return the JAMB registration no."""