fix: add callback to auth

oxen-io · Jul 4, 2024 · 38137ef · 38137ef
1 parent cfa8d9d
commit 38137ef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/apps/staking/.env.local.template b/apps/staking/.env.local.template
@@ -4,4 +4,5 @@ FAUCET_WALLET_PRIVATE_KEY=
 NEXT_PUBLIC_ENV_FLAG= pick from dev, qa, stg, prd
 DISCORD_CLIENT_ID=
 DISCORD_CLIENT_SECRET=
-TELEGRAM_BOT_TOKEN=
+TELEGRAM_BOT_TOKEN=
+NEXTAUTH_SECRET=
diff --git a/packages/auth/components/DiscordAuthButton.tsx b/packages/auth/components/DiscordAuthButton.tsx
@@ -21,7 +21,7 @@ export const DiscordAuthButton = forwardRef<HTMLButtonElement, DiscordAuthButton
 
     const handleClick = () => {
       if (!isConnected) {
-        signIn('discord');
+        signIn('discord', { callbackUrl: window.location.href });
       } else {
         signOut();
       }

diff --git a/packages/auth/components/TelegramAuthButton.tsx b/packages/auth/components/TelegramAuthButton.tsx
@@ -1,8 +1,11 @@
 'use client';
 
+import { Button } from '@session/ui/ui/button';
 import { LoginButton } from '@telegram-auth/react';
 import { forwardRef } from 'react';
+import { TelegramIcon } from '../icons/TelegramIcon';
 import { signIn, signOut, useSession } from '../lib/client';
+import { ButtonDataTestId } from '../testing/data-test-ids';
 
 type TelegramAuthButtonProps = React.ButtonHTMLAttributes<HTMLButtonElement> & {
   csrfToken: string;
@@ -13,12 +16,14 @@ export const TelegramAuthButton = forwardRef<HTMLButtonElement, TelegramAuthButt
     const { data, status } = useSession();
 
     const isConnected = status === 'authenticated';
+    const username = data?.user?.name;
 
     console.log(data);
 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const handleClick = (data: any) => {
       if (!isConnected) {
-        signIn('telegram', { callbackUrl: '/faucet' }, data);
+        signIn('telegram', { callbackUrl: window.location.href }, data);
       } else {
         signOut();
       }
@@ -27,19 +32,19 @@ export const TelegramAuthButton = forwardRef<HTMLButtonElement, TelegramAuthButt
     return (
       <>
         <input name="csrfToken" type="hidden" defaultValue={csrfToken} />
-        <LoginButton botUsername="session_testnet_bot" onAuthCallback={handleClick} />
+        <div className="hidden">
+          <LoginButton botUsername="session_testnet_bot" />
+        </div>
+        <Button
+          onClick={handleClick}
+          data-testid={ButtonDataTestId.TELEGRAM_AUTH}
+          ref={ref}
+          {...props}
+        >
+          <TelegramIcon className="h-4 w-4" />
+          {isConnected ? username ?? 'Connected' : 'Connect Telegram'}
+        </Button>
       </>
     );
   }
 );
-{
-  /* <Button
-        onClick={handleClick}
-        data-testid={ButtonDataTestId.DISCORD_AUTH}
-        ref={ref}
-        {...props}
-      >
-        <TelegramIcon className="h-4 w-4" />
-        {isConnected ? username ?? 'Connected' : 'Connect Discord'}
-      </Button> */
-}