Merge pull request #392 from torusresearch/feat/telegram-vue-example

feat: custom auth vue app
torusresearch · Feb 4, 2025 · 3717a38 · 3717a38
2 parents 917e8ba + 21ffcfb
commit 3717a38
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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, validateAndConstructUrl } from "../utils/helpers";
+import { broadcastChannelOptions, getTimeout, objectToAuthDataMap, validateAndConstructUrl } from "../utils/helpers";
 import log from "../utils/loglevel";
 import PopupHandler from "../utils/PopupHandler";
 import AbstractLoginHandler from "./AbstractLoginHandler";
@@ -60,13 +60,9 @@ export default class TelegramHandler extends AbstractLoginHandler {
     this.finalURL = finalUrl;
   }
 
-  objectToAuthDataMap(tgAuthenticationResult: string) {
-    return JSON.parse(atob(tgAuthenticationResult)) as { first_name: string; last_name: string; photo_url: string; username: string; id: number };
-  }
-
   async getUserInfo(params: LoginWindowResponse): Promise<TorusVerifierResponse> {
     const { idToken } = params;
-    const userInfo = this.objectToAuthDataMap(idToken);
+    const userInfo = objectToAuthDataMap(idToken);
     const { photo_url: profileImage = "", first_name = "", last_name = "", id } = userInfo;
     return {
       email: "", // Telegram does not provide email

diff --git a/src/login.ts b/src/login.ts
@@ -232,9 +232,9 @@ class CustomAuth {
       if (hash && queryParameters) {
         const { error, hashParameters, instanceParameters } = handleRedirectParameters(hash, queryParameters);
         if (error) throw new Error(error);
-        const { access_token: accessToken, id_token: idToken, ...rest } = hashParameters;
+        const { access_token: accessToken, id_token: idToken, tgAuthResult, ...rest } = hashParameters;
         // State has to be last here otherwise it will be overwritten
-        loginParams = { accessToken, idToken, ...rest, state: instanceParameters };
+        loginParams = { accessToken, idToken: idToken || tgAuthResult || "", ...rest, state: instanceParameters };
       } else {
         this.storageHelper.clearOrphanedLoginDetails();
         if (this.config.uxMode === UX_MODE.REDIRECT) {

diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
@@ -207,6 +207,10 @@ export const validateAndConstructUrl = (domain: string): URL => {
   }
 };
 
+export const objectToAuthDataMap = (tgAuthenticationResult: string) => {
+  return JSON.parse(atob(tgAuthenticationResult)) as { first_name: string; last_name: string; photo_url: string; username: string; id: number };
+};
+
 export function isMobileOrTablet(): boolean {
   const browser = Bowser.getParser(navigator.userAgent);
   const platform = browser.getPlatform();