Updated shibboleth workflow (enable user change email before activation)

[astakos] / snf-astakos-app / astakos / im / urls.py

diff --git a/snf-astakos-app/astakos/im/urls.py b/snf-astakos-app/astakos/im/urls.py
index 25c4825..f15774a 100644 (file)
--- a/snf-astakos-app/astakos/im/urls.py
+++ b/snf-astakos-app/astakos/im/urls.py
@@ -56,7 +56,7 @@ urlpatterns = patterns('astakos.im.views',
 if EMAILCHANGE_ENABLED:
     urlpatterns += patterns('astakos.im.views',
         url(r'^email_change/?$', 'change_email', {}, name='email_change'),
-        url(r'^email_change/confirm/(?P<activation_key>\w+)/', 'change_email', {},
+        url(r'^email_change/confirm/(?P<activation_key>\w+)/?$', 'change_email', {},
             name='email_change_confirm')
 )
     
@@ -88,7 +88,7 @@ if INVITATIONS_ENABLED:
 if 'shibboleth' in IM_MODULES:
     urlpatterns += patterns('astakos.im.target',
         url(r'^login/shibboleth/?$', 'shibboleth.login'),
-        url(r'^login/shibboleth/signup/?$', 'shibboleth.signup')
+        url(r'^shibboleth/signup/(\w+)/?$', 'shibboleth.signup', {}, 'shibboleth_signup')
     )
 
 if 'twitter' in IM_MODULES: