@opexa/portal-components 0.0.332 → 0.0.334

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

@@ -1,5 +1,5 @@
 import { type RegisterMemberAccountViaMobileInput } from '../../services/account';
 import type { Mutation } from '../../types';
-export interface SignUpMutationInput extends Omit<RegisterMemberAccountViaMobileInput, 'domain' | 'cellxpertCxd'> {
+export interface SignUpMutationInput extends Omit<RegisterMemberAccountViaMobileInput, 'btag' | 'domain' | 'cellxpertCxd'> {
 }
 export declare const useSignUpMutation: Mutation<void, SignUpMutationInput>;

package/dist/client/hooks/useSignUpMutation.js

@@ -10,6 +10,9 @@ export const useSignUpMutation = (config) => {
             const session = await getSession();
             return await registerMemberAccountViaMobile({
                 ...input,
+                ...(session.btag && {
+                    btag: session.btag,
+                }),
                 ...(session.cellxpertCxd && {
                     cellxpertCxd: session.cellxpertCxd,
                 }),

package/dist/client/hooks/useUpdateSessionMutation.js

@@ -14,11 +14,13 @@ export const useUpdateSessionMutation = (config) => {
                 if (!prev)
                     return prev;
                 const domain = input.domain ?? prev.domain;
+                const btag = input.btag ?? prev.btag;
                 const cellxpertCxd = input.cellxpertCxd ?? prev.cellxpertCxd;
                 if (prev.status === 'unauthenticated') {
                     return {
                         status: 'unauthenticated',
                         domain,
+                        btag,
                         cellxpertCxd,
                     };
                 }

package/dist/client/services/updateSession.d.ts

@@ -1,6 +1,7 @@
 import { type HttpRequestOptions } from '../../services/httpRequest';
 export interface UpdateSessionInput {
     domain?: string;
+    btag?: string;
     cellxpertCxd?: string;
 }
 export declare const updateSession: (input: UpdateSessionInput, options?: HttpRequestOptions) => Promise<boolean>;

package/dist/components/PortalProvider/PortalProvider.js

@@ -9,6 +9,8 @@ import { getQueryClient } from '../../utils/getQueryClient.js';
 import { FeatureFlag } from './FeatureFlag.js';
 import { LinkGoogleAccountObserver } from './LinkGoogleAccountObserver.js';
 import { Providers } from './Providers.js';
+import { SessionWatcher } from './SessionWatcher.js';
+import { SetupBtag } from './SetupBtag.js';
 import { SetupCellxpertCxd } from './SetupCellxpertCxd.js';
 import { SetupDomain } from './SetupDomain.js';
 import { Snackbar } from './Snackbar.js';
@@ -20,5 +22,5 @@ export async function PortalProvider({ recaptchaSiteKey, children, }) {
         prefetchAccountQuery(),
         prefetchWalletQuery(),
     ]);
-    return (_jsxs(Fragment, { children: [_jsx(Providers, { recaptchaSiteKey: recaptchaSiteKey, children: _jsxs(HydrationBoundary, { state: dehydrate(queryClient), children: [children, _jsx(Suspense, { children: _jsx(SetupDomain, {}) }), _jsx(Suspense, { children: _jsx(SetupCellxpertCxd, {}) })] }) }), _jsx(Snackbar, {}), _jsx(Suspense, { children: _jsx(LinkGoogleAccountObserver, {}) }), _jsx(Suspense, { children: _jsx(FeatureFlag, {}) })] }));
+    return (_jsxs(Fragment, { children: [_jsx(Providers, { recaptchaSiteKey: recaptchaSiteKey, children: _jsxs(HydrationBoundary, { state: dehydrate(queryClient), children: [children, _jsx(SessionWatcher, {}), _jsx(Suspense, { children: _jsx(SetupDomain, {}) }), _jsx(Suspense, { children: _jsx(SetupCellxpertCxd, {}) }), _jsx(Suspense, { children: _jsx(SetupBtag, {}) })] }) }), _jsx(Snackbar, {}), _jsx(Suspense, { children: _jsx(LinkGoogleAccountObserver, {}) }), _jsx(Suspense, { children: _jsx(FeatureFlag, {}) })] }));
 }

package/dist/components/PortalProvider/SessionWatcher.d.ts

@@ -0,0 +1 @@
+export declare function SessionWatcher(): null;

package/dist/components/PortalProvider/SessionWatcher.js

@@ -0,0 +1,22 @@
+'use client';
+import { useRouter } from 'next/navigation';
+import { useTimeout } from 'usehooks-ts';
+import { useSessionHealthQuery } from '../../client/hooks/useSessionHealthQuery.js';
+import { useSessionQuery } from '../../client/hooks/useSessionQuery.js';
+import { useSignOutMutation } from '../../client/hooks/useSignOutMutation.js';
+export function SessionWatcher() {
+    const router = useRouter();
+    const sessionQuery = useSessionQuery();
+    const sessionHealthQuery = useSessionHealthQuery({
+        enabled: sessionQuery.data?.status === 'authenticated',
+        refetchInterval: 1000 * 5,
+    });
+    const signOutMutation = useSignOutMutation({
+        onSuccess() {
+            router.refresh();
+        },
+    });
+    const healthy = sessionHealthQuery.data ?? true;
+    useTimeout(() => signOutMutation.mutate(), !healthy ? 250 : null);
+    return null;
+}

package/dist/components/PortalProvider/SetupBtag.d.ts

@@ -0,0 +1 @@
+export declare function SetupBtag(): null;

package/dist/components/PortalProvider/SetupBtag.js

@@ -0,0 +1,29 @@
+'use client';
+import { useSearchParams } from 'next/navigation';
+import { useTimeout } from 'usehooks-ts';
+import { z } from 'zod';
+import { useSessionQuery } from '../../client/hooks/useSessionQuery.js';
+import { useUpdateSessionMutation } from '../../client/hooks/useUpdateSessionMutation.js';
+const BtagSchema = z
+    .string()
+    .min(1)
+    .max(100)
+    .trim()
+    .optional()
+    .nullable()
+    .catch(null);
+export function SetupBtag() {
+    const query = useSessionQuery();
+    const mutation = useUpdateSessionMutation();
+    const params = useSearchParams();
+    useTimeout(() => {
+        const oldValue = query.data?.btag;
+        const newValue = BtagSchema.parse(params.get('btag'));
+        if (oldValue === newValue)
+            return;
+        if (!newValue)
+            return;
+        mutation.mutate({ btag: newValue });
+    }, query.data?.status === 'unauthenticated' ? 250 : null);
+    return null;
+}

package/dist/components/PortalProvider/SetupCellxpertCxd.js

@@ -23,6 +23,6 @@ export function SetupCellxpertCxd() {
         if (!newValue)
             return;
         mutation.mutate({ cellxpertCxd: newValue });
-    }, query.data?.status !== 'unauthenticated' ? null : 1000);
+    }, query.data?.status === 'unauthenticated' ? 250 : null);
     return null;
 }

package/dist/components/PortalProvider/SetupDomain.js

@@ -32,6 +32,6 @@ export function SetupDomain() {
         if (oldDomain === newDomain)
             return;
         return mutation.mutate({ domain: newDomain });
-    }, query.isPending ? null : 1000);
+    }, query.isPending ? null : 250);
     return null;
 }

package/dist/components/SignIn/GoogleSignInTrigger.js

@@ -16,31 +16,31 @@ export const GoogleSignInTrigger = (props) => {
         return null;
     return (_jsx(GoogleOAuthProvider, { clientId: googleClientId, children: _jsx(Trigger, { ...props }) }));
 };
-const Trigger = ({ children, asChild, onClick, ...props }) => {
-    const signIn = useSignInMutation();
+const Trigger = ({ children, disabled, asChild, onClick, ...props }) => {
+    const signIn = useSignInMutation({
+        onError() {
+            toaster.error({
+                title: 'Account Not Found',
+                description: 'The Google account you used isn’t connected to any existing account in our system. Please connect it to continue.',
+            });
+        },
+    });
     const signInGoogle = useGoogleLogin({
         flow: 'auth-code',
         scope: 'openid profile email phone',
         state: encodeURIComponent(`${window.location.origin},${PLATFORM_CODE}`),
         ux_mode: 'popup',
         redirect_uri: 'postmessage',
-        onSuccess: async (cred) => {
-            const { token } = await httpRequest.json(`${AUTH_ENDPOINT}/google/auth?state=${cred.state}&code=${cred.code}&scope=${cred.scope}`);
+        onSuccess: async (res) => {
+            const { token } = await httpRequest.json(`${AUTH_ENDPOINT}/google/auth?state=${res.state}&code=${res.code}&scope=${res.scope}`);
             signIn.mutate({
                 type: 'SOCIALS',
                 token,
-            }, {
-                onError: () => {
-                    toaster.error({
-                        title: 'Account Not Found',
-                        description: 'The Google account you used isn’t connected to any existing account in our system. Please connect it to continue.',
-                    });
-                },
             });
         },
     });
     return (_jsx(ark.button, { type: "button", onClick: (e) => {
             onClick?.(e);
             signInGoogle();
-        }, asChild: !children ? true : asChild, ...props, children: children ?? (_jsxs(Button, { variant: "outline", colorScheme: "gray", className: "bg-bg-primary", children: [_jsx(GoogleIcon, { className: "size-6" }), "Continue with Google"] })) }));
+        }, asChild: !children ? true : asChild, disabled: signIn.isPending || disabled, ...props, children: children ?? (_jsxs(Button, { variant: "outline", colorScheme: "gray", className: "bg-bg-primary", children: [_jsx(GoogleIcon, { className: "size-6" }), "Continue with Google"] })) }));
 };

package/dist/components/SignUp/SignUpDefault/SignUpDefaultForm.js

@@ -229,7 +229,6 @@ export function SignUpDefaultForm() {
                                     mobileNumber: mobileNumberParser.format(mobileNumber),
                                     verificationCode: verificationCode.join(''),
                                     referralCode: search.get('referralCode') ?? undefined,
-                                    btag: search.get('btag') ?? undefined,
                                 });
                                 const name = mobileNumberParser.format(mobileNumber);
                                 const password = `${name}${id}`;

package/dist/components/SignUp/SignUpKYC/SignUpKYCForm.js

@@ -314,7 +314,6 @@ export function SignUpKYCForm() {
                                     mobileNumber: mobileNumberParser.format(mobileNumber),
                                     verificationCode: verificationCode.join(''),
                                     referralCode: search.get('referralCode') ?? undefined,
-                                    btag: search.get('btag') ?? undefined,
                                 });
                                 const name = mobileNumberParser.format(mobileNumber);
                                 const password = `${name}${id}`;

package/dist/constants/StorageKey.d.ts

@@ -1,5 +1,6 @@
 export declare const ACCESS_TOKEN_COOKIE_NAME: string;
 export declare const REFRESH_TOKEN_COOKIE_NAME: string;
 export declare const DOMAIN_COOKIE_NAME: string;
-export declare const FEATURE_FLAG_LOCAL_STORAGE_KEY: string;
+export declare const BTAG_COOKIE_NAME: string;
 export declare const CELLXPERT_CXD_COOKIE_NAME: string;
+export declare const FEATURE_FLAG_LOCAL_STORAGE_KEY: string;

package/dist/constants/StorageKey.js

@@ -1,5 +1,6 @@
 export const ACCESS_TOKEN_COOKIE_NAME = 'WebPortalAuthAccessToken';
 export const REFRESH_TOKEN_COOKIE_NAME = 'WebPortalAuthRefreshToken';
 export const DOMAIN_COOKIE_NAME = 'WebPortalDomain';
-export const FEATURE_FLAG_LOCAL_STORAGE_KEY = 'WebPortalFeatureFlag';
+export const BTAG_COOKIE_NAME = 'WebPortalBtag';
 export const CELLXPERT_CXD_COOKIE_NAME = 'WebPortalCellxpertCxd';
+export const FEATURE_FLAG_LOCAL_STORAGE_KEY = 'WebPortalFeatureFlag';

package/dist/handlers/getSession.js

@@ -1,11 +1,12 @@
 import { addMinutes } from 'date-fns';
 import { NextResponse } from 'next/server';
-import { ACCESS_TOKEN_COOKIE_NAME, CELLXPERT_CXD_COOKIE_NAME, DOMAIN_COOKIE_NAME, REFRESH_TOKEN_COOKIE_NAME, } from '../constants/index.js';
+import { ACCESS_TOKEN_COOKIE_NAME, BTAG_COOKIE_NAME, CELLXPERT_CXD_COOKIE_NAME, DOMAIN_COOKIE_NAME, 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 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;
     const cellxpertCxd = request.cookies.get(CELLXPERT_CXD_COOKIE_NAME)?.value;
     if (!refreshToken) {
         const response = NextResponse.json({
@@ -13,6 +14,7 @@ export async function getSession(request) {
             data: {
                 status: 'unauthenticated',
                 domain,
+                btag,
                 cellxpertCxd,
             },
         });
@@ -22,9 +24,17 @@ export async function getSession(request) {
     }
     if (!accessToken) {
         try {
+            const forwarded = request.headers.get('x-forwarded-for');
+            const ipaddress = forwarded?.split(',')[0];
             const data = await refreshSession({
                 headers: {
                     Authorization: `Bearer ${refreshToken}`,
+                    ...(ipaddress && {
+                        'X-Forwarded-For': ipaddress,
+                    }),
+                    ...(ipaddress && {
+                        'X-User-Real-Ip': ipaddress,
+                    }),
                 },
             });
             const response = NextResponse.json({
@@ -48,6 +58,7 @@ export async function getSession(request) {
                 data: {
                     status: 'unauthenticated',
                     domain,
+                    btag,
                     cellxpertCxd,
                 },
             });

package/dist/handlers/index.d.ts

@@ -6,26 +6,26 @@ interface Context {
     params: Promise<Params>;
 }
 export declare const GET: (req: NextRequest, { params }: Context) => Promise<NextResponse<{
-    ok: true;
-    data?: never;
-} | {
     ok: false;
     message: string;
     __error?: unknown;
+} | {
+    ok: true;
+    data: import("../types").Session;
 }> | NextResponse<{
+    ok: true;
+    data?: never;
+} | {
     ok: false;
     message: string;
     __error?: unknown;
-} | {
-    ok: true;
-    data: Record<string, unknown>;
 }> | 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/patchSession.js

@@ -1,9 +1,10 @@
 import { addDays, addHours } from 'date-fns';
 import { NextResponse } from 'next/server';
 import { z } from 'zod';
-import { CELLXPERT_CXD_COOKIE_NAME, DOMAIN_COOKIE_NAME } from '../constants/index.js';
+import { BTAG_COOKIE_NAME, CELLXPERT_CXD_COOKIE_NAME, DOMAIN_COOKIE_NAME, } from '../constants/index.js';
 const UpdateSessionDefinition = z.object({
     domain: z.string().optional().nullable(),
+    btag: z.string().optional().nullable(),
     cellxpertCxd: z.string().optional().nullable(),
 });
 export async function patchSession(request) {
@@ -30,5 +31,12 @@ export async function patchSession(request) {
             sameSite: 'strict',
         });
     }
+    if (parsed.data.btag) {
+        response.cookies.set(BTAG_COOKIE_NAME, parsed.data.btag, {
+            expires: addDays(new Date(), 30),
+            httpOnly: true,
+            sameSite: 'strict',
+        });
+    }
     return response;
 }

package/dist/handlers/postAuthenticate.js

@@ -38,6 +38,9 @@ export async function postAuthenticate(request) {
                 ...(ipaddress && {
                     'X-Forwarded-For': ipaddress,
                 }),
+                ...(ipaddress && {
+                    'X-User-Real-Ip': ipaddress,
+                }),
             },
         });
         const response = NextResponse.json({ ok: true }, { status: 201 });

package/dist/handlers/postSession.js

@@ -56,6 +56,9 @@ export async function postSession(request) {
                 ...(ipaddress && {
                     'X-Forwarded-For': ipaddress,
                 }),
+                ...(ipaddress && {
+                    'X-User-Real-Ip': ipaddress,
+                }),
             },
         });
         if (res.authenticator) {

package/dist/services/account.d.ts

@@ -37,6 +37,7 @@ export interface RegisterMemberAccountMutationVariables {
         password: string;
         mobileNumber: string;
         birthDay: string;
+        /** @deprecated Attach domain as header instead */
         domain?: string;
         btag?: string;
     };
@@ -53,6 +54,7 @@ export interface RegisterMemberAccountViaMobileMutationVariables {
         id: string;
         mobileNumber: string;
         btag?: string;
+        /** @deprecated Attach domain as header instead */
         domain?: string;
         cellxpertCxd?: string;
     };
@@ -91,6 +93,7 @@ export interface RegisterMemberAccountMutationVariables__Next {
         name: string;
         password: string;
         mobileNumber?: string;
+        /** @deprecated Attach domain as header instead */
         domain?: string;
         btag?: string;
     };
@@ -331,6 +334,7 @@ export interface RegisterMayaMemberAccountMutationVariables {
     input: {
         name: string;
         password: string;
+        /** @deprecated Attach domain as header instead */
         domain?: string;
     };
 }

package/dist/types/index.d.ts

@@ -7,13 +7,15 @@ import type { ImageProps } from 'next/image';
  */
 export type Session = {
     status: 'authenticated';
-    domain?: string;
     token: string;
-    cellxpertCxd?: string;
+    domain?: string;
+    btag?: never;
+    cellxpertCxd?: never;
 } | {
     status: 'unauthenticated';
-    domain?: string;
     token?: never;
+    domain?: string;
+    btag?: string;
     cellxpertCxd?: string;
 };
 /**