Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

[myslice.git] / portal / registrationview.py

diff --git a/portal/registrationview.py b/portal/registrationview.py
index e0a1ddf..909f2a1 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -17,7 +17,9 @@ from manifoldapi.manifoldapi    import execute_admin_query
 from manifold.core.query        import Query
 
 from portal.models              import PendingUser
-from portal.actions             import create_pending_user
+#from portal.actions             import create_pending_user
+# Edelberto - LDAP
+from portal.actions             import create_pending_user, ldap_create_user
 
 from myslice.theme import ThemeView
 
@@ -38,7 +40,7 @@ class RegistrationView (FreeAccessView, ThemeView):
         """
         errors = []
         authority_hrn = None
-        authorities_query = Query.get('authority').select('name', 'authority_hrn')
+        authorities_query = Query.get('authority').select('name','authority_hrn')
         authorities = execute_admin_query(wsgi_request, authorities_query)
         if authorities is not None:
             authorities = sorted(authorities)
@@ -57,6 +59,9 @@ class RegistrationView (FreeAccessView, ThemeView):
             current_site = Site.objects.get_current()
             current_site = current_site.domain
 
+            #authorities_query = Query.get('authority').select('name', 'authority_hrn')
+            #authorities = execute_admin_query(wsgi_request, authorities_query)
+    
             for authority in authorities:
                 if authority['name'] == wsgi_request.POST.get('org_name', ''):
                     authority_hrn = authority['authority_hrn']     
@@ -83,13 +88,21 @@ class RegistrationView (FreeAccessView, ThemeView):
             }
 
             # Construct user_hrn from email (XXX Should use common code)
+            # split_email = user_request['email'].split("@")[0] 
+            # split_email = split_email.replace(".", "_")
+            # user_request['user_hrn'] = user_request['authority_hrn'] \
+            #         + '.' + split_email
+            
             split_email = user_request['email'].split("@")[0] 
             split_email = split_email.replace(".", "_")
             # Replace + by _ => more convenient for testing and validate with a real email
             split_email = split_email.replace("+", "_")
-            user_request['user_hrn'] = user_request['authority_hrn'] \
-                     + '.' + split_email
-            
+
+            split_authority = user_request['authority_hrn'].split(".")[1]
+            username = split_email + '@' + split_authority
+            split_authority = user_request['authority_hrn'].split(".")[0]
+            user_request['user_hrn'] = split_authority + '.' + username
+
             # Validate input
             UserModel = get_user_model()
             if (re.search(r'^[\w+\s.@+-]+$', user_request['first_name']) == None):
@@ -153,8 +166,25 @@ class RegistrationView (FreeAccessView, ThemeView):
                 user_request['public_key']  = file_content
                 
             if not errors:
+                '''
+                try:
+                    # verify if is a  LDAP 
+                    mail = user_detail['email']
+                    login = mail.split('@')[0]
+                    org = mail.split('@')[1]
+                    o = org.split('.')[-2]
+                    dc = org.split('.')[-1]
+                    # To know if user is a LDAP user - Need to has a 'dc' identifier
+                    if dc == 'br' or 'eu':
+                        # LDAP insert directly - but with userEnable = FALSE
+                        ldap_create_user(wsgi_request, user_request, user_detail)
+                   
+                except Exception, e:
+                    print "LDAP: problem em access the LDAP with this credentail" 
+                '''
                 create_pending_user(wsgi_request, user_request, user_detail)
                 self.template_name = 'user_register_complete.html'
+            
                 return render(wsgi_request, self.template, {'theme': self.theme}) 
 
         else: