Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

* Start to seperate versioning into its own app

* Start reworking invoice things

* Reduced overall font size a touch

* Improvements to generic lists

* Tweak some colours to be a bit less OTT

I need to work out if I can seperate background and primary colours like BS3 did

* Improvements to event table mobile

* First pass at mobile-ising the generic list

* Item table fixes

* Fixed fullcalendar print css not included

* Asset list table improvements

* Tweak asset list to be more in line with other lists

* Versioning template improvements

//TODO Rather than have seperate asset templates, convert 'id' into a template variable

* Tweak versioning templates to allow ID overrides

Asset specific templates begone. Still need to bring back the ID formatting for the Rigboard.

* Asset form fixes

* Use the right autocompleter.js...

* Breakout (most) user stuff to separate module

The model remains in RIGS for now, as it's pretty painful to move...

* Python Format/import opt

* Test Refactor Part 1 - Shuffle things around

* Fix migrations

TODO - need to ensure moved models are *moved* rather than deleted and recreated!

* Start on new tests

* Initial work on event create test reimpl

* Init other tests, more rigs test faffery

* Desaturate theme colors even more

Much closer to BS3

* Fix event item adding

Bit too heavy handed with the deduplication there Arona

* Initial refactor of event item testing

* Upgrade bootstrap-select

* Updated bootstrap-select for BS4

* Initial port of duplicate testing

Needs the latter half rewriting once we have an EventDetail POM

* Refactor date validation test

So close to killing test_functional.EventTest!

* Deduplication of testing code

* pep8

* Fix some tests

And some things that were actually borked

* FIX: Prevent setting access time after start time 

Cherry pick of d274ea4606. Will close #405.

* Refactor calendar tests

* FIX: Don't show asset buttons/history for basic users

* Really ought to get a pre-commit hook for pep8...

* Fully replace test_functional

* Dedupe generic search logic

* Fix the remaining tests

* Ensure submit button is scrolled to in tests

* Fix asset creation test + actually verify its results

* Make CI use latest (stable) chromedriver rather than some ancient one

Since Travis uses the latest stable chrome, should always match. Bash oneliner \o/

* Of course | is part of YAML syntax, of course...

Maybe this works.

* Update python version

Trying to get CI to match my local environment as much as possible...

* Minor test futzing

* Well that wasn't clever of me

* That was even less clever of me

* Revert to old submit wait behaviour

* What about if I did this

* Try disabling chrome cache

* Added screenshot recording of test failures

* Fixed RIGS tests not being run

* Fixed Pep8 - I promise I'll make a pre-commit hook sometime!

* Very initial work at togglable darktheme.

Dammit @alexdaniel654 just when I had my scope creep kinda under control. It'll be v. nice to have though...!

* More dark theme wangling

* Fix some asset template things

* FIX: CI Locale Issues

* Fix sample command

* Initial work at integrating the risk assessment

#136. No clever database structure as yet...

* FIX: Don't set every boolean input to radios

* Different approach to RA linking

* Move text definitions to somewhere more authoratitive

* FIX: Undo breakage causing autopep8

o.O

* Expand detail template

* Use correct view for RA history

* Initial work at coercing activity feed into showing RAs

Also shows Asset/Supplier on the homepage feed.

* Refactor activity feed template logic

Yay for removing arbitrary if/else chains!

* Initial work on caching activity feed

Server side that is. Ref #162.

* Start RA list template

* Refactor RA creation stuff, again

* Add H&S Details to Event Detail View

* Display venue notes in event detail

Notes are no use if nobody reads them. Not sure on this one.

* Add ability to filter event archive by status

Closes #168.

* Fix lingering naive time

* Use locmem cache in sqlite environments

Otherwise the tests just lock up totally. Should close #162

* Update dependencies

Mirrors/supersedes 0e67da82e2

* Add global ctrl/meta-enter shortcut for form submission

Wants rewriting for better efficiency, but hey, it works!

* Update dependencies

* Fix for a situation that should be impossible

* Fix navbar alignment

* FEAT: Improve 'omni'search

- Partialised template
- Added to assets header
- Added ability to search assets/suppliers
- Improved selection logic
- Have it display current query

* Move closemodal into PyRIGS

* Fix tests for search improvements

* Dark mode colour improvements

* Fix table colors for dry hires

* further darktheme fixes

* Remove the dark header from light theme

* Fix reload loops when CSS/JS is changed

* Move dark theme SCSS to separate file, fix inactive pagination styling

* Genercise detail pages

* Testing something re notes

I wonder if I can make that global, rather than per-template...

* Dark theme palette shenanigans

I just can't decide

* Match darktheme palette to forum darktheme palette

Why reinvent the wheel.

* Make supplier detail use the generic template

* Disable mobile event table PoC for now

* Remove the defaults from the RA fields + make them required

* More RA fixes

* Fixes to revisions for RAs

* Add bootstrap 4 test page

* Bunch of dark mode fixes from test page

* Do not use Django 'required' for radio selects

As this requires them to be True, whereas we just need to require that an option be entered.

* Properly fixed popover darktheme

* Fixed search for events

* Style fixes to asset list

* Start RA 'mark review' feature

* Add reviewing to revision history, fix RA editing not working

Also actually commit all the files, that helps

* Fix Power MIC being lost on RA edit

Why it is subtly different to the Event Update behaviour? Who knows

* Invalidate RA review if it is edited after review

* Start work on event checklist

* Add a button for creating and instantly voiding invoices

Handy dandy for when you have loads of cancelled events, like say, a pandemic

* Mooooore status chips, mooore

* Initial shenanigans on storing my overly fancy EC form

* Proof of concept for JSON parsing/storage

\o/

* Add new line functionality for vehicles/drivers

Might it have been easier to create 'dummy' models like with EventItems? Probably...

* Alter rig_count to not include un-checked-in dry hires

* Insert a divider between still-out dry hires and actually upcoming events on rigboard

* Initial work on new checklist handling. No more JSON!

* Versioning module now does magic

Automatic creation of views/urls for anything registered with reversion, with a small amount of hackage to preserve legacy stuff. (and the DAMNED asset IDs!) I would never get distracted...

* Cleanup

* Event checklist crew works

Mostly - its not happy with timezones

* Medium event power stuff done, barring worst case stuff

* Misc fixes

* Validation of power reqs

* Worst case points on checklist

* Templating improvements to RA/EC stuff

* Do event table color logic at python level

* Audit template fixes

* Restrict versioning to one level of depth for speed

Also fixed the template for nested changes

* Event properties internal/authorised always return a explicit boolean rather than sometimes None

* Use template filter for notes

* Fix list templates

TODO: Sensible place to define the 'expected answer' stuff.

* Fix cable table template

* Rethink rigboard color logic again

Also revert some broken stuff

* Test fixes

* Modify auth test so it doesn't try and test for external authorisations

Cause that's not a thing

* Why does this work

Bloody overzealous autoformatter...

* Formatting...

* Initial work on RA tests

* Pages/start of tests for EventChecklists

* Much better coverage of H&S things

* Cleanup & Squash migrations

* Fix wrong variable name in settings.py

* Fix broken invoice list template

* Add revision history to invoices/payments.

Also patches previously introduced reversion permissions hole.

Supersedes and closes #337.

* Various misc fixes

* Fix for my fix

* Curse youuuuu pep8

* Invoice template improvements

* Minor fixes

* More tweaks

* More fixes

* Major improvements/fixes to authorisation templates

* Add ability to mark event checklists as Large Event

This just disables the checks to allow the rest of it to be filled out for large events, though I expect paper forms may still be used...

* Remove database ID from generic list

* Put power threshold values in a collapse

* Use template filter for consistent removal of 'None links'

Plus cleaner template markup! More HTML-in-Python tho, which always feels a bit CSS-in-JS

* Tweak asset list markup

* Begin to change add buttons success -> primary

Also change search primary -> info to avoid clash

* Begin to improve event checklist on mobile

* Asset detail template improvements

* Fix #326 (again)

* Fix errors being squashed

* Fix rigboard validation tests

* Initial work on BS4 button templatetag

Newfeatureitis strikes again

* Allow multiple event checklists per event

TODO: Status chip now needs rethinking

* Minor event detail fixes

* Fix tests

* Rework button tag

* Mobile fixes for search

* Fix event checklist on mobile

* Redo light theme palette

* Switch rigboard new button to primary

* Kill off excess whitespace on rigboard

* Rigboard Timing display tweaks

* Fix tests

* Properly handle eventauthorisations in new versioning

It's not great, not terrible...

* Prevent creating duplicate revisions on event

Potential fix for #322 - I couldn't reproduce even before this change...

* Template improvements

* Minor test fixes

* Revert "Prevent creating duplicate revisions on event"

Apparently it was too strong at preventing dupes...

This reverts commit cce0ad0f9f.

# Conflicts:
#	RIGS/models.py

* Better approach to generic list templates + other deduplication

* Also apply better approach to generic detail pages

* One of these days I'll remember to test BEFORE pushing...

* And now the same for generic forms

* Display tick/cross rather than true/false in boolean version diffs

* Upgrade dependencies

* Fixes fixes fixes

* Fix dependency hell

Probably

* Correct handling of spaces in paperwork filenames

Also normalises display of Invoice IDs. Partial fix for #391.

* Buggerit millennium hand and shrimp

Knew I was gonna forget to fix the tests

* FIX: Set duplicated event status to provisional

Closes #398.

Flip flop. Flip flop.

* Update polyfill for datetime-local

Bloody Firefox. We love to hate you. Proper CSS of the fill to come, SoonTM.

Closes #391

* Curses!

* Minor typo fixes

* Initial pass at soop-consult confirmation screen for RAs

* Fix migration

* Make venue/date editable on EC

For multi venue, multi day events

Defaults to date and venue set on the event. Also made power MIC default to that set in RA

* Clearer logic for RA inverted fields

* (probably) fix tests

* Give keyholders supplier edit perm

* Generic list only displays edit button if user has perm

* Same perm check for generic details

* H&S Details takes up free space on non-internal events

* Remove flash of content when loading new rig page

* First pass at clearer display of asset list filters

* Fix tests / default to headless tests

(fingers crossed)

* Fix autocompleter.js to properly disable edit links again

* Move status color logic back to template

Cause that somehow makes it work better??

* Display note icon on event detail page

* Fix caching

* Put rounded corners back where they belong

* Remove lingering use of 'page-header'

BS removed that style

* More search and replace for BS changes

Thought I'd got them all. Clearly not!

* Remove enforced linebreak on status chips

* Fix horizontal-ness on some forms

* Remove animation on prefers-reduced-motion/low referesh rate devices

Also normalises handling of asset list cable table & improves its use of space on large devices

* Make version changes badges more readable

* First pass at making the calendar less crap

* Fix event table success logic

Yay for copy paste fails >.>

* Use borders rather than block colors for coloured tables under darktheme

* First pass at porting calendar from FC V3 to V5

Two major versions and all they did was rename a bunch of names...TWICE.

* Rework version name method to avoid blank names on eventchecklist vehicles/crew

* Fix cable test

* Made radio button focus much more obvious on dark theme

* Implement Jerb's wording changes

* Fix one test, break another...

* Fix recent change stream list mutation issue

* FIX: Do not naively cache event table

Not that easy, it turns out. Duh.

* FEAT: Implement #413 show associated assets on cable type detail pg

Closes #413

* Allow H&S for non-events

* Update emergency contact number

* Improvements to profile detail page

* Implement some of Jonny's suggested changes

TODO:
- Define event size at RA time, pass through to EC
- Have later power questions be context dependent

* Test fixes

* Add space for power/rigging plans to be linked to RAs

* Start move of event size logic to RA from Ec

* Javascript required shenanigans for RA power

* More moving of event size logic

* Fixing tests for new logic etc

* Why does this work

Indeed, it may not

* FIX: Stupid typo in versioning.py

* Further minor fixes to versioning

* Add icons to H&S menu items

* Should fix calendar breaking in production

* Small alignment fix in asset list

* Squash migrations

Co-authored-by: Matthew Smith <psyms13@nottingham.ac.uk>

users/forms.py

@@ -0,0 +1,58 @@
+import simplejson
+from captcha.fields import ReCaptchaField
+from django import forms
+from django.conf import settings
+from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm,
+                                       UserChangeForm, UserCreationForm)
+from django.core import serializers
+from django.core.mail import EmailMessage, EmailMultiAlternatives
+from django.utils import formats
+from registration.forms import RegistrationFormUniqueEmail
+from RIGS import models
+
+
+# Registration
+class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
+    captcha = ReCaptchaField()
+
+    class Meta:
+        model = models.Profile
+        fields = ('username', 'email', 'first_name', 'last_name', 'initials')
+
+    def clean_initials(self):
+        """
+        Validate that the supplied initials are unique.
+        """
+        if models.Profile.objects.filter(initials__iexact=self.cleaned_data['initials']):
+            raise forms.ValidationError("These initials are already in use. Please supply different initials.")
+        return self.cleaned_data['initials']
+
+
+class CheckApprovedForm(AuthenticationForm):
+    def confirm_login_allowed(self, user):
+        if user.is_approved or user.is_superuser:
+            return AuthenticationForm.confirm_login_allowed(self, user)
+        else:
+            raise forms.ValidationError(
+                "Your account hasn't been approved by an administrator yet. Please check back in a few minutes!")
+
+
+# Embedded Login form - remove the autofocus
+class EmbeddedAuthenticationForm(CheckApprovedForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['username'].widget.attrs.pop('autofocus', None)
+
+
+class PasswordReset(PasswordResetForm):
+    captcha = ReCaptchaField(label='Captcha')
+
+
+class ProfileCreationForm(UserCreationForm):
+    class Meta(UserCreationForm.Meta):
+        model = models.Profile
+
+
+class ProfileChangeForm(UserChangeForm):
+    class Meta(UserChangeForm.Meta):
+        model = models.Profile

users/regbackend.py

@@ -0,0 +1,15 @@
+from RIGS.models import Profile
+from users.forms import ProfileRegistrationFormUniqueEmail
+from registration.signals import user_registered
+
+
+def user_created(sender, user, request, **kwargs):
+    form = ProfileRegistrationFormUniqueEmail(request.POST)
+    user.first_name = form.data['first_name']
+    user.last_name = form.data['last_name']
+    user.initials = form.data['initials']
+    # user.phone = form.data['phone']
+    user.save()
+
+
+user_registered.connect(user_created)

users/templates/partials/navbar_user.html

@@ -0,0 +1,29 @@
+<li class="nav-item dropdown" id="user">
+{% if user.is_authenticated %}
+    <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        Hi {{ user.first_name }}
+    </a>
+    <ul class="dropdown-menu p-3 clearfix" id="userdropdown">
+        <li class="media">
+            <a href="{% url 'profile_detail' %}">
+                <img src="{{ request.user.profile_picture }}" class="media-object"/>
+                <div class="media-body">
+                    <b>{{ request.user.first_name }} {{ request.user.last_name }}</b>
+                    <p class="muted">{{ request.user.email }}</p>
+                </div>
+            </a>
+        </li>
+        <li class="mb-2">
+            <div class="custom-control custom-switch">
+                <input type="checkbox" class="custom-control-input" id="darkSwitch" />
+                <label class="custom-control-label" for="darkSwitch">Dark Mode</label>
+            </div>
+        </li>
+        <li class="float-right"><a href="{% url 'logout' %}" class="btn btn-primary"><i class="fas fa-sign-out-alt"></i> Logout</a></li>
+    </ul>
+{% else %}
+<a class="nav-link" href="{% url 'login' %}">
+    Login
+</a>
+{% endif %}
+</li>

users/templates/profile_detail.html

@@ -0,0 +1,160 @@
+{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+
+{% load static %}
+{% load linkornone from filters %}
+
+{% block js %}
+    <script src="{% static 'js/tooltip.js' %}"></script>
+    <script src="{% static 'js/popover.js' %}"></script>
+    <script src="{% static 'js/clipboard.min.js' %}"></script>
+    <script>
+        $(document).ready(function() {
+        	$('#urlParamForm').change(function(){
+	        	url = "?";
+	        	$('#urlParamForm *').filter(':input').each(function(index, value){
+				    defaultVal = $(value).data('default');
+				    param = $(value).val();
+				    val = $(value).prop('checked');
+
+				    if(val != defaultVal){
+					    url = url+param+"="+val+"&";
+					}
+				});
+	        	ics_url = $('#cal-url').data('url') + url.substring(0, url.length - 1);
+				$('#cal-url').text(ics_url);
+
+				gcal_url = $('#gcal-link').data('url') + encodeURIComponent(url.substring(0, url.length - 1));
+				$('#gcal-link').attr('href',gcal_url);
+			});
+
+			$('#urlParamForm').change(); //Do the initial setting
+     	});
+
+        var clipboard = new ClipboardJS('.btn');
+
+        clipboard.on('success', function(e) {
+            $(e.trigger).popover('show');
+            window.setTimeout(function () {$(e.trigger).popover('hide')}, 3000);
+            e.clearSelection();
+        });
+ 	</script>
+{% endblock %}
+
+{% block content %}
+{% if not request.is_ajax and object.pk == user.pk %}
+<div class="row py-3">
+	<div class="col text-right">
+	    <div class="btn-group">
+	        <a href="{% url 'profile_update_self' %}" class="btn btn-warning">
+				Edit Profile <i class="fas fa-edit"></i>
+			</a>
+			<a href="{% url 'password_change' %}" class="btn btn-light">
+				Change Password <span class="fas fa-lock"></span>
+			</a>
+	    </div>
+	</div>
+</div>
+{% endif %}
+<div class="row">
+    <div class="col-12">
+        <div class="card">
+            <div class="row no-gutters">
+                <div class="col-md-3">
+                    <img src="{{object.profile_picture}}" class="card-img img-fluid" />
+                </div>
+                <div class="col-md-9">
+                    <div class="card-body">
+                        <dl class="row">
+	                        <dt class="col-5">First Name</dt>
+	                        <dd class="col-7">{{object.first_name}}</dd>
+
+	                        <dt class="col-5">Last Name</dt>
+	                        <dd class="col-7">{{object.last_name}}</dd>
+
+	                        <dt class="col-5">Email</dt>
+	                        <dd class="col-7">{{object.email}}</dd>
+
+	                        <dt class="col-5">Last Login</dt>
+	                        <dd class="col-7">{{object.last_login|date:"d/m/Y H:i"}}</dd>
+
+	                        <dt class="col-5">Date Joined</dt>
+	                        <dd class="col-7">{{object.date_joined|date:"d/m/Y H:i"}}</dd>
+
+	                        <dt class="col-5">Initials</dt>
+	                        <dd class="col-7">{{object.initials}}</dd>
+
+	                        <dt class="col-5">Phone</dt>
+	                        <dd class="col-7">{{object.phone|linkornone:'tel'}}</dd>
+                        </dl>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    {% if not request.is_ajax and object.pk == user.pk %}
+    <div class="col-12 my-2">
+        <div class="card">
+            <div class="card-header">Personal iCal Details</div>
+            <div class="card-body">
+		        <dl class="row">
+			        <dt class="col-4">API Key</dt>
+			        <dd class="col-8">
+				        {% if user.api_key %}
+					        <code id="api-key">{{user.api_key}}</code>
+                            <button class="btn btn-secondary align-middle" data-clipboard-target="#api-key" data-content="Copied to clipboard!"><span class="fas fa-clipboard"></span></button>
+				        {% else %}
+					        <span id="api-key">No API Key Generated</span>
+				        {% endif %}
+                        <a href="{% url 'reset_api_key' %}" class="btn btn-secondary align-middle">
+				        {% if user.api_key %}Reset API Key{% else %}Generate API Key{% endif %}
+				        <span class="fas fa-redo"></span>
+			            </a>
+			        </dd>
+   			        <dt class="col-4">Calendar Options</dt>
+			        <dd class="col-8">
+				        <form id="urlParamForm">
+					        <div class="form-group d-flex flex-column flex-lg-row">
+						        <label class="checkbox-inline mr-lg-2">
+						          <input type="checkbox" value="rig" data-default="true" checked> Rigs
+						        </label>
+						        <label class="checkbox-inline mx-lg-2">
+						          <input type="checkbox" value="non-rig" data-default="true" checked> Non-Rigs
+						        </label>
+						        <label class="checkbox-inline mx-lg-2">
+						          <input type="checkbox" value="dry-hire" data-default="true" checked> Dry-Hires
+						        </label>
+						        <label class="checkbox-inline mx-lg-2">
+						          <input type="checkbox" value="cancelled" data-default="false" > Cancelled
+						        </label>
+						        <label class="checkbox-inline mx-lg-2">
+						          <input type="checkbox" value="provisional" data-default="true" checked> Provisional
+						        </label>
+						        <label class="checkbox-inline ml-lg-2">
+						          <input type="checkbox" value="confirmed" data-default="true" checked> Confirmed/Booked
+						        </label>
+					        </div>
+				        </form>
+			        </dd>
+			        <dt class="col-4">Calendar URL</dt>
+			        <dd class="col-8">
+				        {% if user.api_key %}
+					        <code id="cal-url" data-url="http{{ request.is_secure|yesno:"s,"}}://{{ request.get_host }}{% url 'ics_calendar' api_pk=user.pk api_key=user.api_key %}"></code>
+                            <button class="btn btn-secondary align-middle" data-clipboard-target="#cal-url" data-content="Copied to clipboard!"><span class="fas fa-clipboard"></span></button>
+                            <br>
+					        <small><a id="gcal-link" data-url="https://support.google.com/calendar/answer/37100" href="">Click here</a> for instructions on adding to google calendar.<br/>
+					        To sync from Google Calendar to mobile device, visit <a href="https://www.google.com/calendar/syncselect" target="_blank">this page</a> on your device and tick "RIGS Calendar".</small>
+				        {% else %}
+					        <pre>No API Key Generated</pre>
+				        {% endif %}
+			        </dd>
+		        </dl>
+            </div>
+        </div>
+	</div>
+    {% endif %}
+</div>
+<h4>Events</h4>
+{% with object.latest_events as events %}
+    {% include 'partials/event_table.html' %}
+{% endwith %}
+{% endblock %}

users/templates/profile_form.html

@@ -0,0 +1,52 @@
+{% extends 'base_rigs.html' %}
+{% load widget_tweaks %}
+
+{% block title %}Update Profile {{object.name}}{% endblock %}
+
+{% block content %}
+<div class="row">
+	<div class="col">
+		{% include 'form_errors.html' %}
+		<h3>Update Profile {{object.name}}</h3>
+        <div class="row">
+		    <div class="col-md-6">
+			    <form action="{{form.action|default:request.path}}" method="post">{% csrf_token %}
+				    <div class="form-group">
+					    {% include 'partials/form_field.html' with field=form.first_name %}
+				    </div>
+                    <div class="form-group">
+					    {% include 'partials/form_field.html' with field=form.last_name %}
+				    </div>
+
+				    <div class="form-group">
+					    <label for="{{form.email.id_for_label}}" class="col-form-label">{{form.email.label}}</label>
+					    {% render_field form.email type="email" class+="form-control" placeholder=form.email.label %}
+				    </div>
+
+                    <div class="form-group">
+					    {% include 'partials/form_field.html' with field=form.initials %}
+				    </div>
+
+				    <div class="form-group">
+					    <label for="{{form.phone.id_for_label}}" class="col-form-label">{{form.phone.label}}</label>
+				        {% render_field form.phone type="tel" class+="form-control" placeholder=form.phone.label %}
+				    </div>
+
+				    <div class="form-group">
+	                    <input class="btn btn-primary float-right" type="submit"/>
+	                </div>
+			    </form>
+		    </div>
+
+		    <div class="col">
+			    <a href="https://gravatar.com/">
+				    <img src="{{object.profile_picture}}" class="img-fluid rounded" />
+				    <div class="text-center">
+					    Images hosted by Gravatar
+				    </div>
+			    </a>
+		    </div>
+        </div>
+	</div>
+</div>
+{% endblock %}

users/tests/test_users.py

@@ -0,0 +1,187 @@
+import os
+import re
+from datetime import date, time, datetime, timedelta
+
+import pytz
+from django.conf import settings
+from django.core import mail, signing
+from django.db import transaction
+from django.http import HttpResponseBadRequest
+from django.test import LiveServerTestCase, TestCase
+from django.test.client import Client
+from django.urls import reverse
+from reversion import revisions as reversion
+from selenium import webdriver
+from selenium.common.exceptions import StaleElementReferenceException
+from selenium.webdriver.support import expected_conditions
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support.ui import WebDriverWait
+
+from RIGS import models
+
+from reversion import revisions as reversion
+from django.urls import reverse
+from django.core import mail, signing
+from PyRIGS.tests.base import create_browser
+from django.conf import settings
+
+import sys
+
+
+# Functional Tests
+class UserRegistrationTest(LiveServerTestCase):
+    def setUp(self):
+        self.browser = create_browser()
+
+        self.browser.implicitly_wait(3)  # Set implicit wait session wide
+        os.environ['RECAPTCHA_TESTING'] = 'True'
+
+    def tearDown(self):
+        self.browser.quit()
+        os.environ['RECAPTCHA_TESTING'] = 'False'
+
+    def test_registration(self):
+        # Navigate to the registration page
+        self.browser.get(self.live_server_url + '/user/register/')
+        title_text = self.browser.find_element_by_tag_name('h3').text
+        self.assertIn("User Registration", title_text)
+
+        # Check the form invites correctly
+        username = self.browser.find_element_by_id('id_username')
+        self.assertEqual(username.get_attribute('placeholder'), 'Username')
+        email = self.browser.find_element_by_id('id_email')
+        self.assertEqual(email.get_attribute('placeholder'), 'E-mail')
+        # If this is correct we don't need to test it later
+        self.assertEqual(email.get_attribute('type'), 'email')
+        password1 = self.browser.find_element_by_id('id_password1')
+        self.assertEqual(password1.get_attribute('placeholder'), 'Password')
+        self.assertEqual(password1.get_attribute('type'), 'password')
+        password2 = self.browser.find_element_by_id('id_password2')
+        self.assertEqual(
+            password2.get_attribute('placeholder'), 'Password confirmation')
+        self.assertEqual(password2.get_attribute('type'), 'password')
+        first_name = self.browser.find_element_by_id('id_first_name')
+        self.assertEqual(first_name.get_attribute('placeholder'), 'First name')
+        last_name = self.browser.find_element_by_id('id_last_name')
+        self.assertEqual(last_name.get_attribute('placeholder'), 'Last name')
+        initials = self.browser.find_element_by_id('id_initials')
+        self.assertEqual(initials.get_attribute('placeholder'), 'Initials')
+        # No longer required for new users
+        # phone = self.browser.find_element_by_id('id_phone')
+        # self.assertEqual(phone.get_attribute('placeholder'), 'Phone')
+
+        # Fill the form out incorrectly
+        username.send_keys('TestUsername')
+        email.send_keys('test@example.com')
+        password1.send_keys('correcthorsebatterystaple')
+        # deliberate mistake
+        password2.send_keys('correcthorsebatterystapleerror')
+        first_name.send_keys('John')
+        last_name.send_keys('Smith')
+        initials.send_keys('JS')
+        # phone.send_keys('0123456789')
+        self.browser.execute_script(
+            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
+
+        # Submit incorrect form
+        submit = self.browser.find_element_by_xpath("//input[@type='submit']")
+        submit.click()
+
+        # Restablish error fields
+        password1 = self.browser.find_element_by_id('id_password1')
+        password2 = self.browser.find_element_by_id('id_password2')
+
+        # Read what the error is
+        alert = self.browser.find_element_by_css_selector(
+            'div.alert-danger').text
+        # TODO Use regex matching to handle smart/unsmart quotes...
+        self.assertIn("password fields didn", alert)
+
+        # Passwords should be empty
+        self.assertEqual(password1.get_attribute('value'), '')
+        self.assertEqual(password2.get_attribute('value'), '')
+
+        # Correct error
+        password1.send_keys('correcthorsebatterystaple')
+        password2.send_keys('correcthorsebatterystaple')
+        self.browser.execute_script("console.log('Hello, world!')")
+        self.browser.execute_script(
+            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
+
+        # Submit again
+        password2.send_keys(Keys.ENTER)
+
+        # Check we have a success message
+        alert = self.browser.find_element_by_css_selector(
+            'div.alert-success').text
+        self.assertIn('register', alert)
+        self.assertIn('email', alert)
+
+        # Check Email
+        self.assertEqual(len(mail.outbox), 1)
+        email = mail.outbox[0]
+        self.assertIn('John Smith "JS" activation required', email.subject)
+        urls = re.findall(
+            r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', email.body)
+        self.assertEqual(len(urls), 1)
+
+        mail.outbox = []  # empty this for later
+
+        # Follow link
+        self.browser.get(urls[0])  # go to the first link
+
+        # Complete registration
+        title_text = self.browser.find_element_by_tag_name('h2').text
+        self.assertIn('Complete', title_text)
+
+        # Test login
+        self.browser.get(self.live_server_url + '/user/login')
+        username = self.browser.find_element_by_id('id_username')
+        self.assertEqual(username.get_attribute('placeholder'), 'Username')
+        password = self.browser.find_element_by_id('id_password')
+        self.assertEqual(password.get_attribute('placeholder'), 'Password')
+        self.assertEqual(password.get_attribute('type'), 'password')
+
+        # Expected to fail as not approved
+        username.send_keys('TestUsername')
+        password.send_keys('correcthorsebatterystaple')
+        self.browser.execute_script(
+            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
+        password.send_keys(Keys.ENTER)
+
+        # Test approval
+        profileObject = models.Profile.objects.all()[0]
+        self.assertFalse(profileObject.is_approved)
+
+        # Read what the error is
+        alert = self.browser.find_element_by_css_selector(
+            'div.alert-danger').text
+        self.assertIn("approved", alert)
+
+        # Approve the user so we can proceed
+        profileObject.is_approved = True
+        profileObject.save()
+
+        # Retry login
+        self.browser.get(self.live_server_url + '/user/login')
+        username = self.browser.find_element_by_id('id_username')
+        username.send_keys('TestUsername')
+        password = self.browser.find_element_by_id('id_password')
+        password.send_keys('correcthorsebatterystaple')
+        self.browser.execute_script(
+            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
+        password.send_keys(Keys.ENTER)
+
+        # Check we are logged in
+        udd = self.browser.find_element_by_class_name('navbar').text
+        self.assertIn('Hi John', udd)
+
+        # Check all the data actually got saved
+        self.assertEqual(profileObject.username, 'TestUsername')
+        self.assertEqual(profileObject.first_name, 'John')
+        self.assertEqual(profileObject.last_name, 'Smith')
+        self.assertEqual(profileObject.initials, 'JS')
+        # self.assertEqual(profileObject.phone, '0123456789')
+        self.assertEqual(profileObject.email, 'test@example.com')
+
+        # All is well

users/urls.py

@@ -0,0 +1,29 @@
+from django.urls import path
+from django.conf.urls import include, url
+from django.contrib import admin
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.contrib.auth.decorators import login_required
+from django.conf import settings
+from django.views.decorators.clickjacking import xframe_options_exempt
+from django.contrib.auth.views import LoginView
+from registration.backends.default.views import RegistrationView
+from PyRIGS.decorators import permission_required_with_403
+from users import regbackend, forms, views
+
+urlpatterns = [
+    path('user/register/', RegistrationView.as_view(form_class=forms.ProfileRegistrationFormUniqueEmail),
+         name="registration_register"),
+    path('user/login/', LoginView.as_view(authentication_form=forms.CheckApprovedForm), name='login'),
+    path('user/login/embed/', xframe_options_exempt(views.LoginEmbed.as_view()), name='login_embed'),
+    # User editing
+    path('user/edit/', login_required(views.ProfileUpdateSelf.as_view()),
+         name='profile_update_self'),
+    path('user/reset_api_key', login_required(views.ResetApiKey.as_view(permanent=False)),
+         name='reset_api_key'),
+    path('user/', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
+    path('user/<int:pk>/',
+         permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
+         name='profile_detail'),
+    path('user/', include('django.contrib.auth.urls')),
+    path('user/', include('registration.backends.default.urls')),
+]

users/views.py

@@ -0,0 +1,84 @@
+from django.core.exceptions import PermissionDenied
+from django.http.response import HttpResponseRedirect
+from django.http import HttpResponse
+from django.urls import reverse_lazy, reverse, NoReverseMatch
+from django.views import generic
+from django.contrib.auth.views import LoginView
+from django.db.models import Q
+from django.shortcuts import get_object_or_404
+from django.core import serializers
+from django.conf import settings
+import simplejson
+from django.contrib import messages
+import datetime
+import pytz
+import operator
+from registration.views import RegistrationView
+from django.views.decorators.csrf import csrf_exempt
+
+from RIGS import models, forms
+from assets import models as asset_models
+from functools import reduce
+
+
+# This view should be exempt from requiring CSRF token.
+# Then we can check for it and show a nice error
+# Don't worry, django.contrib.auth.views.login will
+# check for it before logging  the user in
+class LoginEmbed(LoginView):
+    template_name = 'registration/login_embed.html'
+
+    @csrf_exempt
+    def dispatch(self, request, *args, **kwargs):
+        if request.method == "POST":
+            csrf_cookie = request.COOKIES.get('csrftoken', None)
+
+            if csrf_cookie is None:
+                messages.warning(request, 'Cookies do not seem to be enabled. Try logging in using a new tab.')
+                request.method = 'GET'  # Render the page without trying to login
+
+        return super().dispatch(request, *args, **kwargs)
+
+
+class ProfileDetail(generic.DetailView):
+    template_name = "profile_detail.html"
+    model = models.Profile
+
+    def get_queryset(self):
+        try:
+            pk = self.kwargs['pk']
+        except KeyError:
+            pk = self.request.user.id
+            self.kwargs['pk'] = pk
+
+        return self.model.objects.filter(pk=pk)
+
+    def get_context_data(self, **kwargs):
+        context = super(ProfileDetail, self).get_context_data(**kwargs)
+        context['page_title'] = "Profile: {}".format(self.object)
+        return context
+
+
+class ProfileUpdateSelf(generic.UpdateView):
+    template_name = "profile_form.html"
+    model = models.Profile
+    fields = ['first_name', 'last_name', 'email', 'initials', 'phone']
+
+    def get_queryset(self):
+        pk = self.request.user.id
+        self.kwargs['pk'] = pk
+
+        return self.model.objects.filter(pk=pk)
+
+    def get_success_url(self):
+        url = reverse_lazy('profile_detail')
+        return url
+
+
+class ResetApiKey(generic.RedirectView):
+    def get_redirect_url(self, *args, **kwargs):
+        self.request.user.api_key = self.request.user.make_api_key()
+
+        self.request.user.save()
+
+        return reverse_lazy('profile_detail')