implement new withdraw API and support taler://withdraw

1 files changed, 51 insertions, 29 deletions

diff --git a/talerbank/app/urls.py b/talerbank/app/urls.py
index d9b4491..7f2006b 100644
--- a/talerbank/app/urls.py
+++ b/talerbank/app/urls.py
@@ -16,42 +16,64 @@
 # <http://www.gnu.org/licenses/>.
 #
 #  @author Marcello Stanisci
+#  @author Florian Dold
 
-from django.conf.urls import include, url
+from django.urls import include, path
 from django.views.generic.base import RedirectView
 from django.contrib.auth import views as auth_views
 from . import views
 
 urlpatterns = [
-    url(r'^', include('talerbank.urls')),
-    url(r'^$', RedirectView.as_view(pattern_name="profile"),
-        name="index"),
-    url(r'^favicon\.ico$', views.ignore),
-    url(r'^admin/add/incoming$', views.add_incoming,
-        name="add-incoming"),
-    url(r'^login/$',
+    path("", RedirectView.as_view(pattern_name="profile"), name="index"),
+    path("favicon.ico", views.ignore),
+    path("admin/add/incoming", views.add_incoming, name="add-incoming"),
+    path(
+        "login/",
         auth_views.LoginView.as_view(
             template_name="login.html",
-            authentication_form=views.TalerAuthenticationForm),
-        name="login"),
-    url(r'^logout/$', views.logout_view, name="logout"),
-    url(r'^accounts/register/$', views.register, name="register"),
-    url(r'^register$', views.register_headless, name="register-headless"),
-    url(r'^profile$', views.profile_page, name="profile"),
-    url(r'^history$', views.serve_history, name="history"),
-    url(r'^history-range$', views.serve_history_range, name="history-range"),
-    url(r'^reject$', views.reject, name="reject"),
-    url(r'^withdraw$', views.withdraw_nojs, name="withdraw-nojs"),
-    url(r'^taler/withdraw$', views.withdraw_headless, name="withdraw-headless"),
-    url(r'^public-accounts$', views.serve_public_accounts,
-        name="public-accounts"),
-    url(r'^public-accounts/(?P<name>[a-zA-Z0-9]+)$',
+            authentication_form=views.TalerAuthenticationForm
+        ),
+        name="login"
+    ),
+    path("logout/", views.logout_view, name="logout"),
+    path("accounts/register", views.register, name="register"),
+    path("profile", views.profile_page, name="profile"),
+    path("history", views.serve_history, name="history"),
+    path("history-range", views.serve_history_range, name="history-range"),
+    path("reject", views.reject, name="reject"),
+    path(
+        "api/withdraw-operation/<str:withdraw_id>",
+        views.api_withdraw_operation,
+        name="api-withdraw-operation"
+    ),
+    path(
+        "api/withdraw-headless",
+        views.withdraw_headless,
+        name="withdraw-headless"
+    ),
+    path("api/register", views.register_headless, name="register-headless"),
+    path("start-withdrawal", views.start_withdrawal, name="start-withdrawal"),
+    path(
+        "show-withdrawal/<str:withdraw_id>",
+        views.show_withdrawal,
+        name="withdraw-show"
+    ),
+    path(
+        "confirm-withdrawal/<str:withdraw_id>",
+        views.confirm_withdrawal,
+        name="withdraw-confirm"
+    ),
+    path(
+        "public-accounts", views.serve_public_accounts, name="public-accounts"
+    ),
+    path(
+        "public-accounts/<str:name>",
         views.serve_public_accounts,
-        name="public-accounts"),
-    url(r'^public-accounts/(?P<name>[a-zA-Z0-9]+)/(?P<page>[0-9]+)$',
+        name="public-accounts"
+    ),
+    path(
+        "public-accounts/<str:name>/<int:page>",
         views.serve_public_accounts,
-        name="public-accounts"),
-    url(r'^pin/question$', views.pin_tan_question,
-        name="pin-question"),
-    url(r'^pin/verify$', views.pin_tan_verify, name="pin-verify"),
-    ]
+        name="public-accounts"
+    ),
+]