Fixed typos, especially the wrong attribute in <form>

dal/dal/settings.py

@@ -45,6 +45,16 @@ AUTH_LDAP_USER_SEARCH = LDAPSearchUnion(
 
 # LDAP config end
 
+# Django nameko config
+
+# Where's the Rabbitmq at
+NAMEKO_CONFIG = { 
+        'AMQP_URI': 'amqp://guest:guest@127.0.0.1'
+    }
+
+# Standard pool size
+NAMEKO_POOL_SIZE = 4
+
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -71,6 +81,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'dal',
 ]
 
 MIDDLEWARE = [

dal/dal/templates/changeddata.html

@@ -9,6 +9,6 @@
 	<li> Email: {{email}} </li>
 </ul>
 <br><br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Back to indexpage">
 </form>

dal/dal/templates/changepassword.html

@@ -2,12 +2,12 @@
 
 <h2> Changing the password for {{user}} </h2>
 <br><br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Back to indexpage">
 </form>
 <br><br>
 To change the password for {{user}}, please supply 
-<form action={% url 'change_password' %} type="post">
+<form action={% url 'change_password' %} method="post">
 	{% csrf_token %}
 	<br>The old password:<br>  
 	<input type="password" name="oldpassword" id="oldpassword">

dal/dal/templates/changeuserdata.html

@@ -2,11 +2,11 @@
 
 <h2> Changing user data for {{user}} </h2>
 <br><br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Back to indexpage">
 </form>
 <br><br>
-<form action={% url 'change_data' %} type="post">
+<form action={% url 'change_data' %} method="post">
 	{% csrf_token %}
 	<br>Firstname:<br>
 	<input type="text" name="firstname" id="firstname" value="{{firstname}}">

dal/dal/templates/deleteaccount.html

@@ -2,12 +2,12 @@
 
 <h2> Deleting an Account </h2>
 <br><br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Back to indexpage">
 </form>
 <br><br>
 To delete an account, please type the username and password below:
-<form action={% url 'account_delete' %} type="post">
+<form action={% url 'account_delete' %} method="post">
 	<br><br>Username:<br>
 	<input type="text" name="username" id="username">
 	<br><br>Password:<br>

dal/dal/templates/deleteduser.html

@@ -2,6 +2,6 @@
 
 <h2> The user {{user}} was deleted from our system. </h2>
 <br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Back to indexpage">
 </form>

dal/dal/templates/error.html

@@ -6,10 +6,10 @@ While trying to {{service}}, an error was encountered: {{error}}
 <br><br>
 You can try to:
 <br>
-<form action={% url urlname %} type="get">
+<form action={% url urlname %} method="get">
 	<input type="submit" value="Go back and try again">
 </form>
 <br>or<br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Go to the indexpage">
 </form>

dal/dal/templates/landing.html

@@ -3,7 +3,8 @@
 <h2> Welcome to the ungleich user service </h2>
 <br><br>
 If you want to use the user service, you will need an account on our system. If you already have one, please login below:
-<form action={% url 'index' %} type="post">
+<form action={% url 'index' %} method="post">
+	{% csrf_token %}
 	<br><br>Username:<br>
 	<input type="text" name="username" id="username">
 	<br><br>Password:<br>
@@ -12,10 +13,10 @@ If you want to use the user service, you will need an account on our system. If
 	<input type="submit" value="Submit">
 </form>
 <br><br>If you have an account, but forgot your password, please visit our password reset page:
-<form action={% url 'reset_password' %} type="get">
+<form action={% url 'reset_password' %} method="get">
 	<input type="submit" value="Password reset">
 </form>
 <br><br>If you don't have an account, please register yourself with us:
-<form action={% url 'register' %} type="get">
+<form action={% url 'register' %} method="get">
 	<input type="submit" value="Register an user">
 </form>

dal/dal/templates/loginfailed.html

@@ -2,10 +2,10 @@
 
 <h2> Sorry, but your login has failed </h2>
 <br><br>This service runs for our LDAP users, so maybe you don't already have an LDAP account with us? If so, please register one.
-<form action={% url 'register' %} type="get">
+<form action={% url 'register' %} method="get">
 	<input type="submit" value="Register an user">
 </form>
 <br><br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Back to indexpage">
 </form>

dal/dal/templates/mustbeloggedin.html

@@ -2,6 +2,6 @@
 
 <h2> You must be logged in to access this page </h2>
 <br><br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Back to indexpage">
 </form>

dal/dal/templates/registeruser.html

@@ -2,13 +2,13 @@
 
 <h2> Register an user at ungleich </h2>
 <br><br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Back to indexpage">
 </form>
 <br><br>
 To register yourself an user, please fill out the fields below:
 <br>
-<form action={% url 'register' %} type="post">
+<form action={% url 'register' %} method="post">
 	{% csrf_token %}
 	<br>Username (alphanumeric):<br>
 	<input type="text" name="username" id="username">

dal/dal/templates/resetpassword.html

@@ -5,7 +5,7 @@
 To reset your password, please enter your username below. You will get an email asking you to confirm this and after confirmation an email with your
 temporary password. Please remember to change it immediately after logging in.
 <br>
-<form action={% url 'reset_password' %} type="post">
+<form action={% url 'reset_password' %} method="post">
 	{% csrf_token %}
 	Username:<br>
 	<input type="text" name="user" id="user">

dal/dal/templates/send_resetrequest.html

@@ -4,6 +4,6 @@
 <br><br>
 You will shortly get the confirmation email at {{email}} to confirm that you wish to reset the password for {{user}}.
 <br><br>
-<form action={% url 'index' %} type="get">
+<form action={% url 'index' %} method="get">
 	<input type="submit" value="Back to indexpage">
 </form>

dal/dal/templates/useroptions.html

@@ -4,18 +4,18 @@
 <br><br>
 You have the following options:
 <br>
-<form action={% url 'change_data' %} type="get">
+<form action={% url 'change_data' %} method="get">
 	<input type="submit" value="Change your userdata">
 </form>
 <br>
-<form action={% url 'change_password' %} type="get">
+<form action={% url 'change_password' %} method="get">
 	<input type="submit" value="Change your password">
 </form>
 <br>
-<form action={% url 'reset_password' %} type="get">
+<form action={% url 'reset_password' %} method="get">
 	<input type="submit" value="Reset your password">
 </form>
 <br>
-<form action={% url 'account_delete' %} type="get">
+<form action={% url 'account_delete' %} method="get">
 	<input type="submit" value="Delete your account">
 </form>

dal/dal/urls.py

@@ -18,14 +18,14 @@ from django.urls import path
 from django.conf.urls import url
 from django.contrib import admin
 
-from .views import Register, ChangeData, ResetPassword, DeleteAccount, Index
+from .views import Register, ChangeData, ChangePassword, ResetPassword, DeleteAccount, Index
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
+#    path('admin/', admin.site.urls),
     path('register/', Register.as_view(), name="register"),
     path('changedata/', ChangeData.as_view(), name="change_data"),
     path('resetpassword/', ResetPassword.as_view(), name="reset_password"),
     path('changepassword/', ChangePassword.as_view(), name="change_password"),
     path('deleteaccount/', DeleteAccount.as_view(), name="account_delete"),
-    path('/', Index.as_view(), name="index")
+    path('index/', Index.as_view(), name="index"),
 ]

dal/dal/views.py

@@ -3,21 +3,16 @@ from django.views.generic import View
 from django.contrib.auth import authenticate, login
 from django.contrib.auth.models import User
 from django.http import HttpResponse, HttpResponseRedirect
-from django.core.validators import email_re
+from django.core.validators import validate_email, ValidationError
 from django.urls import reverse_lazy
-
+from django_nameko import get_pool
 
 # Check to see if the username is already taken
 # Helper function, not to be set up as a view
-# First checks the DB, since ldap parks users there
-# After that, check LDAP directly if the user just never
-# logged in
+# Check the LDAP if the user exists
 def check_user_exists(username):
-    if User.objects.filter(username=username).exists():
-        return True
-    # TODO: Needs to look up the LDAP 
-    else return False
-
+    with get_pool().next() as rpc:
+        return rpc.userlookup.lookup(username)
 
 # The index page 
 # If there's a session open, it will give the user the options he/she/it can do, if not,
@@ -72,40 +67,50 @@ class Register(View):
         # check if the supplied passwords match
         if password1 != password2:
             return render(request, 'registererror.html', { 'urlname': urlname, 'service': service, 
-                'error': 'Your passwords didn\'t match. Please supply the same password twice.' } )
+                'error': 'Your passwords did not match. Please supply the same password twice.' } )
         email = request.POST.get('email')
         # Is the emailaddress valid?
-        if not email_re.match(email):
+        try:
+            validate_email(email)
+        except ValidationError:
             return render(request, 'registererror.html', { 'urlname': urlname, 'service': service, 'error': 'The supplied email address is invalid.' } )
+
         firstname = request.POST.get('firstname')
         lastname = request.POST.get('lastname')
-        if firstname == "" or not firstname or lastname == "" or not lastname
+        if firstname == "" or not firstname or lastname == "" or not lastname:
             return render(request, 'registererror.html', { 'urlname': urlname, 'service': service, 'error': 'Please enter your firstname and lastname.' } )
         # throw it to nameko to create the user
-        if self.create_user(username, password1, firstname, lastname, email):
-            return render(request, 'usercreated.html', { 'user': username } )
-        return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': 'Unknown error while creating the user.' } )
+        with get_pool().next() as rpc:
+            result = rpc.createuser.create_user(username, password1, firstname, lastname, email)
+            if result == True:
+                return render(request, 'usercreated.html', { 'user': username } )
+            else:
+                return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': result } )
 
-    def create_user(self, username, password, firstname, lastname, email):
-        #TODO: write nameko function to create a user
-        return True
-    
 
 
 # Change user data for logged in users
 
 class ChangeData(View):
-    
+
+
     # provide the form for the change request
     def get(self, request):
+        urlname = 'change_data'
+        service = 'get default data for logged in user'
         if not request.user.is_authenticated:
             return render(request, 'mustbeloggedin.html')
         user = request.user
         login(request, user)
         # get basic data (firstname, lastname, email)
-        (firstname, lastname, email) = self.get_data(user)
+        with get_pool().next() as rpc:
+            (state, firstname, lastname, email) = rpc.getuserdata.get_data(user)
+        # If it throws an error, the errormessage gets put into firstname.. not great naming, but works best this way
+        if state == "error":
+            return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': firstname } )
         # The template puts the old data as standard in the fields
-        return render(request, 'changeuserdata.html', { 'user': user, 'firstname': firstname, 'lastname': lastname, 'email': email } )
+        else:
+            return render(request, 'changeuserdata.html', { 'user': user, 'firstname': firstname, 'lastname': lastname, 'email': email } )
 
     # get the change request
     def post(self, request):
@@ -128,20 +133,20 @@ class ChangeData(View):
             return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': 'Please enter a lastname.' } )
         elif email == "":
             return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': 'Please enter an email.' } )
-        elif not email_re.match(email):
+        try:
+            validate_email(email)
+        except ValidationError:
             return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': 'The supplied email address is invalid.' } )
         # Trying to change the data
-        if self.change_data(firstname, lastname, email):
+        with get_pool().next() as rpc:
+            result = rpc.changeuserdata.change_data(user, firstname, lastname, email)
+        # Data change worked
+        if result == True:
             return render(request, 'changeddata.html', { 'user': user, 'firstname': firstname, 'lastname': lastname, 'email': email } )
-        return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': 'An unknown error occurred.' } )
+        # Data change did not work, display error
+        else:
+            return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': result } )
 
-    # TODO: call nameko to get basic data from user
-    def get_data(self, user):
-        return ("a", "b", "c")
-
-    # TODO: call nameko to change user data and think about return value
-    def change_data(self, firstname, lastname, email):
-        return True
 
 # Resets the password for a user
 # Will need to send a confirmation email to the user and we will need a backend
@@ -205,26 +210,25 @@ class ChangePassword(View):
         if password1 != password2:
             return render(request, 'error.html', { 'urlname': urlname, 'service': service, 
                 'error': 'Please check if you typed the same password both times for the new password' } )
-
+        with get_pool().next() as rpc:
         # Trying to change the password
-        if self.change_password(user, oldpassword, password1):
+            result = rpc.changepassword.change_password(user, password1)
+        # Password was changed
+        if result == True:
             return render(request, 'changedpassword.html', { 'user': user } )
+        # Password not changed, instead got some kind of error
         else:
-            return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': 'Unknown error while changing the password!' } )
-
-
-        # Changes the password for the supplied user        
-        def change_password(self, user, oldpassword, password):
-            #TODO: write nameko function to change a password
-            return True
-
+            return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': result } )
 
 
+# Deletes an account
 class DeleteAccount(View):
 
+    # Show the basic form for deleting an account
     def get(self, request):
         return render(request, 'deleteaccount.html')
 
+    # Reads the filled out form
     def post(self, request):
         # Variables for error page
         urlname = 'account_delete'
@@ -242,11 +246,13 @@ class DeleteAccount(View):
             return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': 'Wrong password for user.' } )
     
         # Try to delete the user
-        if self.delete_user(username):
+        with get_pool().next() as rpc:
+            result = rpc.deleteuser.delete_user(user)
+        # User deleted
+        if result == True:
             return render(request, 'deleteduser.html', { 'user': username } )
-        return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': 'Unknown error while trying to delete the user.' } )
+        # User not deleted, got some kind of error
+        else:
+            return render(request, 'error.html', { 'urlname': urlname, 'service': service, 'error': result } )
 
     
-    def delete_user(self, username):
-        #TODO: nameko call to delete the user
-        return True