Google and LinkedIn oauth support

[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 69da824..525497f 100644 (file)
--- a/snf-astakos-app/astakos/im/urls.py
+++ b/snf-astakos-app/astakos/im/urls.py
@@ -49,8 +49,8 @@ urlpatterns = patterns('astakos.im.views',
     url(r'^approval_terms/?$', 'approval_terms', {}, name='latest_terms'),
     url(r'^approval_terms/(?P<term_id>\d+)/?$', 'approval_terms'),
     url(r'^send/activation/(?P<user_id>\d+)/?$', 'send_activation', {}, name='send_activation'),
-    url(r'^resources/?$', 'resource_list', {}, name='resource_list'),
-    url(r'^billing/?$', 'billing', {}, name='billing'),
+    url(r'^resources/?$', 'resource_usage', {}, name='resource_usage'),
+#    url(r'^billing/?$', 'billing', {}, name='billing'),
     url(r'^timeline/?$', 'timeline', {}, name='timeline'),
     url(r'^group/add/complete/?$', 'group_add_complete', {}, name='group_add_complete'),
     url(r'^group/add/(?P<kind_name>\w+)?$', 'group_add', {}, name='group_add'),
@@ -75,7 +75,7 @@ if EMAILCHANGE_ENABLED:
         url(r'^email_change/confirm/(?P<activation_key>\w+)/?$', 'change_email', {},
             name='email_change_confirm')
 )
-    
+
 urlpatterns += patterns('astakos.im.target',
                         url(r'^login/redirect/?$', 'redirect.login')
                         )
@@ -87,15 +87,23 @@ if 'local' in IM_MODULES:
             'post_change_redirect':'profile',
             'password_change_form':ExtendedPasswordChangeForm
             },
-            name='password_change')
+            name='password_change'),
+        url(r'^local/password_reset/done$', 'local.password_reset_done'),
+        url(r'^local/reset/confirm/done$',
+            'local.password_reset_confirm_done')
     )
     urlpatterns += patterns('django.contrib.auth.views',
-        url(r'^local/password_reset/?$', 'password_reset',
-         {'email_template_name':'registration/password_email.txt',
-          'password_reset_form':ExtendedPasswordResetForm}),
+        url(r'^local/password_reset/?$', 'password_reset', {
+            'email_template_name':'registration/password_email.txt',
+            'password_reset_form':ExtendedPasswordResetForm,
+            'post_reset_redirect':'password_reset/done'
+         }),
         url(r'^local/password_reset_done/?$', 'password_reset_done'),
         url(r'^local/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/?$',
-         'password_reset_confirm', {'set_password_form':ExtendedSetPasswordForm}),
+         'password_reset_confirm', {
+             'set_password_form':ExtendedSetPasswordForm,
+             'post_reset_redirect': 'done'
+         }),
         url(r'^local/password/reset/complete/?$', 'password_reset_complete')
     )
 
@@ -107,14 +115,26 @@ if INVITATIONS_ENABLED:
 if 'shibboleth' in IM_MODULES:
     urlpatterns += patterns('astakos.im.target',
         url(r'^login/shibboleth/?$', 'shibboleth.login'),
-        url(r'^shibboleth/signup/(\w+)/?$', 'shibboleth.signup', {}, 'shibboleth_signup')
     )
 
 if 'twitter' in IM_MODULES:
     urlpatterns += patterns('astakos.im.target',
                             url(r'^login/twitter/?$', 'twitter.login'),
                             url(r'^login/twitter/authenticated/?$',
-                                'twitter.authenticated')
+                                'twitter.authenticated'),
+                            )
+
+if 'google' in IM_MODULES:
+    urlpatterns += patterns('astakos.im.target',
+                            url(r'^login/goggle/?$', 'google.login'),
+                            url(r'^login/google/authenticated/?$',
+                                'google.authenticated'),
+                            )
+if 'linkedin' in IM_MODULES:
+    urlpatterns += patterns('astakos.im.target',
+                            url(r'^login/linkedin/?$', 'linkedin.login'),
+                            url(r'^login/linkedin/authenticated/?$',
+                                'linkedin.authenticated'),
                             )
 
 urlpatterns += patterns('astakos.im.api',