From 11ecab5c235de9a52c589b20959a5558a530c1cb Mon Sep 17 00:00:00 2001 From: Nick Downing Date: Thu, 13 Jan 2022 15:19:32 +1100 Subject: [PATCH] Fix transaction handling bugs --- api/sign_up.json.jst | 17 +++++++++++------ api/verification_image.png.jst | 2 +- contact/index.html.jst | 2 +- feedback.html.jst | 2 +- page.jst | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/api/sign_up.json.jst b/api/sign_up.json.jst index 2344074..12483f5 100644 --- a/api/sign_up.json.jst +++ b/api/sign_up.json.jst @@ -21,7 +21,8 @@ return async env => { 2 ) + '\n', 'utf-8' - ) + ), + 'sign_up.json.jst' ) return } @@ -40,7 +41,7 @@ return async env => { console.log('sign up', email) // initialize env.session_key, set cookie in env.response - let transaction = env.site.database.Transaction() + let transaction = await env.site.database.Transaction() let session = await session_cookie(env, transaction) let captcha = await session.get('captcha') @@ -62,7 +63,8 @@ return async env => { 2 ) + '\n', 'utf-8' - ) + ), + 'sign_up.json.jst' ) return } @@ -89,7 +91,8 @@ return async env => { 2 ) + '\n', 'utf-8' - ) + ), + 'sign_up.json.jst' ) return } @@ -116,7 +119,8 @@ return async env => { 2 ) + '\n', 'utf-8' - ) + ), + 'sign_up.json.jst' ) return } @@ -145,6 +149,7 @@ return async env => { 2 ) + '\n', 'utf-8' - ) + ), + 'sign_up.json.jst' ) } diff --git a/api/verification_image.png.jst b/api/verification_image.png.jst index 413b405..db41565 100644 --- a/api/verification_image.png.jst +++ b/api/verification_image.png.jst @@ -9,7 +9,7 @@ return async env => { captcha.generate() // initialize env.session_key, set cookie in env.response - let transaction = env.site.database.Transaction() + let transaction = await env.site.database.Transaction() let session = await session_cookie(env, transaction) // store captcha text in the session for validation when form submitted diff --git a/contact/index.html.jst b/contact/index.html.jst index 2125210..3b89d33 100644 --- a/contact/index.html.jst +++ b/contact/index.html.jst @@ -31,7 +31,7 @@ return async env => { date = new XDate() query.date = date.toUTCString() - let transaction = env.site.database.Transaction() + let transaction = await env.site.database.Transaction() ;( await ( await ( diff --git a/feedback.html.jst b/feedback.html.jst index 38fe202..b7b68e6 100644 --- a/feedback.html.jst +++ b/feedback.html.jst @@ -24,7 +24,7 @@ return async env => { date = new XDate() query.date = date.toUTCString() - let transaction = env.site.database.Transaction() + let transaction = await env.site.database.Transaction() ;( await ( await ( diff --git a/page.jst b/page.jst index c09f5e2..7345f29 100644 --- a/page.jst +++ b/page.jst @@ -8,7 +8,7 @@ return async (env, head, body, scripts) => { let session_cookie = await _require('/session_cookie.jst') // initialize env.session_key, set cookie in env.response - let transaction = env.site.database.Transaction() + let transaction = await env.site.database.Transaction() let session = await session_cookie(env, transaction) let pageview = await ( -- 2.34.1