@alfabit/keycloak 0.0.47 → 0.0.49

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alfabit/keycloak",
   "private": false,
-  "version": "0.0.47",
+  "version": "0.0.49",
   "type": "module",
   "license": "UNLICENSED",
   "main": "src/index.ts",

package/src/api/wallet/endpoints/index.ts

@@ -3,8 +3,11 @@ import { getToken } from '../../../composables';
 import { useAnalytics } from '@alfabit/analitics';
 
 export const postWebLogin = async () => {
+  console.log('postWebLogin 1');
   if (typeof window === 'undefined') return;
 
+  console.log('postWebLogin 2');
+
   const referral_token = localStorage.getItem(REF_KEY) ?? null;
   const headers: Record<string, string> = {
     "Content-Type": "application/json",
@@ -15,32 +18,60 @@ export const postWebLogin = async () => {
   let url = `${WALLET_API_HOST}/public/web/login/`;
 
   try {
+
+    console.log('postWebLogin 3');
+
     const analytics = useAnalytics();
+
+    console.log('postWebLogin 4');
+
     const clientID = await analytics.getClientID();
+
+    console.log('postWebLogin 5', { clientID });
+
+
     if (clientID) {
       const urlObj = new URL(url);
       urlObj.searchParams.set('ym_client_id', clientID);
       url = urlObj.toString();
     }
     else throw new Error();
+
+    console.log('postWebLogin 6', { url });
+
   } catch (error) {
+    console.log('postWebLogin 7', { error });
     console.warn('Failed to get analytics clientID:', error);
   }
 
+  console.log('postWebLogin 8', { url });
+
   const params: RequestInit = {
     method: "POST",
     headers,
     body: JSON.stringify({ referral_token })
   }
 
+  console.log('postWebLogin 9', { params });
+
   const res = await fetch(url, params);
 
+  console.log('postWebLogin 10', { res });
+
   if (!res.ok) {
     throw new Error(`postWebLogin /public/web/login/: HTTP error: ${res.status}`);
   }
 
+  console.log('postWebLogin 11', { res });
+
   const data = await res.json();
+
+  console.log('postWebLogin 12', { data });
+
   if (referral_token) localStorage.removeItem(REF_KEY);
+
+  console.log('postWebLogin 13', { data });
+
   return data;
 };
 
@@ -69,4 +100,4 @@ export const getPublicProfile = async () => {
 
   const data = await res.json();
   return data;
-};
+};

package/src/composables/use-keycloak.ts

@@ -1,5 +1,5 @@
 import Keycloak, { type KeycloakInitOptions } from 'keycloak-js';
-import { inject, reactive, readonly, type Ref, ref } from 'vue';
+import { inject, readonly, type Ref, ref } from 'vue';
 import { postWebLogin, getPublicProfile } from '../api/wallet/endpoints';
 import { AppNameEnum, APP_NAME, IS_TELEGRAM_MINI_APP, KEYCLOAK_LOGIN_REQUIRED, OPENID_CLIENT_ID, OPENID_REALM, OPENID_URL, LocationEnum, IS_LOCALHOST } from '@alfabit/constants';
 
@@ -449,19 +449,11 @@ export async function initKeycloak() {
   }
 
   try {
-
-    console.log('initOptions', {
-      initOptions,
-    });
-
     const res = await keycloak.value.init(initOptions);
+    isAuth.value = keycloak.value?.authenticated || false;
 
     checkAuth.value = true;
 
-    console.log('initKeycloak', {
-      res,
-    });
-
     setTokens();
 
     if (res) {
@@ -473,53 +465,24 @@ export async function initKeycloak() {
 
 
       try {
-        console.log('before postWebLogin 1');
         await postWebLogin();
-        console.log('after postWebLogin 1');
         userData.value = await getPublicProfile();
-        console.log('after getPublicProfile 1', {
-          userData: userData.value,
-        });
       } catch (e) {
         console.warn('Ошибка при получении данных пользователя: ', e);
       }
 
       //setTimeout(() => {
       setInterval(async () => {
-
-        console.log('setInterval upd token 1');
-
         if (!keycloak.value) return;
-
-        console.log('setInterval upd token 2', {
-          keycloak: keycloak.value
-        });
-
         try {
-          console.log('setInterval before updateToken 1');
           const res = await keycloak.value.updateToken(70);
-
-          console.log('setInterval after updateToken 1', {
-            res
-          });
-
-
-
           if (res) {
             setTokens();
             keycloakUserData.value = keycloak.value?.tokenParsed ?? null;
             isAuth.value = true;
             try {
-
-              console.log('before postWebLogin 2');
-
               await postWebLogin();
-              console.log('after postWebLogin 2');
-
               userData.value = await getPublicProfile();
-              console.log('after getPublicProfile 2', {
-                userData: userData.value,
-              });
             } catch (e) {
               console.warn('Ошибка при обновлении токена: ', e);
             }
@@ -529,9 +492,6 @@ export async function initKeycloak() {
           console.warn('Ошибка Keycloak:', e);
           keycloak.value?.clearToken();
         }
-
-
-
       }, 6000);
       //}, 60000);
     }