@opexa/portal-components 0.1.66 → 0.1.70

package/dist/client/hooks/useSessionQuery.js

@@ -1,8 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
-import { FINGERPRINT_HEADER_KEY } from '../../constants/index.js';
 import { getSessionQueryKey } from '../../utils/queryKeys.js';
 import { getSession } from '../services/getSession.js';
-import { getFingerprint } from './useSignInMutation.js';
 export const useSessionQuery = (config) => {
     return useQuery({
         gcTime: 1000 * 2,
@@ -10,15 +8,7 @@ export const useSessionQuery = (config) => {
         ...config,
         queryKey: getSessionQueryKey(),
         queryFn: async ({ signal }) => {
-            const fingerprint = await getFingerprint();
-            return await getSession({
-                signal,
-                headers: {
-                    ...(fingerprint && {
-                        [FINGERPRINT_HEADER_KEY]: fingerprint,
-                    }),
-                },
-            });
+            return await getSession({ signal });
         },
     });
 };

package/dist/client/hooks/useSignInMutation.d.ts

@@ -8,4 +8,3 @@ export interface UseSignInMutationOptions extends MutationConfig<Authenticator |
     version?: ApiVersion;
 }
 export declare const useSignInMutation: (options?: UseSignInMutationOptions) => UseMutationResult<Authenticator | null, Error, SignInInput>;
-export declare function getFingerprint(): Promise<string | null>;

package/dist/client/hooks/useSignInMutation.js

@@ -1,6 +1,5 @@
 import { Capacitor } from '@capacitor/core';
 import { useMutation } from '@tanstack/react-query';
-import { Thumbmark } from '@thumbmarkjs/thumbmarkjs';
 import { FINGERPRINT_HEADER_KEY, GOOGLE_FRAUD_DEFENSE_HEADER_KEY, RECAPTCHA_HEADER_KEY, } from '../../constants/index.js';
 import { createPoll } from '../../utils/createPoll.js';
 import { getQueryClient } from '../../utils/getQueryClient.js';
@@ -8,6 +7,7 @@ import { getSignInMutationKey } from '../../utils/mutationKeys.js';
 import { getSessionQueryKey } from '../../utils/queryKeys.js';
 import { getSession } from '../services/getSession.js';
 import { signIn } from '../services/signIn.js';
+import { getFingerprint } from '../utils/fingerprint.js';
 import { useFeatureFlag } from './useFeatureFlag.js';
 import { useRecaptcha } from './useRecaptcha.js';
 export const useSignInMutation = (options) => {
@@ -87,26 +87,3 @@ async function pollSignIn(signInOnce) {
     }
     return result.authenticator;
 }
-let thumbmark_instance;
-export async function getFingerprint() {
-    if (typeof window === 'undefined')
-        return null;
-    if (!thumbmark_instance) {
-        thumbmark_instance = new Thumbmark({
-            logging: false,
-            timeout: 30000,
-            cache_lifetime_in_ms: 1 * 60 * 60 * 1000 /* 1h */,
-        });
-    }
-    try {
-        const cached = sessionStorage.getItem('fingerprint');
-        if (cached)
-            return cached;
-        const result = await thumbmark_instance.get();
-        sessionStorage.setItem('fingerprint', result.thumbmark);
-        return result.thumbmark;
-    }
-    catch {
-        return null;
-    }
-}

package/dist/client/services/getSession.js

@@ -1,6 +1,16 @@
 import { cache } from 'react';
+import { FINGERPRINT_HEADER_KEY } from '../../constants/index.js';
 import { httpRequest, } from '../../services/httpRequest.js';
+import { getFingerprint } from '../utils/fingerprint.js';
 export const getSession = cache(async (options) => {
-    const res = await httpRequest.json('/api/sessions', options);
+    const fingerprint = await getFingerprint();
+    const headers = new Headers(options?.headers);
+    if (fingerprint) {
+        headers.set(FINGERPRINT_HEADER_KEY, fingerprint);
+    }
+    const res = await httpRequest.json('/api/sessions', {
+        ...options,
+        headers,
+    });
     return res.ok ? res.data : { status: 'unauthenticated' };
 });

package/dist/client/utils/fingerprint.d.ts

@@ -0,0 +1 @@
+export declare function getFingerprint(): Promise<string | null>;

package/dist/client/utils/fingerprint.js

@@ -0,0 +1,24 @@
+import { Thumbmark } from '@thumbmarkjs/thumbmarkjs';
+let thumbmark_instance;
+export async function getFingerprint() {
+    if (typeof window === 'undefined')
+        return null;
+    if (!thumbmark_instance) {
+        thumbmark_instance = new Thumbmark({
+            logging: false,
+            timeout: 30000,
+            cache_lifetime_in_ms: 1 * 60 * 60 * 1000 /* 1h */,
+        });
+    }
+    try {
+        const cached = sessionStorage.getItem('fingerprint');
+        if (cached)
+            return cached;
+        const result = await thumbmark_instance.get();
+        sessionStorage.setItem('fingerprint', result.thumbmark);
+        return result.thumbmark;
+    }
+    catch {
+        return null;
+    }
+}

package/dist/components/DepositWithdrawal/Deposit/OnlineBankDeposit/OnlineBankDepositContext.d.ts

@@ -1,6 +1,6 @@
 export declare const OnlineBankDepositContext: (props: {
     value: {
-        view: "form" | "vca";
+        view: "vca" | "form";
         status: "waiting" | "failed" | "processing" | "verification-waiting" | "verification-processing" | "verification-failed" | "verification-success";
         verify: () => void;
         reset: () => void;
@@ -13,7 +13,7 @@ export declare const OnlineBankDepositContext: (props: {
 } & {
     children?: import("react").ReactNode | undefined;
 }) => React.ReactNode, useOnlineBankDepositContext: () => {
-    view: "form" | "vca";
+    view: "vca" | "form";
     status: "waiting" | "failed" | "processing" | "verification-waiting" | "verification-processing" | "verification-failed" | "verification-success";
     verify: () => void;
     reset: () => void;

package/dist/components/DepositWithdrawal/Deposit/OnlineBankDeposit/useOnlineBankDeposit.d.ts

@@ -1,7 +1,7 @@
 import type { Deposit } from '../../../../types';
 export type UseOnlineBankDepositReturn = ReturnType<typeof useOnlineBankDeposit>;
 export declare function useOnlineBankDeposit(): {
-    view: "form" | "vca";
+    view: "vca" | "form";
     status: "waiting" | "failed" | "processing" | "verification-waiting" | "verification-processing" | "verification-failed" | "verification-success";
     verify: () => void;
     reset: () => void;

package/dist/components/PortalProvider/SessionWatcher.js

@@ -1,5 +1,7 @@
 'use client';
+import { App } from '@capacitor/app';
 import { useRouter } from 'next/navigation';
+import { useEffect, useRef } from 'react';
 import { useTimeout } from 'usehooks-ts';
 import { useShallow } from 'zustand/shallow';
 import { useGlobalStore } from '../../client/hooks/useGlobalStore.js';
@@ -7,13 +9,54 @@ import { useSessionHealthQuery } from '../../client/hooks/useSessionHealthQuery.
 import { useSessionQuery } from '../../client/hooks/useSessionQuery.js';
 import { useSignOutMutation } from '../../client/hooks/useSignOutMutation.js';
 import { toaster } from '../../client/utils/toaster.js';
+const SESSION_WATCH_INTERVAL = 30_000;
 export function SessionWatcher() {
     const router = useRouter();
     const sessionQuery = useSessionQuery();
+    const isAuthenticated = sessionQuery.data?.status === 'authenticated';
+    const isAuthenticatedRef = useRef(isAuthenticated);
+    isAuthenticatedRef.current = isAuthenticated;
     const sessionHealthQuery = useSessionHealthQuery({
-        enabled: sessionQuery.data?.status === 'authenticated',
-        refetchInterval: 1000 * 5,
+        enabled: false,
     });
+    const refetchSessionHealthRef = useRef(sessionHealthQuery.refetch);
+    refetchSessionHealthRef.current = sessionHealthQuery.refetch;
+    useEffect(() => {
+        let counter = 0;
+        let timeout = null;
+        let isForeground = true;
+        let stopped = false;
+        const listener = App.addListener('appStateChange', ({ isActive }) => {
+            isForeground = isActive;
+        });
+        const assignTimeout = () => {
+            const duration = counter <= 0 ? SESSION_WATCH_INTERVAL * 1.5 : SESSION_WATCH_INTERVAL;
+            return setTimeout(async () => {
+                if (isForeground && isAuthenticatedRef.current) {
+                    try {
+                        await refetchSessionHealthRef.current();
+                    }
+                    catch {
+                        // A failed check must not stop future session checks.
+                    }
+                    if (stopped) {
+                        return;
+                    }
+                }
+                counter += 1;
+                timeout = assignTimeout();
+            }, duration);
+        };
+        timeout = assignTimeout();
+        return () => {
+            stopped = true;
+            if (timeout) {
+                clearTimeout(timeout);
+                timeout = null;
+            }
+            void listener.then((handle) => handle.remove()).catch(() => undefined);
+        };
+    }, []);
     const { gameLaunch, reset } = useGlobalStore(useShallow((ctx) => ({
         gameLaunch: ctx.gameLaunch,
         reset: ctx.reset,

package/dist/handlers/deleteSession.js

@@ -5,8 +5,10 @@ export async function deleteSession(request) {
     const accessToken = request.cookies.get(ACCESS_TOKEN_COOKIE_NAME)?.value;
     const authConfig = JSON.parse(request.cookies.get(AUTH_CONFIG_COOKIE_NAME)?.value ?? '{}');
     const authApiBaseUrl = authConfig.apiBaseUrl;
+    console.log('\n');
     console.log('[DESTROY SESSION]');
     console.log({ authApiBaseUrl });
+    console.log('\n');
     if (accessToken) {
         await destroySession({
             headers: {

package/dist/handlers/getSession.js

@@ -8,12 +8,15 @@ export async function getSession(request) {
     const authVersion = authConfig.version;
     const authApiBaseUrl = authConfig.apiBaseUrl;
     const fingerprint = request.headers.get(FINGERPRINT_HEADER_KEY);
+    console.log('\n');
     console.log('[GET SESSION]');
     console.log({
         authVersion,
         authApiBaseUrl,
         fingerprint,
+        accessToken,
     });
+    console.log('\n');
     let isAccessTokenValid = true;
     if (accessToken && authVersion !== 4) {
         try {
@@ -33,7 +36,18 @@ export async function getSession(request) {
     const refreshToken = request.cookies.get(REFRESH_TOKEN_COOKIE_NAME)?.value;
     const domain = request.cookies.get(DOMAIN_COOKIE_NAME)?.value;
     const btag = request.cookies.get(BTAG_COOKIE_NAME)?.value;
-    if (!refreshToken || !isAccessTokenValid) {
+    console.log('\n');
+    console.log({
+        refreshToken,
+        isAccessTokenValid,
+    });
+    console.log('\n');
+    if (!refreshToken) {
+        console.log('\n');
+        console.log("No 'refreshToken'");
+        console.log('\n');
+    }
+    if (!refreshToken && !isAccessTokenValid) {
         const response = NextResponse.json({
             ok: true,
             data: {
@@ -53,6 +67,16 @@ export async function getSession(request) {
                 .get('x-forwarded-for')
                 ?.split(',')
                 .at(0);
+            console.log('\n');
+            console.log('[REFRESH SESSION]');
+            console.log('Refreshing session...');
+            console.log({
+                refreshToken,
+                authVersion,
+                authApiBaseUrl,
+                fingerprint,
+            });
+            console.log('\n');
             const data = await refreshSession({
                 headers: {
                     Authorization: `Bearer ${refreshToken}`,
@@ -64,21 +88,26 @@ export async function getSession(request) {
                     }),
                 },
             }, authVersion, authApiBaseUrl);
+            console.log({ data });
             const response = NextResponse.json({
                 ok: true,
                 data: {
                     status: 'authenticated',
                     domain,
-                    token: data.accessToken,
+                    token: authVersion === 4
+                        ? data.data.accessToken
+                        : data.accessToken,
                 },
             });
-            response.cookies.set(ACCESS_TOKEN_COOKIE_NAME, data.accessToken, {
-                expires: addMinutes(new Date(), 9),
+            response.cookies.set(ACCESS_TOKEN_COOKIE_NAME, authVersion === 4 ? data.data.accessToken : data.accessToken, {
+                expires: addMinutes(new Date(), authVersion === 4 ? 4 : 9),
                 httpOnly: true,
                 sameSite: 'strict',
             });
             if (authVersion === 4) {
-                response.cookies.set(REFRESH_TOKEN_COOKIE_NAME, data.refreshToken, {
+                response.cookies.set(REFRESH_TOKEN_COOKIE_NAME, authVersion === 4
+                    ? data.data.refreshToken
+                    : data.refreshToken, {
                     expires: subMinutes(addDays(new Date(), 15), 2),
                     httpOnly: true,
                     sameSite: 'strict',
@@ -86,7 +115,12 @@ export async function getSession(request) {
             }
             return response;
         }
-        catch {
+        catch (e) {
+            console.log('\n');
+            console.log('[REFRESH SESSION]');
+            console.log('Failed to refresh session');
+            console.log(e);
+            console.log('\n');
             const response = NextResponse.json({
                 ok: true,
                 data: {

package/dist/handlers/postSession.js

@@ -47,6 +47,7 @@ export async function postSession(request) {
     const authApiBaseUrl = request.headers.get(AUTH_API_BASE_URL_HEADER_KEY);
     const version = request.headers.get(API_VERSION_HEADER_KEY) === '4' ? 4 : 1;
     const isWeb = request.headers.get(PLATFORM_WEB_HEADER_KEY) === 'true';
+    console.log('\n');
     console.log('[CREATE SESSION]');
     console.log({
         versionSession,
@@ -55,6 +56,7 @@ export async function postSession(request) {
         fingerprint,
         isWeb,
     });
+    console.log('\n');
     try {
         const googleFraudDefense = request.headers.get(GOOGLE_FRAUD_DEFENSE_HEADER_KEY);
         const recaptchaToken = googleFraudDefense ?? recaptcha;
@@ -86,6 +88,10 @@ export async function postSession(request) {
             });
         }
         const response = NextResponse.json({ ok: true, data: null }, { status: 201 });
+        console.log('\n');
+        console.log('[CREATE SESSION]');
+        console.log(res);
+        console.log('\n');
         response.cookies.set(ACCESS_TOKEN_COOKIE_NAME, res.accessToken, {
             expires: addMinutes(new Date(), version === 4 ? 4 : 9),
             httpOnly: true,

package/dist/services/auth.js

@@ -143,16 +143,26 @@ export async function authenticate(input, options) {
     throw new Error("Invalid input 'type'");
 }
 export async function refreshSession(options, version = 1, authApiBaseUrl) {
-    const url = authApiBaseUrl || AUTH_ENDPOINT;
-    try {
-        return await httpRequest.json(version !== 1
+    let url = '';
+    url = authApiBaseUrl || AUTH_ENDPOINT;
+    url =
+        version !== 1
             ? `${url}/v${version}/session/refresh`
-            : `${url}/session:refresh`, {
+            : `${url}/session:refresh`;
+    console.log('\n');
+    console.log('[REFRESH SESSION]');
+    console.log({ url });
+    console.log('\n');
+    try {
+        return await httpRequest.json(url, {
             ...options,
             method: 'POST',
         });
     }
     catch (e) {
+        console.log('[REFRESH SESSION]');
+        console.log('Failed to refresh session');
+        console.log(e);
         if (e instanceof Error) {
             throw e;
         }
@@ -166,9 +176,15 @@ export async function refreshSession(options, version = 1, authApiBaseUrl) {
     }
 }
 export async function destroySession(options, authApiBaseUrl) {
-    const url = authApiBaseUrl || AUTH_ENDPOINT;
+    let url = '';
+    url = authApiBaseUrl || AUTH_ENDPOINT;
+    url = `${url}/session`;
+    console.log('\n');
+    console.log('[DESTROY SESSION]');
+    console.log({ url });
+    console.log('\n');
     try {
-        await httpRequest(`${url}/session`, {
+        await httpRequest(url, {
             ...options,
             method: 'DELETE',
         });
@@ -180,9 +196,18 @@ export async function destroySession(options, authApiBaseUrl) {
 export async function getSessionHealth(options) {
     try {
         const res = await fetch(`${AUTH_ENDPOINT}/session`, options);
+        if (!res.ok) {
+            console.log('\n');
+            console.log('[SESSION]');
+            console.log("'/session' failed");
+            console.log('\n');
+        }
         return res.ok;
     }
     catch {
+        console.log('\n');
+        console.log("unknown error in '/session'");
+        console.log('\n');
         /* Network errors should not be logged out */
         return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opexa/portal-components",
-  "version": "0.1.66",
+  "version": "0.1.70",
   "exports": {
     "./ui/*": {
       "types": "./dist/ui/*/index.d.ts",