mirror of
https://github.com/Litlyx/litlyx
synced 2025-12-10 07:48:37 +01:00
use new mail service in dashboard
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
|
||||
import { createUserJwt, readRegisterJwt } from '~/server/AuthManager';
|
||||
import { createUserJwt, readRegisterJwt } from '~/server/AuthManager';
|
||||
import { UserModel } from '@schema/UserSchema';
|
||||
import { PasswordModel } from '@schema/PasswordSchema';
|
||||
// import EmailService from '@services/EmailService';
|
||||
import { EmailService } from '@services/EmailService';
|
||||
import { EmailServiceHelper } from '~/server/services/EmailServiceHelper';
|
||||
|
||||
export default defineEventHandler(async event => {
|
||||
|
||||
@@ -14,9 +15,12 @@ export default defineEventHandler(async event => {
|
||||
try {
|
||||
await PasswordModel.create({ email: data.email, password: data.password })
|
||||
await UserModel.create({ email: data.email, given_name: '', name: 'EmailLogin', locale: '', picture: '', created_at: Date.now() });
|
||||
// setImmediate(() => { EmailService.sendWelcomeEmail(data.email); });
|
||||
setImmediate(() => {
|
||||
const emailData = EmailService.getEmailServerInfo('welcome', { target: data.email });
|
||||
EmailServiceHelper.sendEmail(emailData);
|
||||
});
|
||||
const jwt = createUserJwt({ email: data.email, name: 'EmailLogin' });
|
||||
return sendRedirect(event,`https://dashboard.litlyx.com/jwt_login?jwt_login=${jwt}`);
|
||||
return sendRedirect(event, `https://dashboard.litlyx.com/jwt_login?jwt_login=${jwt}`);
|
||||
} catch (ex) {
|
||||
return setResponseStatus(event, 400, 'Error creating user');
|
||||
}
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
import { OAuth2Client } from 'google-auth-library';
|
||||
import { createUserJwt } from '~/server/AuthManager';
|
||||
import { UserModel } from '@schema/UserSchema';
|
||||
// import EmailService from '@services/EmailService';
|
||||
import { EmailService } from '@services/EmailService';
|
||||
import { EmailServiceHelper } from '~/server/services/EmailServiceHelper';
|
||||
|
||||
const { GOOGLE_AUTH_CLIENT_SECRET, GOOGLE_AUTH_CLIENT_ID } = useRuntimeConfig()
|
||||
|
||||
@@ -58,10 +59,12 @@ export default defineEventHandler(async event => {
|
||||
|
||||
const savedUser = await newUser.save();
|
||||
|
||||
// setImmediate(() => {
|
||||
// console.log('SENDING WELCOME EMAIL TO', payload.email);
|
||||
// if (payload.email) EmailService.sendWelcomeEmail(payload.email);
|
||||
// });
|
||||
setImmediate(() => {
|
||||
console.log('SENDING WELCOME EMAIL TO', payload.email);
|
||||
if (!payload.email) return;
|
||||
const emailData = EmailService.getEmailServerInfo('welcome', { target: payload.email });
|
||||
EmailServiceHelper.sendEmail(emailData);
|
||||
});
|
||||
|
||||
return { error: false, access_token: createUserJwt({ email: savedUser.email, name: savedUser.name }) }
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
|
||||
import { createRegisterJwt, createUserJwt } from '~/server/AuthManager';
|
||||
import { createRegisterJwt } from '~/server/AuthManager';
|
||||
import { UserModel } from '@schema/UserSchema';
|
||||
import { RegisterModel } from '@schema/RegisterSchema';
|
||||
// import EmailService from '@services/EmailService';
|
||||
import { EmailService } from '@services/EmailService';
|
||||
import crypto from 'crypto';
|
||||
import { EmailServiceHelper } from '~/server/services/EmailServiceHelper';
|
||||
|
||||
function canRegister(email: string, password: string) {
|
||||
if (email.length == 0) return false;
|
||||
@@ -33,9 +34,10 @@ export default defineEventHandler(async event => {
|
||||
|
||||
await RegisterModel.create({ email, password: hashedPassword });
|
||||
|
||||
// setImmediate(() => {
|
||||
// EmailService.sendConfirmEmail(email, `https://dashboard.litlyx.com/api/auth/confirm_email?register_code=${jwt}`);
|
||||
// });
|
||||
setImmediate(() => {
|
||||
const emailData = EmailService.getEmailServerInfo('confirm', { target: email, link: `https://dashboard.litlyx.com/api/auth/confirm_email?register_code=${jwt}` });
|
||||
EmailServiceHelper.sendEmail(emailData);
|
||||
});
|
||||
|
||||
return {
|
||||
error: false,
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
|
||||
import { createUserJwt } from '~/server/AuthManager';
|
||||
import { UserModel } from '@schema/UserSchema';
|
||||
import EmailService from '@services/EmailService';
|
||||
|
||||
const config = useRuntimeConfig();
|
||||
|
||||
export default defineEventHandler(async event => {
|
||||
|
||||
const { code } = getQuery(event);
|
||||
console.log('CODE', code);
|
||||
|
||||
const redirect_uri = 'http://127.0.0.1:3000'
|
||||
|
||||
const res = await fetch(`https://github.com/login/oauth/access_token?client_id=${config.GITHUB_AUTH_CLIENT_ID}&client_secret=${config.GITHUB_AUTH_CLIENT_SECRET}&code=${code}&redirect_url=${redirect_uri}`, {
|
||||
headers: {
|
||||
"Accept": "application/json",
|
||||
"Accept-Encoding": "application/json",
|
||||
},
|
||||
});
|
||||
|
||||
const data = await res.json();
|
||||
|
||||
const access_token = data.access_token;
|
||||
|
||||
console.log(data);
|
||||
|
||||
return sendRedirect(event,`http://127.0.0.1:3000/login?github_access_token=${access_token}`)
|
||||
|
||||
|
||||
// const origin = event.headers.get('origin');
|
||||
|
||||
// const tokenResponse = await client.getToken({
|
||||
// code: body.code,
|
||||
// redirect_uri: origin || ''
|
||||
// });
|
||||
|
||||
// const tokens = tokenResponse.tokens;
|
||||
|
||||
// const ticket = await client.verifyIdToken({
|
||||
// idToken: tokens.id_token || '',
|
||||
// audience: GOOGLE_AUTH_CLIENT_ID,
|
||||
// });
|
||||
|
||||
// const payload = ticket.getPayload();
|
||||
// if (!payload) return { error: true, access_token: '' };
|
||||
|
||||
|
||||
// const user = await UserModel.findOne({ email: payload.email });
|
||||
|
||||
// if (user) return { error: false, access_token: createUserJwt({ email: user.email, name: user.name }) }
|
||||
|
||||
|
||||
// const newUser = new UserModel({
|
||||
// email: payload.email,
|
||||
// given_name: payload.given_name,
|
||||
// name: payload.name,
|
||||
// locale: payload.locale,
|
||||
// picture: payload.picture,
|
||||
// created_at: Date.now()
|
||||
// });
|
||||
|
||||
// const savedUser = await newUser.save();
|
||||
|
||||
// setImmediate(() => {
|
||||
// console.log('SENDING WELCOME EMAIL TO', payload.email);
|
||||
// if (payload.email) EmailService.sendWelcomeEmail(payload.email);
|
||||
// });
|
||||
|
||||
// return { error: false, access_token: createUserJwt({ email: savedUser.email, name: savedUser.name }) }
|
||||
|
||||
});
|
||||
@@ -4,9 +4,9 @@ import type Event from 'stripe';
|
||||
import { ProjectModel } from '@schema/project/ProjectSchema';
|
||||
import { PREMIUM_DATA, PREMIUM_PLAN, getPlanFromId, getPlanFromPrice, getPlanFromTag } from '@data/PREMIUM';
|
||||
import { ProjectLimitModel } from '@schema/project/ProjectsLimits';
|
||||
// import EmailService from '@services/EmailService'
|
||||
import { EmailService } from '@services/EmailService'
|
||||
import { UserModel } from '@schema/UserSchema';
|
||||
|
||||
import { EmailServiceHelper } from '~/server/services/EmailServiceHelper';
|
||||
|
||||
|
||||
async function addSubscriptionToProject(project_id: string, plan: PREMIUM_DATA, subscription_id: string, current_period_start: number, current_period_end: number) {
|
||||
@@ -93,9 +93,10 @@ async function onPaymentOnetimeSuccess(event: Event.PaymentIntentSucceededEvent)
|
||||
const user = await UserModel.findOne({ _id: project.owner });
|
||||
if (!user) return { ok: false, error: 'USER NOT EXIST FOR PROJECT' + project.id }
|
||||
|
||||
// setTimeout(() => {
|
||||
// EmailService.sendPurchaseEmail(user.email, project.name);
|
||||
// }, 1);
|
||||
setTimeout(() => {
|
||||
const emailData = EmailService.getEmailServerInfo('purchase', { target: user.email, projectName: project.name });
|
||||
EmailServiceHelper.sendEmail(emailData);
|
||||
}, 1);
|
||||
|
||||
return { ok: true };
|
||||
}
|
||||
@@ -140,10 +141,11 @@ async function onPaymentSuccess(event: Event.InvoicePaidEvent) {
|
||||
const user = await UserModel.findOne({ _id: project.owner });
|
||||
if (!user) return { ok: false, error: 'USER NOT EXIST FOR PROJECT' + project.id }
|
||||
|
||||
// setTimeout(() => {
|
||||
// if (PLAN.ID == 0) return;
|
||||
// if (isNewSubscription) EmailService.sendPurchaseEmail(user.email, project.name);
|
||||
// }, 1);
|
||||
setTimeout(() => {
|
||||
if (PLAN.ID == 0) return;
|
||||
const emailData = EmailService.getEmailServerInfo('purchase', { target: user.email, projectName: project.name });
|
||||
EmailServiceHelper.sendEmail(emailData);
|
||||
}, 1);
|
||||
|
||||
|
||||
return { ok: true };
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { VisitModel } from "@schema/metrics/VisitSchema";
|
||||
import { Redis } from "~/server/services/CacheService";
|
||||
import { executeTimelineAggregation } from "~/server/services/TimelineService";
|
||||
import { executeAdvancedTimelineAggregation } from "~/server/services/TimelineService";
|
||||
|
||||
export default defineEventHandler(async event => {
|
||||
|
||||
@@ -13,7 +13,7 @@ export default defineEventHandler(async event => {
|
||||
const cacheExp = 60;
|
||||
|
||||
return await Redis.useCacheV2(cacheKey, cacheExp, async () => {
|
||||
const timelineData = await executeTimelineAggregation({
|
||||
const timelineData = await executeAdvancedTimelineAggregation({
|
||||
projectId: project_id,
|
||||
model: VisitModel,
|
||||
from, to, slice, timeOffset, domain
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
|
||||
import crypto from 'crypto';
|
||||
import { PasswordModel } from '@schema/PasswordSchema';
|
||||
// import EmailService from '@services/EmailService'
|
||||
import { EmailService } from '@services/EmailService'
|
||||
import { EmailServiceHelper } from '~/server/services/EmailServiceHelper';
|
||||
|
||||
export default defineEventHandler(async event => {
|
||||
|
||||
@@ -19,8 +20,9 @@ export default defineEventHandler(async event => {
|
||||
target.password = hashedPassword;
|
||||
await target.save();
|
||||
|
||||
// await EmailService.sendResetPasswordEmail(email, newPass);
|
||||
|
||||
const emailData = EmailService.getEmailServerInfo('reset_password', { target: email, newPassword: newPass });
|
||||
EmailServiceHelper.sendEmail(emailData);
|
||||
|
||||
return { error: false, message: 'Password changed' }
|
||||
|
||||
});
|
||||
@@ -1,6 +1,5 @@
|
||||
import mongoose from "mongoose";
|
||||
import { Redis } from "~/server/services/CacheService";
|
||||
// import EmailService from '@services/EmailService';
|
||||
import StripeService from '~/server/services/StripeService';
|
||||
import { logger } from "./Logger";
|
||||
|
||||
@@ -14,12 +13,6 @@ export default async () => {
|
||||
|
||||
logger.info('[SERVER] Initializing');
|
||||
|
||||
// if (config.EMAIL_SERVICE) {
|
||||
// EmailService.init(config.BREVO_API_KEY);
|
||||
// logger.info('[EMAIL] Initialized');
|
||||
// }
|
||||
|
||||
|
||||
if (config.STRIPE_SECRET) {
|
||||
StripeService.init(config.STRIPE_SECRET, config.STRIPE_WH_SECRET, false);
|
||||
logger.info('[STRIPE] Initialized');
|
||||
@@ -41,13 +34,8 @@ export default async () => {
|
||||
|
||||
logger.info('[SERVER] Completed');
|
||||
|
||||
logger.warn('[ANOMALY LOOP] Disabled');
|
||||
|
||||
|
||||
logger.warn(`[SELFHOSTED_SERVER] ${config.SELFHOSTED}`);
|
||||
logger.warn(`[SELFHOSTED_CLIENT] ${config.public.SELFHOSTED}`);
|
||||
logger.warn(`[AUTH] ${config.public.AUTH_MODE}`);
|
||||
|
||||
// anomalyLoop();
|
||||
|
||||
};
|
||||
18
dashboard/server/services/EmailServiceHelper.ts
Normal file
18
dashboard/server/services/EmailServiceHelper.ts
Normal file
@@ -0,0 +1,18 @@
|
||||
|
||||
import { EmailServerInfo } from '@services/EmailService'
|
||||
|
||||
const { EMAIL_SECRET } = useRuntimeConfig();
|
||||
|
||||
export class EmailServiceHelper {
|
||||
static async sendEmail(data: EmailServerInfo) {
|
||||
try {
|
||||
await $fetch(data.url, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data.body),
|
||||
headers: { ...data.headers, 'x-litlyx-token': EMAIL_SECRET }
|
||||
})
|
||||
} catch (ex) {
|
||||
console.error(ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user