@opexa/portal-components 0.1.65 → 0.1.69

package/dist/client/hooks/useSessionQuery.js

@@ -1,6 +1,8 @@
 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,
@@ -8,7 +10,15 @@ export const useSessionQuery = (config) => {
         ...config,
         queryKey: getSessionQueryKey(),
         queryFn: async ({ signal }) => {
-            return await getSession({ signal });
+            const fingerprint = await getFingerprint();
+            return await getSession({
+                signal,
+                headers: {
+                    ...(fingerprint && {
+                        [FINGERPRINT_HEADER_KEY]: fingerprint,
+                    }),
+                },
+            });
         },
     });
 };

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

@@ -8,3 +8,4 @@ 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

@@ -88,7 +88,7 @@ async function pollSignIn(signInOnce) {
     return result.authenticator;
 }
 let thumbmark_instance;
-async function getFingerprint() {
+export async function getFingerprint() {
     if (typeof window === 'undefined')
         return null;
     if (!thumbmark_instance) {

package/dist/components/KYC/KYCReminder.lazy.js

@@ -11,7 +11,6 @@ import { useGlobalStore } from '../../client/hooks/useGlobalStore.js';
 import { useSessionQuery } from '../../client/hooks/useSessionQuery.js';
 import { useSignOutMutation } from '../../client/hooks/useSignOutMutation.js';
 import { getSession } from '../../client/services/getSession.js';
-import { clearLocalStorageOnLogout } from '../../utils/clear-local-storage-on-logout.js';
 import { FileCheck02Icon } from '../../icons/FileCheck02Icon.js';
 import { XIcon } from '../../icons/XIcon.js';
 import pagcorLogo from '../../images/pagcor.png';
@@ -20,6 +19,7 @@ import { unregisterFCMDevice } from '../../services/trigger.js';
 import { Button } from '../../ui/Button/index.js';
 import { Dialog } from '../../ui/Dialog/index.js';
 import { Portal } from '../../ui/Portal/index.js';
+import { clearLocalStorageOnLogout } from '../../utils/clear-local-storage-on-logout.js';
 import { getQueryClient } from '../../utils/getQueryClient.js';
 import { getSessionQueryKey } from '../../utils/queryKeys.js';
 export function KYCReminder({ enablePendingKycReminder = false, ...props }) {

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/components/SignIn/SignIn.lazy.d.ts

@@ -29,7 +29,8 @@ export interface SignInProps extends UseSignInProps {
     /**
      * Selects which auth session endpoint the sign-in flow targets.
      * - `default` (default): `${AUTH_ENDPOINT}/sessions`
-     * - `Inplay`: `${AUTH_ENDPOINT}/v3/inplay/sessions`
+     * - `Inplay`: `${AUTH_ENDPOINT}/v3/inplay/sessions`, or `/v4/inplay/sessions`
+     *   when `version` is `4`
      */
     versionSession?: VersionSession;
     /**

package/dist/constants/StorageKey.d.ts

@@ -1,3 +1,4 @@
+export declare const AUTH_CONFIG_COOKIE_NAME: string;
 export declare const ACCESS_TOKEN_COOKIE_NAME: string;
 export declare const REFRESH_TOKEN_COOKIE_NAME: string;
 export declare const DOMAIN_COOKIE_NAME: string;

package/dist/constants/StorageKey.js

@@ -1,3 +1,4 @@
+export const AUTH_CONFIG_COOKIE_NAME = 'WebPortalAuthConfig';
 export const ACCESS_TOKEN_COOKIE_NAME = 'WebPortalAuthAccessToken';
 export const REFRESH_TOKEN_COOKIE_NAME = 'WebPortalAuthRefreshToken';
 export const DOMAIN_COOKIE_NAME = 'WebPortalDomain';

package/dist/handlers/deleteSession.d.ts

@@ -1,4 +1,4 @@
-import { NextResponse, type NextRequest } from 'next/server';
+import { type NextRequest, NextResponse } from 'next/server';
 export declare function deleteSession(request: NextRequest): Promise<NextResponse<{
     ok: true;
     data?: never;

package/dist/handlers/deleteSession.js

@@ -1,14 +1,18 @@
 import { NextResponse } from 'next/server';
-import { ACCESS_TOKEN_COOKIE_NAME, REFRESH_TOKEN_COOKIE_NAME, } from '../constants/index.js';
+import { ACCESS_TOKEN_COOKIE_NAME, AUTH_CONFIG_COOKIE_NAME, REFRESH_TOKEN_COOKIE_NAME, } from '../constants/index.js';
 import { destroySession } from '../services/auth.js';
 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('[DESTROY SESSION]');
+    console.log({ authApiBaseUrl });
     if (accessToken) {
         await destroySession({
             headers: {
                 Authorization: `Bearer ${accessToken}`,
             },
-        });
+        }, authApiBaseUrl);
     }
     const response = NextResponse.json({
         ok: true,

package/dist/handlers/getSession.js

@@ -1,11 +1,21 @@
-import { addMinutes } from 'date-fns';
+import { addDays, addMinutes, subMinutes } from 'date-fns';
 import { NextResponse } from 'next/server';
-import { ACCESS_TOKEN_COOKIE_NAME, BTAG_COOKIE_NAME, DOMAIN_COOKIE_NAME, REFRESH_TOKEN_COOKIE_NAME, } from '../constants/index.js';
+import { ACCESS_TOKEN_COOKIE_NAME, AUTH_CONFIG_COOKIE_NAME, BTAG_COOKIE_NAME, DOMAIN_COOKIE_NAME, FINGERPRINT_HEADER_KEY, REFRESH_TOKEN_COOKIE_NAME, } from '../constants/index.js';
 import { refreshSession } from '../services/auth.js';
 export async function getSession(request) {
     const accessToken = request.cookies.get(ACCESS_TOKEN_COOKIE_NAME)?.value;
+    const authConfig = JSON.parse(request.cookies.get(AUTH_CONFIG_COOKIE_NAME)?.value ?? '{}');
+    const authVersion = authConfig.version;
+    const authApiBaseUrl = authConfig.apiBaseUrl;
+    const fingerprint = request.headers.get(FINGERPRINT_HEADER_KEY);
+    console.log('[GET SESSION]');
+    console.log({
+        authVersion,
+        authApiBaseUrl,
+        fingerprint,
+    });
     let isAccessTokenValid = true;
-    if (accessToken) {
+    if (accessToken && authVersion !== 4) {
         try {
             const payload = accessToken.split('.')[1];
             const decoded = JSON.parse(Buffer.from(payload, 'base64').toString('utf8'));
@@ -17,6 +27,9 @@ export async function getSession(request) {
             isAccessTokenValid = false;
         }
     }
+    if (authVersion === 4 && !accessToken) {
+        isAccessTokenValid = false;
+    }
     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;
@@ -31,6 +44,7 @@ export async function getSession(request) {
         });
         response.cookies.delete(ACCESS_TOKEN_COOKIE_NAME);
         response.cookies.delete(REFRESH_TOKEN_COOKIE_NAME);
+        response.cookies.delete(AUTH_CONFIG_COOKIE_NAME);
         return response;
     }
     if (!accessToken || !isAccessTokenValid) {
@@ -45,8 +59,11 @@ export async function getSession(request) {
                     ...(ipAddress && {
                         'X-Forwarded-For': ipAddress,
                     }),
+                    ...(fingerprint && {
+                        [FINGERPRINT_HEADER_KEY]: fingerprint,
+                    }),
                 },
-            });
+            }, authVersion, authApiBaseUrl);
             const response = NextResponse.json({
                 ok: true,
                 data: {
@@ -60,6 +77,13 @@ export async function getSession(request) {
                 httpOnly: true,
                 sameSite: 'strict',
             });
+            if (authVersion === 4) {
+                response.cookies.set(REFRESH_TOKEN_COOKIE_NAME, data.refreshToken, {
+                    expires: subMinutes(addDays(new Date(), 15), 2),
+                    httpOnly: true,
+                    sameSite: 'strict',
+                });
+            }
             return response;
         }
         catch {
@@ -72,6 +96,7 @@ export async function getSession(request) {
                 },
             });
             response.cookies.delete(REFRESH_TOKEN_COOKIE_NAME);
+            response.cookies.delete(AUTH_CONFIG_COOKIE_NAME);
             return response;
         }
     }

package/dist/handlers/index.d.ts

@@ -18,14 +18,14 @@ export declare const GET: (req: NextRequest, { params }: Context) => Promise<Nex
     __error?: unknown;
 } | {
     ok: true;
-    data: Record<string, unknown>;
+    data: import("../types").Session;
 }> | NextResponse<{
     ok: false;
     message: string;
     __error?: unknown;
 } | {
     ok: true;
-    data: import("../types").Session;
+    data: Record<string, unknown>;
 }>>;
 export declare const DELETE: (req: NextRequest, { params }: Context) => Promise<NextResponse<{
     ok: true;

package/dist/handlers/postSession.js

@@ -1,7 +1,7 @@
 import { addDays, addMinutes, subMinutes } from 'date-fns';
 import { NextResponse } from 'next/server';
 import { z } from 'zod';
-import { ACCESS_TOKEN_COOKIE_NAME, API_VERSION_HEADER_KEY, AUTH_API_BASE_URL_HEADER_KEY, DOMAIN_HEADER_KEY, FINGERPRINT_HEADER_KEY, GOOGLE_FRAUD_DEFENSE_HEADER_KEY, PLATFORM_WEB_HEADER_KEY, RECAPTCHA_HEADER_KEY, REFRESH_TOKEN_COOKIE_NAME, SESSION_VERSION_HEADER_KEY, } from '../constants/index.js';
+import { ACCESS_TOKEN_COOKIE_NAME, API_VERSION_HEADER_KEY, AUTH_API_BASE_URL_HEADER_KEY, AUTH_CONFIG_COOKIE_NAME, DOMAIN_HEADER_KEY, FINGERPRINT_HEADER_KEY, GOOGLE_FRAUD_DEFENSE_HEADER_KEY, PLATFORM_WEB_HEADER_KEY, RECAPTCHA_HEADER_KEY, REFRESH_TOKEN_COOKIE_NAME, SESSION_VERSION_HEADER_KEY, } from '../constants/index.js';
 import { createSession, } from '../services/auth.js';
 const CreateSessionDefinition = z.union([
     z.object({
@@ -47,6 +47,14 @@ 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('[CREATE SESSION]');
+    console.log({
+        versionSession,
+        version,
+        authApiBaseUrl,
+        fingerprint,
+        isWeb,
+    });
     try {
         const googleFraudDefense = request.headers.get(GOOGLE_FRAUD_DEFENSE_HEADER_KEY);
         const recaptchaToken = googleFraudDefense ?? recaptcha;
@@ -79,12 +87,21 @@ export async function postSession(request) {
         }
         const response = NextResponse.json({ ok: true, data: null }, { status: 201 });
         response.cookies.set(ACCESS_TOKEN_COOKIE_NAME, res.accessToken, {
-            expires: addMinutes(new Date(), 9),
+            expires: addMinutes(new Date(), version === 4 ? 4 : 9),
             httpOnly: true,
             sameSite: 'strict',
         });
+        const _15d = subMinutes(addDays(new Date(), version === 4 ? 15 : 1), 2);
         response.cookies.set(REFRESH_TOKEN_COOKIE_NAME, res.refreshToken, {
-            expires: subMinutes(addDays(new Date(), 30), 1),
+            expires: _15d,
+            httpOnly: true,
+            sameSite: 'strict',
+        });
+        response.cookies.set(AUTH_CONFIG_COOKIE_NAME, JSON.stringify({
+            version,
+            authApiBaseUrl,
+        }), {
+            expires: _15d,
             httpOnly: true,
             sameSite: 'strict',
         });

package/dist/schemas/forgotPasswordSchema.d.ts

@@ -8,24 +8,24 @@ export declare const createForgotPasswordSchema: (mobileNumberParser: MobileNumb
     mobileNumber: z.ZodEffects<z.ZodString, string, string>;
     verificationCode: z.ZodEffects<z.ZodString, string, string>;
 }, "strip", z.ZodTypeAny, {
-    verificationCode: string;
     password: string;
     mobileNumber: string;
+    verificationCode: string;
     confirmPassword: string;
 }, {
-    verificationCode: string;
     password: string;
     mobileNumber: string;
+    verificationCode: string;
     confirmPassword: string;
 }>, {
-    verificationCode: string;
     password: string;
     mobileNumber: string;
+    verificationCode: string;
     confirmPassword: string;
 }, {
-    verificationCode: string;
     password: string;
     mobileNumber: string;
+    verificationCode: string;
     confirmPassword: string;
 }>;
 export type ForgotPasswordSchema = z.infer<ReturnType<typeof createForgotPasswordSchema>>;

package/dist/services/auth.d.ts

@@ -25,7 +25,8 @@ export type CreateSessionInput = CreateSessionInput__UsernameAndPassword | Creat
 /**
  * Controls which auth endpoint is used to create a session.
  * - `default` -> `${AUTH_ENDPOINT}/sessions` (or `/v3`/`/v4/sessions`, see `ApiVersion`)
- * - `Inplay`  -> `${AUTH_ENDPOINT}/v3/inplay/sessions` (no v4 variant exists)
+ * - `Inplay`  -> `${AUTH_ENDPOINT}/v3/inplay/sessions`, or `/v4/inplay/sessions`
+ *   when `version` is `4` (any other version falls back to `v3`)
  */
 export type VersionSession = 'default' | 'Inplay';
 /**
@@ -80,8 +81,8 @@ export type AuthenticateInput = AuthenticateInput__SecurityQuestion;
 export declare function authenticate(input: AuthenticateInput, options?: HttpRequestOptions): Promise<AuthenticateMutation>;
 export interface RefreshSessionMutation extends Omit<CreateSessionTwoFactorAuthDisabledMutation, 'authenticator'> {
 }
-export declare function refreshSession(options?: HttpRequestOptions): Promise<RefreshSessionMutation>;
-export declare function destroySession(options?: HttpRequestOptions): Promise<void>;
+export declare function refreshSession(options?: HttpRequestOptions, version?: ApiVersion, authApiBaseUrl?: string | null): Promise<RefreshSessionMutation>;
+export declare function destroySession(options?: HttpRequestOptions, authApiBaseUrl?: string | null): Promise<void>;
 export declare function getSessionHealth(options?: HttpRequestOptions): Promise<boolean>;
 export interface SendVerificationCodeInput {
     strict?: boolean;

package/dist/services/auth.js

@@ -3,7 +3,7 @@ import { httpRequest } from './httpRequest.js';
 import { sha256 } from './sha256.js';
 function getSessionEndpoint(versionSession, version) {
     if (versionSession === 'Inplay')
-        return '/v3/inplay/sessions';
+        return `/v${version === 4 ? 4 : 3}/inplay/sessions`;
     return version !== 1 ? `/v${version}/sessions` : '/sessions';
 }
 export async function createSession(input, options, versionSession = 'default', version = 1, authApiBaseUrl) {
@@ -50,7 +50,6 @@ export async function createSession(input, options, versionSession = 'default',
     const queryParam = version === 4 && isWeb ? '?type=web' : '';
     const path = getSessionEndpoint(effectiveVersionSession, version);
     const baseUrl = authApiBaseUrl || AUTH_ENDPOINT;
-    console.log({ x: baseUrl });
     try {
         // v1 against the default endpoint returns the payload flat; every
         // other combination (Inplay, or version 3/4) wraps it in `{ data: { ... } }`.
@@ -143,14 +142,25 @@ export async function authenticate(input, options) {
     }
     throw new Error("Invalid input 'type'");
 }
-export async function refreshSession(options) {
+export async function refreshSession(options, version = 1, authApiBaseUrl) {
+    let url = '';
+    url = authApiBaseUrl || AUTH_ENDPOINT;
+    url =
+        version !== 1
+            ? `${url}/v${version}/session/refresh`
+            : `${url}/session:refresh`;
+    console.log('[REFRESH SESSION]');
+    console.log({ url });
     try {
-        return await httpRequest.json(`${AUTH_ENDPOINT}/session:refresh`, {
+        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;
         }
@@ -163,9 +173,14 @@ export async function refreshSession(options) {
         }
     }
 }
-export async function destroySession(options) {
+export async function destroySession(options, authApiBaseUrl) {
+    let url = '';
+    url = authApiBaseUrl || AUTH_ENDPOINT;
+    url = `${url}/session`;
+    console.log('[DESTROY SESSION]');
+    console.log({ url });
     try {
-        await httpRequest(`${AUTH_ENDPOINT}/session`, {
+        await httpRequest(url, {
             ...options,
             method: 'DELETE',
         });
@@ -177,9 +192,14 @@ export async function destroySession(options) {
 export async function getSessionHealth(options) {
     try {
         const res = await fetch(`${AUTH_ENDPOINT}/session`, options);
+        if (!res.ok) {
+            console.log('[SESSION]');
+            console.log("'/session' failed");
+        }
         return res.ok;
     }
     catch {
+        console.log("unknown error in '/session'");
         /* Network errors should not be logged out */
         return true;
     }