@hfunlabs/hypurr-connect 0.1.25 → 0.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hfunlabs/hypurr-connect",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "type": "module",
   "packageManager": "pnpm@10.10.0",
   "main": "./dist/index.js",

package/src/HypurrConnectProvider.tsx

@@ -63,7 +63,8 @@ const TELEGRAM_STORAGE_KEY = "hypurr-connect-tg-jwt";
 const LEGACY_TELEGRAM_STORAGE_KEY = "hypurr-connect-tg-user";
 const TELEGRAM_AUTH_STATE_KEY = "hypurr-connect-auth-state";
 const TELEGRAM_AUTH_CODE_VERIFIER_PREFIX = "hypurr-connect-auth-code-verifier:";
-const TELEGRAM_AUTH_RETURN_TO_PREFIX = "hypurr-connect-auth-return-to:";
+const TELEGRAM_AUTH_REDIRECT_URI_PREFIX =
+  "hypurr-connect-auth-redirect-uri:";
 const TELEGRAM_AUTH_MESSAGE = "hypurr-connect:telegram-auth";
 const DEFAULT_AUTH_HUB_URL = "https://auth.hypurr.fun/login";
 const DEFAULT_MEDIA_URL = "https://media.hypurr.fun";
@@ -240,7 +241,7 @@ function withExpectedFrom(
   return transaction.from ? transaction : { ...transaction, from: address };
 }
 
-function currentReturnTo(): string {
+function currentRedirectUri(): string {
   const url = new URL(window.location.href);
   for (const param of [
     "code",
@@ -326,52 +327,52 @@ function codeVerifierStorageKey(state: string): string {
   return `${TELEGRAM_AUTH_CODE_VERIFIER_PREFIX}${state}`;
 }
 
-function returnToStorageKey(state: string): string {
-  return `${TELEGRAM_AUTH_RETURN_TO_PREFIX}${state}`;
+function redirectUriStorageKey(state: string): string {
+  return `${TELEGRAM_AUTH_REDIRECT_URI_PREFIX}${state}`;
 }
 
 function storeTelegramAuthSession(
   state: string,
   codeVerifier: string,
-  returnTo: string,
+  redirectUri: string,
 ): void {
   const previousState = sessionStorage.getItem(TELEGRAM_AUTH_STATE_KEY);
   if (previousState) {
     sessionStorage.removeItem(codeVerifierStorageKey(previousState));
-    sessionStorage.removeItem(returnToStorageKey(previousState));
+    sessionStorage.removeItem(redirectUriStorageKey(previousState));
   }
   sessionStorage.setItem(TELEGRAM_AUTH_STATE_KEY, state);
   sessionStorage.setItem(codeVerifierStorageKey(state), codeVerifier);
-  sessionStorage.setItem(returnToStorageKey(state), returnTo);
+  sessionStorage.setItem(redirectUriStorageKey(state), redirectUri);
 }
 
 function clearTelegramAuthSession(state: string): void {
   sessionStorage.removeItem(TELEGRAM_AUTH_STATE_KEY);
   sessionStorage.removeItem(codeVerifierStorageKey(state));
-  sessionStorage.removeItem(returnToStorageKey(state));
+  sessionStorage.removeItem(redirectUriStorageKey(state));
 }
 
 function takeTelegramAuthSession(state: string): {
   codeVerifier: string | null;
-  returnTo: string | null;
+  redirectUri: string | null;
 } | null {
   const expectedState = sessionStorage.getItem(TELEGRAM_AUTH_STATE_KEY);
   sessionStorage.removeItem(TELEGRAM_AUTH_STATE_KEY);
   if (!expectedState || state !== expectedState) {
     if (expectedState) {
       sessionStorage.removeItem(codeVerifierStorageKey(expectedState));
-      sessionStorage.removeItem(returnToStorageKey(expectedState));
+      sessionStorage.removeItem(redirectUriStorageKey(expectedState));
     }
     return null;
   }
 
   const codeVerifierKey = codeVerifierStorageKey(state);
-  const returnToKey = returnToStorageKey(state);
+  const redirectUriKey = redirectUriStorageKey(state);
   const codeVerifier = sessionStorage.getItem(codeVerifierKey);
-  const returnTo = sessionStorage.getItem(returnToKey);
+  const redirectUri = sessionStorage.getItem(redirectUriKey);
   sessionStorage.removeItem(codeVerifierKey);
-  sessionStorage.removeItem(returnToKey);
-  return { codeVerifier, returnTo };
+  sessionStorage.removeItem(redirectUriKey);
+  return { codeVerifier, redirectUri };
 }
 
 function fallbackAuthTokenUrl(authHubUrl?: string): string {
@@ -454,20 +455,20 @@ async function exchangeTelegramAuthCode({
   clientId,
   code,
   codeVerifier,
-  returnTo,
+  redirectUri,
 }: {
   authHubUrl?: string;
   clientId: string;
   code: string;
   codeVerifier: string;
-  returnTo: string;
+  redirectUri: string;
 }): Promise<string> {
   const body = new URLSearchParams({
     client_id: clientId,
     code,
     code_verifier: codeVerifier,
     grant_type: "authorization_code",
-    return_to: returnTo,
+    redirect_uri: redirectUri,
   });
 
   const response = await fetch(await resolveAuthTokenUrl(authHubUrl), {
@@ -639,7 +640,7 @@ export function HypurrConnectProvider({
           clientId: normalizeClientId(config.clientId),
           code: callback.code,
           codeVerifier: authSession.codeVerifier,
-          returnTo: authSession.returnTo || currentReturnTo(),
+          redirectUri: authSession.redirectUri || currentRedirectUri(),
         })
           .then(acceptTelegramToken)
           .catch((err) =>
@@ -1642,12 +1643,12 @@ export function HypurrConnectProvider({
     const state = randomState();
     const codeVerifier = randomCodeVerifier();
 
-    const configuredReturnTo = config.telegram?.returnTo;
-    const returnTo =
-      typeof configuredReturnTo === "function"
-        ? configuredReturnTo()
-        : configuredReturnTo || currentReturnTo();
-    storeTelegramAuthSession(state, codeVerifier, returnTo);
+    const configuredRedirectUri = config.telegram?.redirectUri;
+    const redirectUri =
+      typeof configuredRedirectUri === "function"
+        ? configuredRedirectUri()
+        : configuredRedirectUri || currentRedirectUri();
+    storeTelegramAuthSession(state, codeVerifier, redirectUri);
 
     const width = 520;
     const height = 720;
@@ -1675,7 +1676,8 @@ export function HypurrConnectProvider({
           "client_id",
           normalizeClientId(config.clientId),
         );
-        authUrl.searchParams.set("return_to", returnTo);
+        authUrl.searchParams.set("redirect_uri", redirectUri);
+        authUrl.searchParams.set("return_to", redirectUri);
         authUrl.searchParams.set("state", state);
         authUrl.searchParams.set(
           "scope",
@@ -1703,7 +1705,7 @@ export function HypurrConnectProvider({
   }, [
     config.clientId,
     config.telegram?.authHubUrl,
-    config.telegram?.returnTo,
+    config.telegram?.redirectUri,
     config.telegram?.scope,
   ]);
 

package/src/types.ts

@@ -33,8 +33,8 @@ export interface HypurrConnectConfig {
   telegram?: {
     /** Auth hub login URL. Defaults to https://auth.hypurr.fun/login. */
     authHubUrl?: string;
-    /** Optional callback URL. Defaults to the current page without auth query params. */
-    returnTo?: string | (() => string);
+    /** Optional OAuth redirect URI. Defaults to the current page without auth query params. */
+    redirectUri?: string | (() => string);
     /** Requested hub scopes. Defaults to the scopes required by this SDK. */
     scope?: string | string[];
     /** @deprecated Telegram login is handled by the auth hub; this option is ignored. */