@alfabit/keycloak 0.0.41 → 0.0.43

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alfabit/keycloak",
   "private": false,
-  "version": "0.0.41",
+  "version": "0.0.43",
   "type": "module",
   "license": "UNLICENSED",
   "main": "src/index.ts",
@@ -20,8 +20,8 @@
     "keycloak-js": "^26.2.0"
   },
   "devDependencies": {
-    "@alfabit/constants": "^0.0.21",
     "@alfabit/analitics": "^0.0.18",
+    "@alfabit/constants": "^0.0.21",
     "@intlify/unplugin-vue-i18n": "^6.0.8",
     "@tanstack/vue-query": "^5.72.0",
     "@types/lodash-es": "^4.17.12",

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

@@ -9,11 +9,11 @@ export const postWebLogin = async () => {
   const headers: Record<string, string> = {
     "Content-Type": "application/json",
   };
-  const token = getToken();      
-  if(token) headers['Authorization'] = `Bearer ${token}`;
+  const token = getToken();
+  if (token) headers['Authorization'] = `Bearer ${token}`;
 
   let url = `${WALLET_API_HOST}/public/web/login/`;
-  
+
   try {
     const analytics = useAnalytics();
     const clientID = await analytics.getClientID();
@@ -41,4 +41,31 @@ export const postWebLogin = async () => {
   const data = await res.json();
   if (referral_token) localStorage.removeItem(REF_KEY);
   return data;
+};
+
+
+export const getPublicProfile = async () => {
+  if (typeof window === 'undefined') return;
+
+  const headers: Record<string, string> = {
+    "Content-Type": "application/json",
+  };
+  const token = getToken();
+  if (token) headers['Authorization'] = `Bearer ${token}`;
+
+  let url = `${WALLET_API_HOST}/public/getProfile`;
+
+  const params: RequestInit = {
+    method: "GET",
+    headers,
+  }
+
+  const res = await fetch(url, params);
+
+  if (!res.ok) {
+    throw new Error(`postWebLogin /public/web/login/: HTTP error: ${res.status}`);
+  }
+
+  const data = await res.json();
+  return data;
 };

package/src/composables/use-keycloak.ts

@@ -1,10 +1,52 @@
 import Keycloak, { type KeycloakInitOptions } from 'keycloak-js';
 import { inject, reactive, readonly, type Ref, ref } from 'vue';
-import { postWebLogin } from '../api/wallet/endpoints';
+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';
 
 export type TIdpHint = 'email' | 'google' | 'apple';
 
+enum TariffsGridTypeEnum {
+  Deposit = 'deposit',
+  Withdraw = 'withdraw',
+  Invoice = 'invoice',
+  Hedging = 'hedging',
+  FiatExchange = 'fiat_exchange',
+  InternalTransfer = 'internal_transfer',
+  Orders = 'orders',
+}
+
+interface TariffGrid {
+  tariff_name?: string | null;
+  tariff_type?: TariffsGridTypeEnum | null;
+  commission?: string | null;
+  trading_volume?: number | null;
+  is_kyc_required?: boolean | null;
+  id?: string;
+  created_date?: string;
+  creator_id?: number | null;
+  modification_date?: string | null;
+  modifier_id?: number | null;
+}
+
+interface ProfileResponse {
+  telegram_id?: string | null;
+  telegram_username?: string | null;
+  email?: string | null;
+  created_at: number;
+  is_active?: boolean | null;
+  balance_usdt?: string | null;
+  bonus_balance_usdt?: string | null;
+  kyc_status?: string | null;
+  kyc_link?: string | null;
+  is_wallet_commission?: boolean;
+  is_need_withdraw_kyc?: boolean;
+  tariff_grid?: TariffGrid | null;
+  tariff_grid_current?: TariffGrid | null;
+  is_partner_exchange_limit_free?: boolean | null;
+  last_login?: string | null;
+  is_tariff_autocalculate?: boolean | null;
+}
+
 export interface IUseKeycloak {
   login(email?: string, redirectUri?: string): void;
   loginWithGoogle(redirectUri?: string): void;
@@ -19,6 +61,7 @@ export interface IUseKeycloak {
 
   readonly isAuth: Ref<boolean>;
   readonly checkAuth: Ref<boolean>;
+  readonly userData: Ref<ProfileResponse | null>;
   readonly keycloak: Ref<Keycloak | null>;
   readonly isInitialized: Ref<boolean>;
   readonly keycloakUserData: Ref<Keycloak.KeycloakTokenParsed | null>;
@@ -32,27 +75,28 @@ const keycloak = ref<Keycloak | null>(null);
 
 const isAuth = ref(false);
 const checkAuth = ref(false);
+const userData = ref<ProfileResponse | null>(null);
 const keycloakUserData = ref<Keycloak.KeycloakTokenParsed | null>(null);
 const locale = ref('en');
 
 const dontChangeRedirectUri = ref(false);
 const keycloakRedirectUriIsLogout = ref<string | undefined>(undefined);
 
-export const setKeycloakLocale = (newLocale: LocationEnum) => {
+export function setKeycloakLocale(newLocale: LocationEnum) {
   locale.value = newLocale;
 };
 
-export const setDontChangeRedirectUri = (newDontChangeRedirectUri: boolean) => {
+export function setDontChangeRedirectUri(newDontChangeRedirectUri: boolean) {
   dontChangeRedirectUri.value = newDontChangeRedirectUri;
 };
 
-export const setKeycloakRedirectUriIsLogout = (newKeycloakRedirectUriIsLogout: string | undefined) => {
+export function setKeycloakRedirectUriIsLogout(newKeycloakRedirectUriIsLogout: string | undefined) {
   keycloakRedirectUriIsLogout.value = newKeycloakRedirectUriIsLogout;
 };
 
 const isInitialized = ref(false);
 
-const getUrl = (): string => {
+function getUrl(): string {
   const url = new URL(window.location.href);
   const searchParams = new URLSearchParams(window.location.search);
 
@@ -94,8 +138,8 @@ function isMobile() {
   return /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent);
 }
 
-export const getAuthMethods = () => {
-  const methods = reactive({
+export function getAuthMethods() {
+  const methods = {
     async loginPopup(idpHint: TIdpHint, redirectUri?: string) {
       redirectUri = redirectUri ?? getUrl();
       if (isMobile()) {
@@ -245,7 +289,7 @@ export const getAuthMethods = () => {
         console.warn('Keycloak not defined! #configureOtp');
       }
     },
-  });
+  };
   return methods;
 };
 
@@ -270,9 +314,11 @@ function clearTokens() {
   sessionStorage.removeItem(ID_TOKEN_NAME);
 }
 
-export const getToken = () => (IS_TELEGRAM_MINI_APP && !IS_LOCALHOST ? sessionStorage.getItem(TOKEN_NAME) : localStorage.getItem(TOKEN_NAME)) ?? undefined;
+export function getToken() {
+  return (IS_TELEGRAM_MINI_APP && !IS_LOCALHOST ? sessionStorage.getItem(TOKEN_NAME) : localStorage.getItem(TOKEN_NAME)) ?? undefined;
+}
 
-const parseJwt = (token: unknown) => {
+function parseJwt(token: unknown) {
   if (typeof token !== 'string') throw new Error('Invalid JWT format: #1');
   const [headerB64, payloadB64] = token.split('.');
   if (!headerB64 || !payloadB64) throw new Error('Invalid JWT format: #2');
@@ -289,7 +335,7 @@ const parseJwt = (token: unknown) => {
   };
 };
 
-export const isAtExp = () => {
+export function isAtExp() {
   if (typeof window === 'undefined') return false;
   try {
     return parseJwt(localStorage.getItem(TOKEN_NAME)).isExpired;
@@ -298,7 +344,7 @@ export const isAtExp = () => {
   }
 };
 
-export const isRtExp = () => {
+export function isRtExp() {
   if (typeof window === 'undefined') return false;
   try {
     // если рт не истек, возвращаем true
@@ -414,7 +460,8 @@ export async function initKeycloak() {
       keycloakUserData.value = keycloak.value?.tokenParsed ?? null;
       isAuth.value = true;
       try {
-        postWebLogin();
+        await postWebLogin();
+        userData.value = await getPublicProfile();
       } catch (e) { }
 
       //setTimeout(() => {
@@ -429,7 +476,8 @@ export async function initKeycloak() {
             keycloakUserData.value = keycloak.value?.tokenParsed ?? null;
             isAuth.value = true;
             try {
-              postWebLogin();
+              await postWebLogin();
+              userData.value = await getPublicProfile();
             } catch { }
           }
         }
@@ -472,7 +520,7 @@ export async function createKeycloakInit({ keycloakInit }: IKeycliakInit = {}) {
 
 let _keycloakInit: IUseKeycloak | null = null;
 
-export const keycloakInit = (dontChangeRedirectUri?: Ref<boolean>, keycloakRedirectUriIsLogout?: Ref<string | undefined>): IUseKeycloak => {
+export function keycloakInit(dontChangeRedirectUri?: Ref<boolean>, keycloakRedirectUriIsLogout?: Ref<string | undefined>): IUseKeycloak {
   if (_keycloakInit) return _keycloakInit;
 
   dontChangeRedirectUri ||= inject('dontChangeRedirectUri', ref(false));
@@ -483,6 +531,7 @@ export const keycloakInit = (dontChangeRedirectUri?: Ref<boolean>, keycloakRedir
     isInitialized: readonly(isInitialized),
     isAuth: readonly(isAuth),
     checkAuth: readonly(checkAuth),
+    userData: readonly(userData),
 
     keycloakUserData,