diff --git a/edivorce/apps/core/templates/intro.html b/edivorce/apps/core/templates/intro.html index 56ddf8c6..6556afcd 100644 --- a/edivorce/apps/core/templates/intro.html +++ b/edivorce/apps/core/templates/intro.html @@ -49,7 +49,7 @@

- Returning User?
Log in with BCeID + Returning User?
Log in with BCeID or BC Services Card

{% endblock %} diff --git a/edivorce/apps/core/templates/success.html b/edivorce/apps/core/templates/success.html index 16e77fbc..2bcc4a42 100644 --- a/edivorce/apps/core/templates/success.html +++ b/edivorce/apps/core/templates/success.html @@ -15,29 +15,38 @@

2. Register or Login

-

You will need a BCeID account to access the Online Divorce Assistant. This is an online "ID" +

You will need a BCeID or BC Services Card account to access the Online Divorce Assistant. This is an online "ID" and password that enables you to securely access multiple online government services with a single user ID and password.

-
+

Register for a Basic BCeID

You need a Basic BCeID to use the Online Divorce Assistant. Once you register, you’ll be taken back to this website.

-
-

I have a BCeID

-

If you already have a Basic BCeID or a Personal BCeID, then you can login now.

+
+

Register for a BC Services Card

+

You need a BC Services Card to use the Online Divorce Assistant. Once you register, you’ll be taken back to this website.

+
+
+

I have a BCeID or BC Services Card

+

If you already have a Basic BCeID or a Personal BCeID or BC Services Card, then you can login now.

-
+ -
+ +
Login diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py index 9235d716..40d486c6 100644 --- a/edivorce/apps/core/urls.py +++ b/edivorce/apps/core/urls.py @@ -11,6 +11,7 @@ urlpatterns = [ url(r'^login$', main.login, name="login"), url(r'^bceid$', localdev.bceid, name="bceid"), url(r'^register$', main.register, name="register"), + url(r'^register_sc$', main.register_sc, name="register_sc"), 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 dc699528..6575e44d 100644 --- a/edivorce/apps/core/views/main.py +++ b/edivorce/apps/core/views/main.py @@ -59,7 +59,7 @@ def success(request): prequal_responses = get_responses_from_session_grouped_by_steps(request)['prequalification'] complete, _ = is_complete('prequalification', prequal_responses) if complete: - return render(request, 'success.html', context={'register_url': settings.REGISTER_URL}) + return render(request, 'success.html', context={'register_url': settings.REGISTER_URL,'register_sc_url': settings.REGISTER_SC_URL}) return redirect(settings.PROXY_BASE_URL + settings.FORCE_SCRIPT_NAME[:-1] + '/incomplete') @@ -88,6 +88,15 @@ def register(request): request.session['went_to_register'] = True return redirect(settings.REGISTER_URL) +def register_sc(request): + """ + Sets a session variable and redirects users to register for BC Services Card + """ + if settings.DEPLOYMENT_TYPE in ['localdev', 'minishift']: + return render(request, 'localdev/register.html') + + request.session['went_to_register'] = True + return redirect(settings.REGISTER_SC_URL) def login(request): """ diff --git a/edivorce/settings/local.py b/edivorce/settings/local.py index 8b215fed..82cb287f 100644 --- a/edivorce/settings/local.py +++ b/edivorce/settings/local.py @@ -21,6 +21,7 @@ WEASYPRINT_CSS_LOOPBACK = 'http://10.200.10.1:8000' DEPLOYMENT_TYPE = 'localdev' REGISTER_URL = '#' +REGISTER_SC_URL ='#' PROXY_BASE_URL = '' SASS_PROCESSOR_ENABLED = True SASS_PROCESSOR_ROOT = PROJECT_ROOT + '/edivorce/apps/core/static' diff --git a/edivorce/settings/openshift.py b/edivorce/settings/openshift.py index 255a6b96..41018f5c 100644 --- a/edivorce/settings/openshift.py +++ b/edivorce/settings/openshift.py @@ -56,18 +56,21 @@ if DEPLOYMENT_TYPE == 'dev': CSRF_COOKIE_AGE = None SESSION_COOKIE_AGE = 3600 REGISTER_URL = 'https://www.test.bceid.ca/directories/bluepages/details.aspx?serviceID=5522' + REGISTER_SC_URL = 'https://logontest7.gov.bc.ca/clp-cgi/fed/fedLaunch.cgi?partner=fed38&partnerList=fed38&flags=0001:0,7&TARGET=http://dev.justice.gov.bc.ca/divorce/login' LOGOUT_URL_TEMPLATE = 'https://logontest.gov.bc.ca/clp-cgi/logoff.cgi?returl=%s%s&retnow=1' LOGOUT_URL = LOGOUT_URL_TEMPLATE % (PROXY_BASE_URL, PROXY_URL_PREFIX) if DEPLOYMENT_TYPE == 'test': PROXY_URL_PREFIX = os.getenv('PROXY_URL_PREFIX', '/divorce-test') REGISTER_URL = 'https://www.test.bceid.ca/directories/bluepages/details.aspx?serviceID=5521' + REGISTER_SC_URL = 'https://logontest7.gov.bc.ca/clp-cgi/fed/fedLaunch.cgi?partner=fed38&partnerList=fed38&flags=0001:0,7&TARGET=http://dev.justice.gov.bc.ca/divorce/login' LOGOUT_URL_TEMPLATE = 'https://logontest.gov.bc.ca/clp-cgi/logoff.cgi?returl=%s%s&retnow=1' LOGOUT_URL = LOGOUT_URL_TEMPLATE % (PROXY_BASE_URL, PROXY_URL_PREFIX) if DEPLOYMENT_TYPE == 'prod': PROXY_URL_PREFIX = os.getenv('PROXY_URL_PREFIX', '/divorce') REGISTER_URL = 'https://www.bceid.ca/directories/bluepages/details.aspx?serviceID=5203' + REGISTER_SC_URL = 'https://logon7.gov.bc.ca/clp-cgi/fed/fedLaunch.cgi?partner=fed49&partnerList=fed49&flags=0001:0,8&TARGET=http://justice.gov.bc.ca/divorce/login' LOGOUT_URL_TEMPLATE = 'https://logon.gov.bc.ca/clp-cgi/logoff.cgi?returl=%s%s&retnow=1' LOGOUT_URL = LOGOUT_URL_TEMPLATE % (PROXY_BASE_URL, PROXY_URL_PREFIX) # Google Tag Manager (Production) @@ -76,6 +79,7 @@ if DEPLOYMENT_TYPE == 'prod': if DEPLOYMENT_TYPE == 'minishift': DEBUG = True REGISTER_URL = '#' + REGISTER_SC_URL ='#' PROXY_BASE_URL = '' # Internal Relative Urls