425 add telegram login alongside discord authentication

.migrate

@@ -1,9 +1,9 @@
 {
-  "lastRun": "1720532975152-add-isfetchingintialdata.ts",
+  "lastRun": "1738072787796-update-user-documents-for-telegram-login.ts",
   "migrations": [
     {
-      "title": "1720532975152-add-isfetchingintialdata.ts",
-      "timestamp": 1720533282435
+      "title": "1738072787796-update-user-documents-for-telegram-login.ts",
+      "timestamp": 1738073593695
     }
   ]
 }

package.json

@@ -28,7 +28,7 @@
     "@notionhq/client": "^2.2.3",
     "@sentry/node": "^7.50.0",
     "@temporalio/client": "^1.11.3",
-    "@togethercrew.dev/db": "^3.0.79",
+    "@togethercrew.dev/db": "^3.2.3",
     "@togethercrew.dev/tc-messagebroker": "^0.0.50",
     "@types/express-session": "^1.17.7",
     "@types/morgan": "^1.9.5",
@@ -54,7 +54,7 @@
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.40",
     "mongodb": "^4.12.1",
-    "mongoose": "^6.7.5",
+    "mongoose": "^6.13.8",
     "morgan": "^1.10.0",
     "neo4j-driver": "^5.9.0",
     "node-fetch": "^2.6.7",

src/app.ts

@@ -1,17 +1,18 @@
+import compression from 'compression';
+import cors from 'cors';
 import express, { Application } from 'express';
+import session from 'express-session';
 import helmet from 'helmet';
-import compression from 'compression';
+import httpStatus from 'http-status';
 import passport from 'passport';
+
+import { bullBoardServerAdapter } from './bullmq';
+import config from './config';
+import morgan from './config/morgan';
 import { jwtStrategy } from './config/passport';
-import cors from 'cors';
-import httpStatus from 'http-status';
 import { error, sentry } from './middlewares';
-import { ApiError } from './utils';
 import routes from './routes/v1';
-import morgan from './config/morgan';
-import config from './config';
-import session from 'express-session';
-import { bullBoardServerAdapter } from './bullmq';
+import { ApiError } from './utils';
 
 const app: Application = express();
 

src/config/index.ts

@@ -13,6 +13,7 @@ const envVarsSchema = Joi.object()
     RABBIT_PORT: Joi.string().required().description('RabbitMQ port'),
     RABBIT_USER: Joi.string().required().description('RabbitMQ username'),
     RABBIT_PASSWORD: Joi.string().required().description('RabbitMQ password'),
+    TELEGRAM_BOT_TOKEN: Joi.string().required().description('Telegram bot token'),
     DISCORD_CLIENT_ID: Joi.string().required().description('Discord clinet id'),
     DISCORD_CLIENT_SECRET: Joi.string().required().description('Discord clinet secret'),
     DISCORD_BOT_TOKEN: Joi.string().required().description('Discord bot token'),
@@ -134,6 +135,9 @@ export default {
         connect: envVars.NOTION_CONNECT_CALLBACK_URI,
       },
     },
+    telegram: {
+      botToken: envVars.TELEGRAM_BOT_TOKEN,
+    },
   },
   jwt: {
     secret: envVars.JWT_SECRET,

src/controllers/auth.controller.ts

@@ -5,8 +5,8 @@ import querystring from 'querystring';
 import config from '../config';
 import logger from '../config/logger';
 import { discord, generateState } from '../config/oAtuh2';
-import { ISessionRequest } from '../interfaces';
-import { authService, discordServices, tokenService, userService } from '../services';
+import { ISessionRequest, TelegramCallbackParams } from '../interfaces';
+import { authService, discordServices, telegramService, tokenService } from '../services';
 import { catchAsync } from '../utils';
 
 const discordAuthorize = catchAsync(async function (req: ISessionRequest, res: Response) {
@@ -18,47 +18,41 @@ const discordAuthorize = catchAsync(async function (req: ISessionRequest, res: R
 });
 
 const discordAuthorizeCallback = catchAsync(async function (req: ISessionRequest, res: Response) {
-  const STATUS_CODE_SINGIN = 1001;
-  const STATUS_CODE_LOGIN = 1002;
-  const STATUS_CODE_ERROR = 1003;
-  const code = req.query.code as string;
-  const returnedState = req.query.state as string;
-  const storedState = req.session.state;
-  let statusCode = STATUS_CODE_LOGIN;
   try {
-    if (!code || !returnedState || returnedState !== storedState) {
-      throw new Error('Invalid code or state mismatch');
-    }
-    const discordOathCallback = await discordServices.coreService.exchangeCode(
+    const code = req.query.code as string;
+    const returnedState = req.query.state as string;
+    const storedState = req.session.state;
+    const redirectUrl = await discordServices.authService.handleOAuthCallback({
       code,
-      config.oAuth2.discord.callbackURI.authorize,
-    );
-    const discordUser = await discordServices.coreService.getUserFromDiscordAPI(discordOathCallback.access_token);
-    let user = await userService.getUserByFilter({ discordId: discordUser.id });
+      state: returnedState,
+      storedState,
+    });
 
-    if (!user) {
-      user = await userService.createUser({ discordId: discordUser.id });
-      statusCode = STATUS_CODE_SINGIN;
-    }
-    tokenService.saveDiscordOAuth2Tokens(user.id, discordOathCallback);
-    const tokens = await tokenService.generateAuthTokens(user);
+    res.redirect(redirectUrl);
+  } catch (err) {
+    logger.error({ err }, 'Failed to authorize Discord account');
     const params = {
-      statusCode: statusCode,
-      accessToken: tokens.access.token,
-      accessExp: tokens.access.expires.toString(),
-      refreshToken: tokens.refresh.token,
-      refreshExp: tokens.refresh.expires.toString(),
+      statusCode: 1003,
     };
     const query = querystring.stringify(params);
-    res.redirect(`${config.frontend.url}/callback?` + query);
+    res.redirect(`${config.frontend.url}/callback?${query}`);
+  }
+});
+
+const telegramAuthorizeCallback = catchAsync(async function (req: Request, res: Response) {
+  try {
+    const params: TelegramCallbackParams = req.query as unknown as TelegramCallbackParams;
+
+    const redirectUrl = await telegramService.authService.handleOAuthCallback(params);
+    res.redirect(redirectUrl);
   } catch (err) {
-    logger.error({ err }, 'Failed to authorize discord account');
+    logger.error({ err }, 'Failed to authorize Telegram account');
 
     const params = {
-      statusCode: STATUS_CODE_ERROR,
+      statusCode: 1003,
     };
     const query = querystring.stringify(params);
-    res.redirect(`${config.frontend.url}/callback?` + query);
+    res.redirect(`${config.frontend.url}/callback?${query}`);
   }
 });
 
@@ -78,10 +72,6 @@ const generateToken = catchAsync(async function (req: Request, res: Response) {
   res.send(token);
 });
 
-const telegramAuthorizeCallback = catchAsync(async function (req: Request, res: Response) {
-  console.log(req.body, req.query, req.params);
-  res.send('Hi');
-});
 export default {
   discordAuthorize,
   discordAuthorizeCallback,