Changeset 5452

Timestamp:

18 Aug 2010, 12:23:43 (14 years ago)

Author:

uli

Message:

Handle JAMB screened applicants and others differently.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/jambtables/authentication.py (modified) (4 diffs)

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
+from waeup.sirp.jambtables.util import get_applicant_data, application_exists
 from waeup.sirp.accesscodes import get_access_code
 
@@ -212 +212 @@
         credentials = None
 
-        print "CRED2: %s, %s" % (access_code, jamb_reg_no)
         if access_code and jamb_reg_no:
             credentials = JAMBApplicantCredentials(
@@ -228 +227 @@
         if not credentials:
             return None
-        if credentials.getJAMBRegNo() is not None:
-            return {'accesscode': credentials.getAccessCode(),
-                    'jambregno': credentials.getJAMBRegNo()}
-        return {'accesscode': credentials.getAccessCode()}
+        if not IJAMBApplicantSessionCredentials.providedBy(credentials):
+            # Entered credentials are ordinary applicant credentials,
+            # not JAMB-screened applicant credentials
+            return {'accesscode': credentials.getAccessCode()}
+        return {'accesscode': credentials.getAccessCode(),
+                'jambregno': credentials.getJAMBRegNo()}
+
 
 
@@ -255 +257 @@
             # XXX: log this.
             return None
+        if credentials['jambregno'] is not None:
+            # applications of JAMB applicants must exist already
+            if not application_exists(credentials['jambregno']):
+                return None
         return ApplicantPrincipalInfo(
             credentials['accesscode'], credentials['jambregno']