Fix UTM & network in redux

Author: kosyachniy

api/app/routes/users/auth.py

@@ -2,6 +2,8 @@
 The authorization method of the user object of the API
 """
 
+import time
+
 import jwt
 from fastapi import APIRouter, Body, Request
 from fastapi.responses import JSONResponse
@@ -54,6 +56,7 @@ def get_user(global_user, **kwargs):
 async def update_utm(user, global_user, utm):
     if not utm:
         return user, None, None
+    log.info(f"UTM #{utm} for {user.id}")
 
     try:
         referrer_id = decrypt(utm)
@@ -91,7 +94,11 @@ async def update_utm(user, global_user, utm):
     if referrer.id == user.id:
         return user, None, None
 
-    if user.referrer is None:
+    if (
+        user.referrer is None
+        and not user.frens  # friend link
+        and time.time() - user.created > 3600  # old user – no referrer
+    ):
         user.referrer = referrer.id
 
     if referrer.id not in user.frens:

web/src/features/auth/components/VkAuthInitializer.tsx

@@ -6,6 +6,7 @@ import { useToastActions } from '@/shared/hooks/useToast';
 import { useApiErrorMessage } from '@/shared/hooks/useApiErrorMessage';
 import { useAppDispatch, useAppSelector } from '@/shared/stores/store';
 import { isVkMiniApp } from '@/shared/lib/vk';
+import { getUtmFromSearchParams } from '@/shared/lib/utm';
 import { loginWithVkApp, selectAuthUser } from '../stores/authSlice';
 
 type VkUserInfo = {
@@ -19,7 +20,7 @@ type VkUserInfo = {
 const getVkUtm = () => {
     if (typeof window === 'undefined') return null;
     const params = new URLSearchParams(window.location.search);
-    return params.get('utm') || params.get('vk_ref') || null;
+    return getUtmFromSearchParams(params);
 };
 
 const getVkEmail = () => {
@@ -81,6 +82,8 @@ export default function VkAuthInitializer() {
             const image = userInfo?.photo_200_orig || userInfo?.photo_200 || userInfo?.photo_100 || null;
             const mail = getVkEmail();
 
+            console.log(`VK UTM #${resolvedUtm}`, userInfo);
+
             return dispatch(
                 loginWithVkApp({
                     url,

web/src/features/session/components/SessionInitializer.tsx

@@ -7,23 +7,32 @@ import { useToastActions } from '@/shared/hooks/useToast';
 import { useAppDispatch, useAppSelector } from '@/shared/stores/store';
 import { STORAGE_KEYS } from '@/shared/constants';
 import { syncAuthCookie } from '@/shared/lib/auth';
-import { initializeSession, setUtm } from '../stores/sessionSlice';
+import { getClientNetwork } from '@/shared/lib/app';
+import { getUtmFromSearchParams } from '@/shared/lib/utm';
+import { initializeSession, setNetwork, setUtm } from '../stores/sessionSlice';
 
 export default function SessionInitializer() {
     const dispatch = useAppDispatch();
     const searchParams = useSearchParams();
     const t = useTranslations('session');
-    const { status } = useAppSelector((state) => state.session);
+    const { status, network: storedNetwork, utm: storedUtm } = useAppSelector((state) => state.session);
     const authToken = useAppSelector((state) => state.session.authToken);
     const { error: showError } = useToastActions();
 
-    const utmParam = useMemo(() => searchParams?.get('utm') || searchParams?.get('vk_ref') || null, [searchParams]);
+    const utmParam = useMemo(() => getUtmFromSearchParams(searchParams), [searchParams]);
 
     useEffect(() => {
-        if (utmParam) {
+        if (storedUtm !== utmParam) {
             dispatch(setUtm(utmParam));
         }
-    }, [dispatch, utmParam]);
+    }, [dispatch, storedUtm, utmParam]);
+
+    useEffect(() => {
+        const resolvedNetwork = getClientNetwork();
+        if (storedNetwork !== resolvedNetwork) {
+            dispatch(setNetwork(resolvedNetwork));
+        }
+    }, [dispatch, storedNetwork]);
 
     useEffect(() => {
         if (status === 'loading') {

web/src/shared/lib/utm.ts

@@ -0,0 +1,16 @@
+type SearchParamsLike = {
+    get: (key: string) => string | null;
+};
+
+export const normalizeUtm = (value?: string | null): string | null => {
+    if (!value) return null;
+    const trimmed = value.trim();
+    if (!trimmed) return null;
+    if (trimmed.toLowerCase() === 'other') return null;
+    return trimmed;
+};
+
+export const getUtmFromSearchParams = (params?: SearchParamsLike | null): string | null => {
+    if (!params) return null;
+    return normalizeUtm(params.get('utm') || params.get('vk_ref'));
+};