From: Nick Downing Date: Sun, 23 Jan 2022 01:31:05 +0000 (+1100) Subject: Use (Transaction|LazyValue).get_json() instead of logjson.logjson_to_json() and ... X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?p=ndcode_site.git;a=commitdiff_plain;h=46eb202c5f4b808ea8aa9e3e918832a0c20be471 Use (Transaction|LazyValue).get_json() instead of logjson.logjson_to_json() and (Transaction|LazyValue).set_json() instead of Transaction.json_to_logjson() --- diff --git a/_lib/session_cookie.jst b/_lib/session_cookie.jst index 7f14413..861e702 100644 --- a/_lib/session_cookie.jst +++ b/_lib/session_cookie.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let cookie = require('cookie') let crypto = require('crypto') let XDate = require('xdate') @@ -42,8 +41,6 @@ return async (env, transaction) => { `session_key=${env.session_key}; expires=${expires.toUTCString()}; path=/;` ) - env.signed_in_as = await logjson.logjson_to_json( - await session.get('signed_in_as', null) - ) + env.signed_in_as = await session.get_json('signed_in_as', null) return session } diff --git a/api/account/change_details/get.json.jst b/api/account/change_details/get.json.jst index efc4107..cf450a8 100644 --- a/api/account/change_details/get.json.jst +++ b/api/account/change_details/get.json.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -24,15 +23,9 @@ return async env => { ).get('accounts', {}) ).get(env.signed_in_as) let details = { - given_names: await logjson.logjson_to_json( - await account.get('given_names') - ), - family_name: await logjson.logjson_to_json( - await account.get('family_name') - ), - contact_me: await logjson.logjson_to_json( - await account.get('contact_me') - ) + given_names: await account.get_json('given_names'), + family_name: await account.get_json('family_name'), + contact_me: await account.get_json('contact_me') } await transaction.commit() diff --git a/api/account/change_details/get_draft.json.jst b/api/account/change_details/get_draft.json.jst index cc632ec..b3058b3 100644 --- a/api/account/change_details/get_draft.json.jst +++ b/api/account/change_details/get_draft.json.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -19,19 +18,13 @@ return async env => { let change_details_draft = await session.get('change_details_draft') let details = change_details_draft !== undefined && - XDate.now() < await logjson.logjson_to_json( - await change_details_draft.get('expires') - ) ? { - given_names: await logjson.logjson_to_json( - await change_details_draft.get('given_names') - ), - family_name: await logjson.logjson_to_json( - await change_details_draft.get('family_name') - ), - contact_me: await logjson.logjson_to_json( - await change_details_draft.get('contact_me') - ) - } : null + XDate.now() < await change_details_draft.get_json('expires') ? + { + given_names: await change_details_draft.get_json('given_names'), + family_name: await change_details_draft.get_json('family_name'), + contact_me: await change_details_draft.get_json('contact_me') + } : + null await transaction.commit() return details diff --git a/api/account/change_details/set.json.jst b/api/account/change_details/set.json.jst index 5e61e5e..755f4c4 100644 --- a/api/account/change_details/set.json.jst +++ b/api/account/change_details/set.json.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -35,18 +34,9 @@ return async env => { await transaction.get({}) ).get('accounts', {}) ).get(env.signed_in_as) - account.set( - 'given_names', - transaction.json_to_logjson(details.given_names) - ) - account.set( - 'family_name', - transaction.json_to_logjson(details.family_name) - ) - account.set( - 'contact_me', - transaction.json_to_logjson(details.contact_me) - ) + account.set_json('given_names', details.given_names) + account.set_json('family_name', details.family_name) + account.set_json('contact_me', details.contact_me) await transaction.commit() } diff --git a/api/account/change_details/set_draft.json.jst b/api/account/change_details/set_draft.json.jst index cf7ee6f..69f1f5b 100644 --- a/api/account/change_details/set_draft.json.jst +++ b/api/account/change_details/set_draft.json.jst @@ -28,14 +28,12 @@ return async env => { expires.addDays(1) session.set( 'change_details_draft', - transaction.json_to_logjson( - { - given_names: details.given_names, - family_name: details.family_name, - contact_me: details.contact_me, - expires: expires.getTime() - } - ) + { + given_names: details.given_names, + family_name: details.family_name, + contact_me: details.contact_me, + expires: expires.getTime() + } ) } else diff --git a/api/account/change_password.json.jst b/api/account/change_password.json.jst index ce95e13..fbf7486 100644 --- a/api/account/change_password.json.jst +++ b/api/account/change_password.json.jst @@ -1,5 +1,4 @@ let crypto = require('crypto') -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -35,22 +34,14 @@ return async env => { ).get('accounts', {}) ).get(env.signed_in_as) - if ( - old_password !== await logjson.logjson_to_json( - await account.get('password') - ) - ) + if (old_password !== await account.get_json('password')) throw new Problem( 'Incorrect password', `Provided old password did not match the expected value.`, 426 ) - await account.set( - 'password', - transaction.json_to_logjson(new_password) - ) - + account.set_json('password', new_password) await transaction.commit() } catch (error) { diff --git a/api/account/password_reset.json.jst b/api/account/password_reset.json.jst index cb11270..908bf75 100644 --- a/api/account/password_reset.json.jst +++ b/api/account/password_reset.json.jst @@ -1,5 +1,4 @@ let crypto = require('crypto') -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -46,23 +45,13 @@ return async env => { let link_code = crypto.randomBytes(16).toString('hex') let expires = new XDate() expires.addDays(1) - account.set( + account.set_json( 'verify_password', - transaction.json_to_logjson( - { - password, - link_code, - expires: expires.getTime() - } - ) + {password, link_code, expires: expires.getTime()} ) - let given_names = await logjson.logjson_to_json( - await account.get('given_names', '') - ) - let family_name = await logjson.logjson_to_json( - await account.get('family_name', '') - ) + let given_names = await account.get_json('given_names', '') + let family_name = await account.get_json('family_name', '') let name = family_name.length ? `${given_names} ${family_name}` : given_names diff --git a/api/account/sign_in.json.jst b/api/account/sign_in.json.jst index b963f97..ecd0f4e 100644 --- a/api/account/sign_in.json.jst +++ b/api/account/sign_in.json.jst @@ -1,5 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default - return async env => { let globals = await env.site.get_json('/_config/globals.json') let nodemailer_noreply = await env.site.get_nodemailer( @@ -36,9 +34,7 @@ return async env => { ).get(email) if ( account === undefined || - password !== await logjson.logjson_to_json( - await account.get('password') - ) + password !== await account.get_json('password') ) throw new Problem( 'Unauthorized', @@ -46,19 +42,14 @@ return async env => { 401 ) - if ( - !await logjson.logjson_to_json( - await account.get('email_verified') - ) - ) + if (!await account.get_json('email_verified')) throw new Problem( 'Email not yet verified', 'Please verify your email address via email link before trying to sign in.', 425 ) - session.set('signed_in_as', transaction.json_to_logjson(email)) - + session.set_json('signed_in_as', email) await transaction.commit() } catch (error) { diff --git a/api/account/sign_out.json.jst b/api/account/sign_out.json.jst index 3ddf3c8..f5fda46 100644 --- a/api/account/sign_out.json.jst +++ b/api/account/sign_out.json.jst @@ -1,5 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default - return async env => { let globals = await env.site.get_json('/_config/globals.json') let nodemailer_noreply = await env.site.get_nodemailer( diff --git a/api/account/sign_up/create_account.json.jst b/api/account/sign_up/create_account.json.jst index db66bb9..613b1bd 100644 --- a/api/account/sign_up/create_account.json.jst +++ b/api/account/sign_up/create_account.json.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -39,9 +38,7 @@ return async env => { let captcha = await session.get('captcha') if ( captcha === undefined || - XDate.now() >= await logjson.logjson_to_json( - await captcha.get('expires') - ) + XDate.now() >= await captcha.get_json('expires') ) throw new Problem( 'No verification image in session', @@ -49,9 +46,7 @@ return async env => { 418 ) - let captcha_text = await logjson.logjson_to_json( - await captcha.get('text') - ) + let captcha_text = await captcha.get_json('text') if (verification_code !== captcha_text) { console.log(`verification code mismatch, \"${verification_code}\" should be \"${captcha_text}\"`) @@ -72,8 +67,8 @@ return async env => { `The email "${details.email}" already has an account registered.`, 420 ) - accounts.set(details.email, transaction.json_to_logjson(details)) + accounts.set_json(details.email, details) await transaction.commit() } catch (error) { diff --git a/api/account/sign_up/get_draft.json.jst b/api/account/sign_up/get_draft.json.jst index b07ab2b..bd55bb3 100644 --- a/api/account/sign_up/get_draft.json.jst +++ b/api/account/sign_up/get_draft.json.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -19,22 +18,14 @@ return async env => { let sign_up_draft = await session.get('sign_up_draft') let details = sign_up_draft !== undefined && - XDate.now() < await logjson.logjson_to_json( - await sign_up_draft.get('expires') - ) ? { - email: await logjson.logjson_to_json( - await sign_up_draft.get('email') - ), - given_names: await logjson.logjson_to_json( - await sign_up_draft.get('given_names') - ), - family_name: await logjson.logjson_to_json( - await sign_up_draft.get('family_name') - ), - contact_me: await logjson.logjson_to_json( - await sign_up_draft.get('contact_me') - ) - } : null + XDate.now() < await sign_up_draft.get_json('expires') ? + { + email: await sign_up_draft.get_json('email'), + given_names: await sign_up_draft.get_json('given_names'), + family_name: await sign_up_draft.get_json('family_name'), + contact_me: await sign_up_draft.get_json('contact_me') + } : + null await transaction.commit() return details diff --git a/api/account/sign_up/send_email_verification_link.json.jst b/api/account/sign_up/send_email_verification_link.json.jst index ee1b7b4..f4cb176 100644 --- a/api/account/sign_up/send_email_verification_link.json.jst +++ b/api/account/sign_up/send_email_verification_link.json.jst @@ -1,5 +1,4 @@ let crypto = require('crypto') -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -42,11 +41,7 @@ return async env => { 421 ) - if ( - await logjson.logjson_to_json( - await account.get('email_verified') - ) - ) + if (await account.get_json('email_verified')) throw new Problem( 'Email already verified', `Your email "${email}" is already verified. You can now sign in.` @@ -56,17 +51,13 @@ return async env => { let link_code = crypto.randomBytes(16).toString('hex') let expires = new XDate() expires.addDays(1) - account.set( + account.set_json( 'verify_email', - transaction.json_to_logjson({link_code, expires: expires.getTime()}) + {link_code, expires: expires.getTime()} ) - let given_names = await logjson.logjson_to_json( - await account.get('given_names', '') - ) - let family_name = await logjson.logjson_to_json( - await account.get('family_name', '') - ) + let given_names = await account.get_json('given_names', '') + let family_name = await account.get_json('family_name', '') let name = family_name.length ? `${given_names} ${family_name}` : given_names diff --git a/api/account/sign_up/set_draft.json.jst b/api/account/sign_up/set_draft.json.jst index 0e3c105..c4b2e80 100644 --- a/api/account/sign_up/set_draft.json.jst +++ b/api/account/sign_up/set_draft.json.jst @@ -27,17 +27,15 @@ return async env => { if (details) { let expires = new XDate() expires.addDays(1) - session.set( + session.set_json( 'sign_up_draft', - transaction.json_to_logjson( - { - email: details.email, - given_names: details.given_names, - family_name: details.family_name, - contact_me: details.contact_me, - expires: expires.getTime() - } - ) + { + email: details.email, + given_names: details.given_names, + family_name: details.family_name, + contact_me: details.contact_me, + expires: expires.getTime() + } ) } else diff --git a/api/account/sign_up/verify_email.json.jst b/api/account/sign_up/verify_email.json.jst index 1fe908c..fe7d701 100644 --- a/api/account/sign_up/verify_email.json.jst +++ b/api/account/sign_up/verify_email.json.jst @@ -1,5 +1,4 @@ let crypto = require('crypto') -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -39,11 +38,7 @@ return async env => { 421 ) - if ( - await logjson.logjson_to_json( - await account.get('email_verified') - ) - ) + if (await account.get_json('email_verified')) throw new Problem( 'Email already verified', `Your email "${email}" is already verified. You can now sign in.` @@ -53,20 +48,14 @@ return async env => { let verify_email = await account.get('verify_email') if ( verify_email === undefined || - XDate.now() >= await logjson.logjson_to_json( - await verify_email.get('expires') - ) + XDate.now() >= await verify_email.get_json('expires') ) throw new Problem( 'Link code missing', `Email verification link code for account "${email}" does not exist or has expired.`, 423 ) - if ( - link_code !== await logjson.logjson_to_json( - await verify_email.get('link_code') - ) - ) + if (link_code !== await verify_email.get_json('link_code')) throw new Problem( 'Link code mismatch', `Provided email verification link code "${link_code}" does not match expected value.`, diff --git a/api/account/verify_password.json.jst b/api/account/verify_password.json.jst index 0d5359d..1b65966 100644 --- a/api/account/verify_password.json.jst +++ b/api/account/verify_password.json.jst @@ -1,5 +1,4 @@ let crypto = require('crypto') -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -42,20 +41,14 @@ return async env => { let verify_password = await account.get('verify_password') if ( verify_password === undefined || - XDate.now() >= await logjson.logjson_to_json( - await verify_password.get('expires') - ) + XDate.now() >= await verify_password.get_json('expires') ) throw new Problem( 'Link code missing', `Password reset link code for account "${email}" does not exist or has expired.`, 423 ) - if ( - link_code !== await logjson.logjson_to_json( - await verify_password.get('link_code') - ) - ) + if (link_code !== await verify_password.get_json('link_code')) throw new Problem( 'Link code mismatch', `Provided password reset link code "${link_code}" does not match expected value.`, diff --git a/api/contact/get_draft.json.jst b/api/contact/get_draft.json.jst index 138c55a..95ddffc 100644 --- a/api/contact/get_draft.json.jst +++ b/api/contact/get_draft.json.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -19,25 +18,15 @@ return async env => { let contact_draft = await session.get('contact_draft') let details = contact_draft !== undefined && - XDate.now() < await logjson.logjson_to_json( - await contact_draft.get('expires') - ) ? { - given_names: await logjson.logjson_to_json( - await contact_draft.get('given_names') - ), - family_name: await logjson.logjson_to_json( - await contact_draft.get('family_name') - ), - company: await logjson.logjson_to_json( - await contact_draft.get('company') - ), - email: await logjson.logjson_to_json( - await contact_draft.get('email') - ), - message: await logjson.logjson_to_json( - await contact_draft.get('message') - ) - } : null + XDate.now() < await contact_draft.get_json('expires') ? + { + given_names: await contact_draft.get_json('given_names'), + family_name: await contact_draft.get_json('family_name'), + company: await contact_draft.get_json('company'), + email: await contact_draft.get_json('email'), + message: await contact_draft.get_json('message') + } : + null await transaction.commit() return details diff --git a/api/contact/send_enquiry.json.jst b/api/contact/send_enquiry.json.jst index b26531f..d6b9d80 100644 --- a/api/contact/send_enquiry.json.jst +++ b/api/contact/send_enquiry.json.jst @@ -1,5 +1,4 @@ let crypto = require('crypto') -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { diff --git a/api/contact/set_draft.json.jst b/api/contact/set_draft.json.jst index e6facb7..672c2fb 100644 --- a/api/contact/set_draft.json.jst +++ b/api/contact/set_draft.json.jst @@ -28,18 +28,16 @@ return async env => { if (details) { let expires = new XDate() expires.addDays(1) - session.set( + session.set_json( 'contact_draft', - transaction.json_to_logjson( - { - given_names: details.given_names, - family_name: details.family_name, - company: details.company, - email: details.email, - message: details.message, - expires: expires.getTime() - } - ) + { + given_names: details.given_names, + family_name: details.family_name, + company: details.company, + email: details.email, + message: details.message, + expires: expires.getTime() + } ) } else diff --git a/api/feedback.json.jst b/api/feedback.json.jst index 30761c6..400c284 100644 --- a/api/feedback.json.jst +++ b/api/feedback.json.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { diff --git a/api/globals/get.json.jst b/api/globals/get.json.jst index 22069a0..fb68ddb 100644 --- a/api/globals/get.json.jst +++ b/api/globals/get.json.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -22,16 +21,11 @@ return async env => { let account = await ( await root.get('accounts', {}) ).get(env.signed_in_as) - if ( - !await logjson.logjson_to_json( - await account.get('administrator') - ) - ) + if (!await account.get_json('administrator')) throw new Problem('Unauthorized', 'Not administrator.', 401) - globals = await logjson.logjson_to_json( - await root.get('globals', {}) - ) + globals = await root.get_json('globals', {}) + await transaction.commit() return globals } diff --git a/api/globals/set.json.jst b/api/globals/set.json.jst index 5f986aa..d8fc5be 100644 --- a/api/globals/set.json.jst +++ b/api/globals/set.json.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -35,14 +34,10 @@ return async env => { let account = await ( await root.get('accounts', {}) ).get(env.signed_in_as) - if ( - !await logjson.logjson_to_json( - await account.get('administrator') - ) - ) + if (!await account.get_json('administrator')) throw new Problem('Unauthorized', 'Not administrator.', 401) - root.set('globals', transaction.json_to_logjson(globals)) + root.set_json('globals', globals) await transaction.commit() } catch (error) { diff --git a/api/verification_image.png.jst b/api/verification_image.png.jst index 7d0bfea..caa0ce5 100644 --- a/api/verification_image.png.jst +++ b/api/verification_image.png.jst @@ -15,14 +15,9 @@ return async env => { // store captcha text in the session for validation when form submitted let expires = new XDate() expires.addHours(1) - session.set( + session.set_json( 'captcha', - transaction.json_to_logjson( - { - text: captcha.text(), - expires: expires.getTime() - } - ) + {text: captcha.text(), expires: expires.getTime()} ) await transaction.commit() diff --git a/contact/index.html.jst b/contact/index.html.jst index fda3325..8a39212 100644 --- a/contact/index.html.jst +++ b/contact/index.html.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -17,28 +16,16 @@ return async env => { let contact_draft = await session.get('contact_draft') draft_details = contact_draft !== undefined && - XDate.now() < await logjson.logjson_to_json( - await contact_draft.get('expires') - ) ? { - email: await logjson.logjson_to_json( - await contact_draft.get('email') - ), - given_names: await logjson.logjson_to_json( - await contact_draft.get('given_names') - ), - family_name: await logjson.logjson_to_json( - await contact_draft.get('family_name') - ), - company: await logjson.logjson_to_json( - await contact_draft.get('company') - ), - email: await logjson.logjson_to_json( - await contact_draft.get('email') - ), - message: await logjson.logjson_to_json( - await contact_draft.get('message') - ) - } : null + XDate.now() < await contact_draft.get_json('expires') ? + { + email: await contact_draft.get_json('email'), + given_names: await contact_draft.get_json('given_names'), + family_name: await contact_draft.get_json('family_name'), + company: await contact_draft.get_json('company'), + email: await contact_draft.get_json('email'), + message: await contact_draft.get_json('message') + } : + null await transaction.commit() } diff --git a/my_account/index.html.jst b/my_account/index.html.jst index 841790f..30dc0dc 100644 --- a/my_account/index.html.jst +++ b/my_account/index.html.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -24,33 +23,21 @@ return async env => { ).get('accounts') ).get(env.signed_in_as) details = { - given_names: await logjson.logjson_to_json( - await account.get('given_names') - ), - family_name: await logjson.logjson_to_json( - await account.get('family_name') - ), - contact_me: await logjson.logjson_to_json( - await account.get('contact_me') - ) + given_names: await account.get_json('given_names'), + family_name: await account.get_json('family_name'), + contact_me: await account.get_json('contact_me') } let change_details_draft = await session.get('change_details_draft') draft_details = change_details_draft !== undefined && - XDate.now() < await logjson.logjson_to_json( - await change_details_draft.get('expires') - ) ? { - given_names: await logjson.logjson_to_json( - await change_details_draft.get('given_names') - ), - family_name: await logjson.logjson_to_json( - await change_details_draft.get('family_name') - ), - contact_me: await logjson.logjson_to_json( - await change_details_draft.get('contact_me') - ) - } : null + XDate.now() < await change_details_draft.get_json('expires') ? + { + given_names: await change_details_draft.get_json('given_names'), + family_name: await change_details_draft.get_json('family_name'), + contact_me: await change_details_draft.get_json('contact_me') + } : + null } await transaction.commit() } @@ -252,11 +239,13 @@ return async env => { let draft_timeout_handler = async () => { draft_timeout_running = false await api_account_change_details_set_draft( - step_1_dirty ? { - given_names: document.getElementById('given-names').value.slice(0, 256), - family_name: document.getElementById('family-name').value.slice(0, 256), - contact_me: document.getElementById('contact-me').checked ? true : false - } : null + step_1_dirty ? + { + given_names: document.getElementById('given-names').value.slice(0, 256), + family_name: document.getElementById('family-name').value.slice(0, 256), + contact_me: document.getElementById('contact-me').checked ? true : false + } : + null ) //console.log('draft', await api_account_change_details_get_draft()) } diff --git a/my_account/send_verification_email/index.html.jst b/my_account/send_verification_email/index.html.jst index e7adb1a..10fb539 100644 --- a/my_account/send_verification_email/index.html.jst +++ b/my_account/send_verification_email/index.html.jst @@ -1,5 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default - return async env => { let breadcrumbs = await _require('/_lib/breadcrumbs.jst') let icon_cross = await env.site.get_min_svg('/_svg/icon_cross.svg') diff --git a/my_account/sign_up/index.html.jst b/my_account/sign_up/index.html.jst index e033251..21862dc 100644 --- a/my_account/sign_up/index.html.jst +++ b/my_account/sign_up/index.html.jst @@ -1,4 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default let XDate = require('xdate') return async env => { @@ -17,22 +16,14 @@ return async env => { let sign_up_draft = await session.get('sign_up_draft') draft_details = sign_up_draft !== undefined && - XDate.now() < await logjson.logjson_to_json( - await sign_up_draft.get('expires') - ) ? { - email: await logjson.logjson_to_json( - await sign_up_draft.get('email') - ), - given_names: await logjson.logjson_to_json( - await sign_up_draft.get('given_names') - ), - family_name: await logjson.logjson_to_json( - await sign_up_draft.get('family_name') - ), - contact_me: await logjson.logjson_to_json( - await sign_up_draft.get('contact_me') - ) - } : null + XDate.now() < await sign_up_draft.get_json('expires') ? + { + email: await sign_up_draft.get_json('email'), + given_names: await sign_up_draft.get_json('given_names'), + family_name: await sign_up_draft.get_json('family_name'), + contact_me: await sign_up_draft.get_json('contact_me') + } : + null await transaction.commit() } diff --git a/my_account/verify_email/index.html.jst b/my_account/verify_email/index.html.jst index f0a953f..8f9fef0 100644 --- a/my_account/verify_email/index.html.jst +++ b/my_account/verify_email/index.html.jst @@ -1,5 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default - return async env => { let breadcrumbs = await _require('/_lib/breadcrumbs.jst') let icon_cross = await env.site.get_min_svg('/_svg/icon_cross.svg') @@ -15,8 +13,8 @@ return async env => { Object.prototype.hasOwnProperty.call( env.parsed_url.query, 'link_code' - ) - ) + ) + ) details.link_code = decodeURIComponent(env.parsed_url.query.link_code) console.log('details', JSON.stringify(details)) diff --git a/my_account/verify_password/index.html.jst b/my_account/verify_password/index.html.jst index ca1c436..4c3fe7b 100644 --- a/my_account/verify_password/index.html.jst +++ b/my_account/verify_password/index.html.jst @@ -1,5 +1,3 @@ -let logjson = (await import('@ndcode/logjson')).default - return async env => { let breadcrumbs = await _require('/_lib/breadcrumbs.jst') let icon_cross = await env.site.get_min_svg('/_svg/icon_cross.svg') @@ -15,8 +13,8 @@ return async env => { Object.prototype.hasOwnProperty.call( env.parsed_url.query, 'link_code' - ) - ) + ) + ) details.link_code = decodeURIComponent(env.parsed_url.query.link_code) console.log('details', JSON.stringify(details))