diff --git a/edivorce/apps/core/templates/localdev/bceid.html b/edivorce/apps/core/templates/localdev/bceid.html index 7181f0ac..b9b47e31 100644 --- a/edivorce/apps/core/templates/localdev/bceid.html +++ b/edivorce/apps/core/templates/localdev/bceid.html @@ -83,7 +83,7 @@
- Forgot your user ID or password? + Forgot your user ID or password?
@@ -93,14 +93,14 @@
No account?
- Register for a BCeID
◀ Cancel - and return to justice.gov.bc.ca/divorce + and return to localdev
diff --git a/edivorce/apps/core/templates/localdev/register.html b/edivorce/apps/core/templates/localdev/register.html new file mode 100644 index 00000000..2f5d2e2a --- /dev/null +++ b/edivorce/apps/core/templates/localdev/register.html @@ -0,0 +1,17 @@ + + + Register + + + + +

localdev registration is not implemented

+ +

Enter any user id with the password divorce to + simulate a login in your localdev envirommnent.

+ +Goto Login + + + + \ No newline at end of file diff --git a/edivorce/apps/core/templates/success.html b/edivorce/apps/core/templates/success.html index 8f874cd0..cf4b0443 100644 --- a/edivorce/apps/core/templates/success.html +++ b/edivorce/apps/core/templates/success.html @@ -19,7 +19,7 @@ I Already Have a BCeID.
Login Now - + Register
for a Basic BCeID diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py index 49268973..2c746689 100644 --- a/edivorce/apps/core/urls.py +++ b/edivorce/apps/core/urls.py @@ -8,6 +8,7 @@ urlpatterns = [ url(r'^api/response$', api.UserResponseHandler.as_view()), url(r'^login', main.login, name="login"), url(r'^bceid', localdev.bceid, name="bceid"), + url(r'^register$', main.register, name="register"), url(r'^logout', main.logout, name="logout"), url(r'^overview', main.overview, name="overview"), url(r'^success', main.success, name="success"), diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py index 0e4b14e3..03f5b93b 100644 --- a/edivorce/apps/core/views/main.py +++ b/edivorce/apps/core/views/main.py @@ -3,7 +3,8 @@ from django.shortcuts import render, redirect from django.utils import timezone from ..decorators import bceid_required from ..models import BceidUser -from ..utils.user_response import get_responses_from_db, get_responses_from_db_grouped_by_steps, get_responses_from_session, copy_session_to_db +from ..utils.user_response import get_responses_from_db, get_responses_from_db_grouped_by_steps, \ + get_responses_from_session, copy_session_to_db from edivorce.apps.core.utils.question_step_mapping import list_of_registries @@ -19,6 +20,11 @@ def serve(request, path): def intro(request): + # if the user is returning from BCeID registration, then redirect them to the dashboard + if request.bceid_user.is_authenticated and request.session.get('went-to-register', False) == True: + request.session['went-to-register'] = False + return redirect(settings.FORCE_SCRIPT_NAME[:-1] + '/overview') + return render(request, 'intro.html', context={'hide_nav': True}) @@ -40,7 +46,7 @@ def login(request): else: guid = request.bceid_user.guid - if guid == None: + if guid is None: return render(request, 'localdev/debug.html') user, created = BceidUser.objects.get_or_create(user_guid=guid) @@ -61,6 +67,7 @@ def logout(request): else: return redirect(settings.LOGOUT_URL) + def prequalification(request, step): """ View rendering pre-qualification questions @@ -78,6 +85,14 @@ def prequalification(request, step): return render(request, template_name=template, context=responses_dict) +def register(request): + if settings.DEPLOYMENT_TYPE == 'localdev': + return render(request, 'localdev/register.html') + else: + request.session['went-to-register'] = True + return redirect(settings.REGISTER_URL) + + @bceid_required def question(request, step): """ @@ -115,6 +130,3 @@ def overview(request): started_dict[step] = "Started" started_dict['active_page'] = 'overview' return render(request, 'overview.html', context=started_dict) - - - diff --git a/edivorce/settings/openshift.py b/edivorce/settings/openshift.py index 1c17f0ac..19fb75a6 100644 --- a/edivorce/settings/openshift.py +++ b/edivorce/settings/openshift.py @@ -55,11 +55,11 @@ PROXY_URL_PREFIX = '' if DEPLOYMENT_TYPE == 'dev': PROXY_URL_PREFIX = "/divorce-dev" DEBUG = True - REGISTER_URL = 'https://www.test.bceid.ca/register/basic/account_details.aspx?type=regular&eServiceType=basic' + REGISTER_URL = 'https://www.test.bceid.ca/directories/bluepages/details.aspx?serviceID=5522' if DEPLOYMENT_TYPE == 'test': PROXY_URL_PREFIX = "/divorce-test" - REGISTER_URL = 'https://www.test.bceid.ca/register/basic/account_details.aspx?type=regular&eServiceType=basic' + REGISTER_URL = 'https://www.test.bceid.ca/directories/bluepages/details.aspx?serviceID=5521' if DEPLOYMENT_TYPE == 'prod': PROXY_URL_PREFIX = "/divorce"