From 72a9959903ea7c68bb040a3670f7f03c15459c63 Mon Sep 17 00:00:00 2001 From: lingdocs <71590811+lingdocs@users.noreply.github.com> Date: Mon, 23 Aug 2021 09:12:35 +0400 Subject: [PATCH] slight refactor --- account/src/lib/couch-db.ts | 2 +- account/src/routers/api-router.ts | 2 +- website/src/lib/account-types.ts | 2 +- website/src/lib/pouch-dbs.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/account/src/lib/couch-db.ts b/account/src/lib/couch-db.ts index 00a2cf0..2a17bb5 100644 --- a/account/src/lib/couch-db.ts +++ b/account/src/lib/couch-db.ts @@ -93,7 +93,7 @@ export async function updateLingdocsUser(uuid: T.UUID, toUpdate: { level: "student", wordlistDbName: T.WordlistDbName, - userDbPassword: T.UserDbPassword, + couchDbPassword: T.UserDbPassword, } ): Promise { const user = await getLingdocsUser("userId", uuid); diff --git a/account/src/routers/api-router.ts b/account/src/routers/api-router.ts index eb4d5e0..e1106cd 100644 --- a/account/src/routers/api-router.ts +++ b/account/src/routers/api-router.ts @@ -123,7 +123,7 @@ apiRouter.put("/user/upgrade", async (req, res, next) => { // // create user db // const { name } = await createWordlistDatabase(userId, password); // update LingdocsUser - const u = await updateLingdocsUser(userId, { level: "student", wordlistDbName: userDbName, userDbPassword: password }); + const u = await updateLingdocsUser(userId, { level: "student", wordlistDbName: userDbName, couchDbPassword: password }); const upgraded: T.UpgradeUserResponse = { ok: true, message: "user upgraded to student", diff --git a/website/src/lib/account-types.ts b/website/src/lib/account-types.ts index 1021427..94c75cb 100644 --- a/website/src/lib/account-types.ts +++ b/website/src/lib/account-types.ts @@ -38,7 +38,7 @@ export type LingdocsUser = { { level: "basic"} | { level: "student" | "editor", - userDbPassword: UserDbPassword, + couchDbPassword: UserDbPassword, wordlistDbName: WordlistDbName, } ) & import("nano").MaybeDocument; diff --git a/website/src/lib/pouch-dbs.ts b/website/src/lib/pouch-dbs.ts index 71ea856..a818867 100644 --- a/website/src/lib/pouch-dbs.ts +++ b/website/src/lib/pouch-dbs.ts @@ -79,7 +79,7 @@ function initializeLocalDb(type: LocalDbType, refresh: () => void, user: AT.Ling : (type === "wordlist" && "wordlistDbName" in user) ? user.wordlistDbName : ""; - const password = "userDbPassword" in user ? user.userDbPassword : ""; + const password = "couchDbPassword" in user ? user.couchDbPassword : ""; const db = dbs[type]; // only initialize the db if it doesn't exist or if it has a different name if ((!db) || (db.db?.name !== name)) {