From ec71a75c86dd9a0c96e7cc35037e6d67a9097ff3 Mon Sep 17 00:00:00 2001 From: Guru Date: Tue, 28 Jan 2025 09:20:04 +0530 Subject: [PATCH] fix: domain final url telegram --- examples/nextjs-app/pages/popupMode/login.tsx | 2 +- examples/nextjs-app/pages/redirectMode/login.tsx | 6 +++++- src/handlers/TelegramHandler.ts | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/examples/nextjs-app/pages/popupMode/login.tsx b/examples/nextjs-app/pages/popupMode/login.tsx index dbdc909..ecfddef 100644 --- a/examples/nextjs-app/pages/popupMode/login.tsx +++ b/examples/nextjs-app/pages/popupMode/login.tsx @@ -105,8 +105,8 @@ class MyApp extends React.Component { [LINE]: { domain: AUTH_DOMAIN }, [COGNITO]: { domain: COGNITO_AUTH_DOMAIN, identity_provider: "Google", response_type: "token", user_info_endpoint: "userInfo" }, [TELEGRAM]: { - domain: AUTH_DOMAIN, identity_provider: "Telegram", + domain: "https://oauth.tg.dev/auth", origin: "https://custom-auth-beta.vercel.app/serviceworker/redirect", }, [REDDIT]: { domain: AUTH_DOMAIN, connection: "Reddit", verifierIdField: "name", isVerifierIdCaseSensitive: false }, diff --git a/examples/nextjs-app/pages/redirectMode/login.tsx b/examples/nextjs-app/pages/redirectMode/login.tsx index 32919d0..42354c0 100644 --- a/examples/nextjs-app/pages/redirectMode/login.tsx +++ b/examples/nextjs-app/pages/redirectMode/login.tsx @@ -95,7 +95,11 @@ class RedirectMode extends React.Component { [WEIBO]: { domain: AUTH_DOMAIN }, [LINE]: { domain: AUTH_DOMAIN }, [COGNITO]: { domain: COGNITO_AUTH_DOMAIN, identity_provider: "Google", response_type: "token", user_info_endpoint: "userInfo" }, - [TELEGRAM]: { domain: AUTH_DOMAIN, identity_provider: "Telegram", origin: "https://custom-auth-beta.vercel.app/auth" }, + [TELEGRAM]: { + domain: "https://oauth.tg.dev/auth", + identity_provider: "Telegram", + origin: "https://custom-auth-beta.vercel.app/auth" + }, [REDDIT]: { domain: AUTH_DOMAIN, connection: "Reddit", verifierIdField: "name", isVerifierIdCaseSensitive: false }, }; }; diff --git a/src/handlers/TelegramHandler.ts b/src/handlers/TelegramHandler.ts index a24032f..9283bec 100644 --- a/src/handlers/TelegramHandler.ts +++ b/src/handlers/TelegramHandler.ts @@ -2,7 +2,7 @@ import base64url from "base64url"; import deepmerge from "deepmerge"; import { UX_MODE } from "../utils/enums"; -import { broadcastChannelOptions, getTimeout } from "../utils/helpers"; +import { broadcastChannelOptions, getTimeout, validateAndConstructUrl } from "../utils/helpers"; import log from "../utils/loglevel"; import PopupHandler from "../utils/PopupHandler"; import AbstractLoginHandler from "./AbstractLoginHandler"; @@ -35,7 +35,9 @@ export default class TelegramHandler extends AbstractLoginHandler { } setFinalUrl(): void { - const finalUrl = new URL("https://oauth.telegram.org/auth"); + const { domain } = this.params.jwtParams; + const finalUrl = validateAndConstructUrl(domain || "https://oauth.telegram.org/auth"); + const clonedParams = JSON.parse(JSON.stringify(this.params.jwtParams || {})); clonedParams.origin = `${this.params.redirect_uri}?state=${this.state}&nonce=${this.nonce}`;