Skip to content

πŸ“ˆ Open source, privacy-first web analytics β€” a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Fixed problem with unauthorized user

Yevhenii Kulisidi461e2d1c3d26
diff --git a/src/integrations/telegram/scene/settings.scene.ts b/src/integrations/telegram/scene/settings.scene.ts
index 849b9feaa..a7dc07f44 100644
--- a/src/integrations/telegram/scene/settings.scene.ts
+++ b/src/integrations/telegram/scene/settings.scene.ts
@@ -1,5 +1,6 @@
import { Ctx, Hears, Scene, SceneEnter } from 'nestjs-telegraf'
import { Markup } from 'telegraf'
+import { UserService } from 'src/user/user.service'
import { Context } from '../interface/context.interface'
import { UNLINK_ACCOUNT_SCENE_ID } from './unlink-account.scene'
import { START_SCENE_ID } from './start.scene'
@@ -7,8 +8,17 @@ import { START_SCENE_ID } from './start.scene'
export const SETTINGS_SCENE_ID = 'settings'
@Scene(SETTINGS_SCENE_ID)
export class SettingsScene {
+ constructor(private readonly userService: UserService) {}
+
@SceneEnter()
async onSceneEnter(@Ctx() context: Context) {
+ const user = await this.userService.getUserByTelegramId(context.from.id)
+
+ if (!user) {
+ await context.scene.enter(START_SCENE_ID)
+ return
+ }
+
await context.reply(
'Settings',
Markup.keyboard(['πŸ”“ Unlink account', 'πŸ”™ Back']).oneTime().resize(),
@@ -17,11 +27,25 @@ export class SettingsScene {
@Hears('πŸ”“ Unlink account')
async onUnlinkAccount(@Ctx() context: Context) {
+ const user = await this.userService.getUserByTelegramId(context.from.id)
+
+ if (!user) {
+ await context.scene.enter(START_SCENE_ID)
+ return
+ }
+
await context.scene.enter(UNLINK_ACCOUNT_SCENE_ID)
}
@Hears('πŸ”™ Back')
async onBack(@Ctx() context: Context) {
+ const user = await this.userService.getUserByTelegramId(context.from.id)
+
+ if (!user) {
+ await context.scene.enter(START_SCENE_ID)
+ return
+ }
+
await context.scene.enter(START_SCENE_ID)
}
}
diff --git a/src/integrations/telegram/scene/start.scene.ts b/src/integrations/telegram/scene/start.scene.ts
index 0385b85a1..75c582197 100644
--- a/src/integrations/telegram/scene/start.scene.ts
+++ b/src/integrations/telegram/scene/start.scene.ts
@@ -1,4 +1,5 @@
import { Ctx, Hears, Scene, SceneEnter } from 'nestjs-telegraf'
+import { UserService } from 'src/user/user.service'
import { Context } from '../interface/context.interface'
import { PROJECTS_SCENE_ID } from './projects.scene'
import { SETTINGS_SCENE_ID } from './settings.scene'
@@ -7,7 +8,10 @@ import { TelegramService } from '../telegram.service'
export const START_SCENE_ID = 'start'
@Scene(START_SCENE_ID)
export class StartScene {
- constructor(private readonly telegramService: TelegramService) {}
+ constructor(
+ private readonly telegramService: TelegramService,
+ private readonly userService: UserService,
+ ) {}
@SceneEnter()
async onSceneEnter(@Ctx() context: Context) {
@@ -19,11 +23,15 @@ export class StartScene {
@Hears('πŸ“‚ Projects')
async onProjects(@Ctx() context: Context) {
+ const user = await this.userService.getUserByTelegramId(context.from.id)
+ if (!user) return
await context.scene.enter(PROJECTS_SCENE_ID)
}
@Hears('βš™οΈ Settings')
async onSettings(@Ctx() context: Context) {
+ const user = await this.userService.getUserByTelegramId(context.from.id)
+ if (!user) return
await context.scene.enter(SETTINGS_SCENE_ID)
}
}
diff --git a/src/integrations/telegram/scene/unlink-account.scene.ts b/src/integrations/telegram/scene/unlink-account.scene.ts
index f81e5fec5..e4ccb3dc8 100644
--- a/src/integrations/telegram/scene/unlink-account.scene.ts
+++ b/src/integrations/telegram/scene/unlink-account.scene.ts
@@ -1,5 +1,6 @@
import { Ctx, Hears, Scene, SceneEnter } from 'nestjs-telegraf'
import { Markup } from 'telegraf'
+import { UserService } from 'src/user/user.service'
import { Context } from '../interface/context.interface'
import { START_SCENE_ID } from './start.scene'
import { TelegramService } from '../telegram.service'
@@ -7,10 +8,20 @@ import { TelegramService } from '../telegram.service'
export const UNLINK_ACCOUNT_SCENE_ID = 'unlink-account'
@Scene(UNLINK_ACCOUNT_SCENE_ID)
export class UnlinkAccountScene {
- constructor(private readonly telegramService: TelegramService) {}
+ constructor(
+ private readonly telegramService: TelegramService,
+ private readonly userService: UserService,
+ ) {}
@SceneEnter()
async onSceneEnter(@Ctx() context: Context) {
+ const user = await this.userService.getUserByTelegramId(context.from.id)
+
+ if (!user) {
+ await context.scene.enter(START_SCENE_ID)
+ return
+ }
+
await context.reply(
'Are you sure you want to unlink your account?',
Markup.keyboard([['βœ… Yes', '❌ No']])
@@ -21,6 +32,13 @@ export class UnlinkAccountScene {
@Hears('βœ… Yes')
async onYes(@Ctx() context: Context) {
+ const user = await this.userService.getUserByTelegramId(context.from.id)
+
+ if (!user) {
+ await context.scene.enter(START_SCENE_ID)
+ return
+ }
+
await this.telegramService.confirmUnlinkAccount(context.from.id)
await context.reply('Your account has been unlinked successfully.')
await context.scene.enter(START_SCENE_ID)
@@ -28,6 +46,13 @@ export class UnlinkAccountScene {
@Hears('❌ No')
async onNo(@Ctx() context: Context) {
+ const user = await this.userService.getUserByTelegramId(context.from.id)
+
+ if (!user) {
+ await context.scene.enter(START_SCENE_ID)
+ return
+ }
+
await context.reply('Your account has not been unlinked.')
await context.scene.enter(START_SCENE_ID)
}