Optionally enforce token renewal via settings. Set initial value to True in the forms.

[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 b0f1a2c..0bb3edf 100644 (file)
--- a/snf-astakos-app/astakos/im/urls.py
+++ b/snf-astakos-app/astakos/im/urls.py
@@ -34,9 +34,10 @@
 from django.conf.urls.defaults import patterns, include, url
 from django.contrib.auth.views import password_change
 
-from astakos.im.forms import ExtendedPasswordResetForm, LoginForm
-from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED
-from astakos.im.views import signed_terms_required
+from astakos.im.forms import (ExtendedPasswordResetForm,
+                              ExtendedPasswordChangeForm,
+                              ExtendedSetPasswordForm, LoginForm)
+from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED, EMAILCHANGE_ENABLED
 
 urlpatterns = patterns('astakos.im.views',
     url(r'^$', 'index', {}, name='index'),
@@ -49,11 +50,15 @@ 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'^password/?$', 'change_password', {}, name='password_change'),
-    url(r'^email_change/?$', 'change_email', {}, name='email_change'),
-    url(r'^email_change/confirm/(?P<activation_key>\w+)/', 'change_email', {},
-        name='email_change_confirm')
 )
 
+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', {},
+            name='email_change_confirm')
+)
+    
 urlpatterns += patterns('astakos.im.target',
     url(r'^login/redirect/?$', 'redirect.login')
 )
@@ -68,9 +73,10 @@ if 'local' in IM_MODULES:
           'password_reset_form':ExtendedPasswordResetForm}),
         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'),
+         'password_reset_confirm', {'set_password_form':ExtendedSetPasswordForm}),
         url(r'^local/password/reset/complete/?$', 'password_reset_complete'),
-        url(r'^password_change/?$', 'password_change', {'post_change_redirect':'profile'})
+        url(r'^password_change/?$', 'password_change', {'post_change_redirect':'profile',
+            'password_change_form':ExtendedPasswordChangeForm})
     )
 
 if INVITATIONS_ENABLED:
@@ -89,11 +95,18 @@ if 'twitter' in IM_MODULES:
         url(r'^login/twitter/authenticated/?$', 'twitter.authenticated')
     )
 
-urlpatterns += patterns('astakos.im.api',
+urlpatterns += patterns('astakos.im.api.admin',
     url(r'^authenticate/?$', 'authenticate_old'),
-    url(r'^authenticate/v2/?$', 'authenticate'),
+    #url(r'^authenticate/v2/?$', 'authenticate'),
     url(r'^get_services/?$', 'get_services'),
     url(r'^get_menu/?$', 'get_menu'),
-    url(r'^find_userid/?$', 'find_userid'),
-    url(r'^find_email/?$', 'find_email'),
+    url(r'^admin/api/v2.0/users/?$', 'get_user_by_email'),
+    url(r'^admin/api/v2.0/users/(?P<user_id>.+?)/?$', 'get_user_by_username'),
 )
+
+urlpatterns += patterns('astakos.im.api.service',
+    #url(r'^service/api/v2.0/tokens/(?P<token_id>.+?)/?$', 'validate_token'),
+    url(r'^service/api/v2.0/feedback/?$', 'send_feedback'),
+    url(r'^service/api/v2.0/users/?$', 'get_user_by_email'),
+    url(r'^service/api/v2.0/users/(?P<user_id>.+?)/?$', 'get_user_by_username'),
+)
\ No newline at end of file