@alfabit/keycloak 0.0.42 → 0.0.44

package/package.json

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

package/src/composables/use-keycloak.ts

@@ -82,21 +82,21 @@ 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);
 
@@ -138,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()) {
@@ -289,7 +289,7 @@ export const getAuthMethods = () => {
         console.warn('Keycloak not defined! #configureOtp');
       }
     },
-  });
+  };
   return methods;
 };
 
@@ -314,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');
@@ -333,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;
@@ -342,7 +344,7 @@ export const isAtExp = () => {
   }
 };
 
-export const isRtExp = () => {
+export function isRtExp() {
   if (typeof window === 'undefined') return false;
   try {
     // если рт не истек, возвращаем true
@@ -476,7 +478,9 @@ export async function initKeycloak() {
             try {
               await postWebLogin();
               userData.value = await getPublicProfile();
-            } catch { }
+            } catch (e) {
+              console.warn('Ошибка при обновлении токена: ', e);
+            }
           }
         }
         catch (e) {
@@ -518,7 +522,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));