Add /_lib/get_account.jst, remove env.signed_in_as

[ndcode_site.git] / api / account / change_details / set.json.jst

diff --git a/api/account/change_details/set.json.jst b/api/account/change_details/set.json.jst
index 5a1bd43..0000541 100644 (file)
--- a/api/account/change_details/set.json.jst
+++ b/api/account/change_details/set.json.jst
@@ -1,8 +1,9 @@
 let XDate = require('xdate')
 
 return async env => {
-  let post_request = await _require('/_lib/post_request.jst')
+  let get_account = await _require('/_lib/get_account.jst')
   let get_session = await _require('/_lib/get_session.jst')
+  let post_request = await _require('/_lib/post_request.jst')
   let Problem = await _require('/_lib/Problem.jst')
 
   await post_request(
@@ -24,20 +25,17 @@ return async env => {
 
       let transaction = await env.site.database.Transaction()
       try {
-        // initialize env.session_key, set cookie in env.response
-        await get_session(env, transaction)
-        if (env.signed_in_as === null)
+        let account = await get_account(
+          env,
+          transaction,
+          await get_session(env, transaction)
+        )
+        if (account === undefined)
           throw new Problem('Unauthorized', 'Please sign in first.', 401)
 
-        let account = await (
-          await (
-            await transaction.get({})
-          ).get('accounts', {})
-        ).get(env.signed_in_as)
         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()
       }
       catch (error) {