Refactor data handlers + misc fixes
This refactors the data handlers into a more standard/understood model-like architecture, to prepare for a new, more robust config system. It also fixes a problem with creating new Notes and uploading new Photos via the web interface (related to #58). Finally, it speeds up docker builds by sending in less files, which aren't necessary or will be built anyway. This is all in preparation to allow building #13 more robustly.
This commit is contained in:
Bruno Bernardino
290
lib/models/user.ts
Normal file
290
lib/models/user.ts
Normal file
@@ -0,0 +1,290 @@
|
||||
import Database, { sql } from '/lib/interfaces/database.ts';
|
||||
import { User, UserSession, VerificationCode } from '/lib/types.ts';
|
||||
import { generateRandomCode } from '/lib/utils/misc.ts';
|
||||
import { isEmailEnabled, isForeverSignupEnabled } from '/lib/config.ts';
|
||||
|
||||
const db = new Database();
|
||||
|
||||
export class UserModel {
|
||||
static async isThereAnAdmin() {
|
||||
const user = (await db.query<User>(
|
||||
sql`SELECT * FROM "bewcloud_users" WHERE ("extra" ->> 'is_admin')::boolean IS TRUE LIMIT 1`,
|
||||
))[
|
||||
0
|
||||
];
|
||||
|
||||
return Boolean(user);
|
||||
}
|
||||
|
||||
static async getByEmail(email: string) {
|
||||
const lowercaseEmail = email.toLowerCase().trim();
|
||||
|
||||
const user = (await db.query<User>(sql`SELECT * FROM "bewcloud_users" WHERE "email" = $1 LIMIT 1`, [
|
||||
lowercaseEmail,
|
||||
]))[0];
|
||||
|
||||
return user;
|
||||
}
|
||||
|
||||
static async getById(id: string) {
|
||||
const user = (await db.query<User>(sql`SELECT * FROM "bewcloud_users" WHERE "id" = $1 LIMIT 1`, [
|
||||
id,
|
||||
]))[0];
|
||||
|
||||
return user;
|
||||
}
|
||||
|
||||
static async create(email: User['email'], hashedPassword: User['hashed_password']) {
|
||||
const trialDays = isForeverSignupEnabled() ? 36_525 : 30;
|
||||
const now = new Date();
|
||||
const trialEndDate = new Date(new Date().setUTCDate(new Date().getUTCDate() + trialDays));
|
||||
|
||||
const subscription: User['subscription'] = {
|
||||
external: {},
|
||||
expires_at: trialEndDate.toISOString(),
|
||||
updated_at: now.toISOString(),
|
||||
};
|
||||
|
||||
const extra: User['extra'] = { is_email_verified: isEmailEnabled() ? false : true };
|
||||
|
||||
// First signup will be an admin "forever"
|
||||
if (!(await this.isThereAnAdmin())) {
|
||||
extra.is_admin = true;
|
||||
subscription.expires_at = new Date('2100-12-31').toISOString();
|
||||
}
|
||||
|
||||
const newUser = (await db.query<User>(
|
||||
sql`INSERT INTO "bewcloud_users" (
|
||||
"email",
|
||||
"subscription",
|
||||
"status",
|
||||
"hashed_password",
|
||||
"extra"
|
||||
) VALUES ($1, $2, $3, $4, $5)
|
||||
RETURNING *`,
|
||||
[
|
||||
email,
|
||||
JSON.stringify(subscription),
|
||||
extra.is_admin || isForeverSignupEnabled() ? 'active' : 'trial',
|
||||
hashedPassword,
|
||||
JSON.stringify(extra),
|
||||
],
|
||||
))[0];
|
||||
|
||||
return newUser;
|
||||
}
|
||||
|
||||
static async update(user: User) {
|
||||
await db.query(
|
||||
sql`UPDATE "bewcloud_users" SET
|
||||
"email" = $2,
|
||||
"subscription" = $3,
|
||||
"status" = $4,
|
||||
"hashed_password" = $5,
|
||||
"extra" = $6
|
||||
WHERE "id" = $1`,
|
||||
[
|
||||
user.id,
|
||||
user.email,
|
||||
JSON.stringify(user.subscription),
|
||||
user.status,
|
||||
user.hashed_password,
|
||||
JSON.stringify(user.extra),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
static async delete(userId: string) {
|
||||
await db.query(
|
||||
sql`DELETE FROM "bewcloud_user_sessions" WHERE "user_id" = $1`,
|
||||
[
|
||||
userId,
|
||||
],
|
||||
);
|
||||
|
||||
await db.query(
|
||||
sql`DELETE FROM "bewcloud_verification_codes" WHERE "user_id" = $1`,
|
||||
[
|
||||
userId,
|
||||
],
|
||||
);
|
||||
|
||||
await db.query(
|
||||
sql`DELETE FROM "bewcloud_news_feed_articles" WHERE "user_id" = $1`,
|
||||
[
|
||||
userId,
|
||||
],
|
||||
);
|
||||
|
||||
await db.query(
|
||||
sql`DELETE FROM "bewcloud_news_feeds" WHERE "user_id" = $1`,
|
||||
[
|
||||
userId,
|
||||
],
|
||||
);
|
||||
|
||||
await db.query(
|
||||
sql`DELETE FROM "bewcloud_users" WHERE "id" = $1`,
|
||||
[
|
||||
userId,
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export class UserSessionModel {
|
||||
static async getById(id: string) {
|
||||
const session = (await db.query<UserSession>(
|
||||
sql`SELECT * FROM "bewcloud_user_sessions" WHERE "id" = $1 AND "expires_at" > now() LIMIT 1`,
|
||||
[
|
||||
id,
|
||||
],
|
||||
))[0];
|
||||
|
||||
return session;
|
||||
}
|
||||
|
||||
static async create(user: User, isShortLived = false) {
|
||||
const oneMonthFromToday = new Date(new Date().setUTCMonth(new Date().getUTCMonth() + 1));
|
||||
const oneWeekFromToday = new Date(new Date().setUTCDate(new Date().getUTCDate() + 7));
|
||||
|
||||
const newSession: Omit<UserSession, 'id' | 'created_at'> = {
|
||||
user_id: user.id,
|
||||
expires_at: isShortLived ? oneWeekFromToday : oneMonthFromToday,
|
||||
last_seen_at: new Date(),
|
||||
};
|
||||
|
||||
const newUserSessionResult = (await db.query<UserSession>(
|
||||
sql`INSERT INTO "bewcloud_user_sessions" (
|
||||
"user_id",
|
||||
"expires_at",
|
||||
"last_seen_at"
|
||||
) VALUES ($1, $2, $3)
|
||||
RETURNING *`,
|
||||
[
|
||||
newSession.user_id,
|
||||
newSession.expires_at,
|
||||
newSession.last_seen_at,
|
||||
],
|
||||
))[0];
|
||||
|
||||
return newUserSessionResult;
|
||||
}
|
||||
|
||||
static async update(session: UserSession) {
|
||||
await db.query(
|
||||
sql`UPDATE "bewcloud_user_sessions" SET
|
||||
"expires_at" = $2,
|
||||
"last_seen_at" = $3
|
||||
WHERE "id" = $1`,
|
||||
[
|
||||
session.id,
|
||||
session.expires_at,
|
||||
session.last_seen_at,
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
static async delete(sessionId: string) {
|
||||
await db.query(
|
||||
sql`DELETE FROM "bewcloud_user_sessions" WHERE "id" = $1`,
|
||||
[
|
||||
sessionId,
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export async function validateUserAndSession(userId: string, sessionId: string) {
|
||||
const user = await UserModel.getById(userId);
|
||||
|
||||
if (!user) {
|
||||
throw new Error('Not Found');
|
||||
}
|
||||
|
||||
const session = await UserSessionModel.getById(sessionId);
|
||||
|
||||
if (!session || session.user_id !== user.id) {
|
||||
throw new Error('Not Found');
|
||||
}
|
||||
|
||||
session.last_seen_at = new Date();
|
||||
|
||||
await UserSessionModel.update(session);
|
||||
|
||||
return { user, session };
|
||||
}
|
||||
|
||||
export class VerificationCodeModel {
|
||||
static async create(
|
||||
user: User,
|
||||
verificationId: string,
|
||||
type: VerificationCode['verification']['type'],
|
||||
) {
|
||||
const inThirtyMinutes = new Date(new Date().setUTCMinutes(new Date().getUTCMinutes() + 30));
|
||||
|
||||
const code = generateRandomCode();
|
||||
|
||||
const newVerificationCode: Omit<VerificationCode, 'id' | 'created_at'> = {
|
||||
user_id: user.id,
|
||||
code,
|
||||
expires_at: inThirtyMinutes,
|
||||
verification: {
|
||||
id: verificationId,
|
||||
type,
|
||||
},
|
||||
};
|
||||
|
||||
await db.query(
|
||||
sql`INSERT INTO "bewcloud_verification_codes" (
|
||||
"user_id",
|
||||
"code",
|
||||
"expires_at",
|
||||
"verification"
|
||||
) VALUES ($1, $2, $3, $4)
|
||||
RETURNING "id"`,
|
||||
[
|
||||
newVerificationCode.user_id,
|
||||
newVerificationCode.code,
|
||||
newVerificationCode.expires_at,
|
||||
JSON.stringify(newVerificationCode.verification),
|
||||
],
|
||||
);
|
||||
|
||||
return code;
|
||||
}
|
||||
|
||||
static async validate(
|
||||
user: User,
|
||||
verificationId: string,
|
||||
code: string,
|
||||
type: VerificationCode['verification']['type'],
|
||||
) {
|
||||
const verificationCode = (await db.query<VerificationCode>(
|
||||
sql`SELECT * FROM "bewcloud_verification_codes"
|
||||
WHERE "user_id" = $1 AND
|
||||
"code" = $2 AND
|
||||
"verification" ->> 'type' = $3 AND
|
||||
"verification" ->> 'id' = $4 AND
|
||||
"expires_at" > now()
|
||||
LIMIT 1`,
|
||||
[
|
||||
user.id,
|
||||
code,
|
||||
type,
|
||||
verificationId,
|
||||
],
|
||||
))[0];
|
||||
|
||||
if (verificationCode) {
|
||||
await db.query(
|
||||
sql`DELETE FROM "bewcloud_verification_codes" WHERE "id" = $1`,
|
||||
[
|
||||
verificationCode.id,
|
||||
],
|
||||
);
|
||||
} else {
|
||||
throw new Error('Not Found');
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user