@alfabit/keycloak 0.0.13 → 0.0.15

package/package.json

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

package/src/composables/use-keycloak.ts

@@ -98,13 +98,6 @@ export const getAuthMethods = () => {
   const methods = reactive({
     async loginPopup(idpHint: TIdpHint, redirectUri?: string) {
       redirectUri = redirectUri ?? getUrl();
-
-      console.log({
-        isMobile: isMobile(),
-        idpHint,
-        redirectUri,
-      });
-
       if (isMobile()) {
         switch (idpHint) {
           case 'google':
@@ -176,12 +169,6 @@ export const getAuthMethods = () => {
       if (keycloak.value) {
         clearTokens();
         setTimeout(() => {
-          console.log('logout', {
-            keycloakRedirectUriIsLogout: keycloakRedirectUriIsLogout.value,
-            dontChangeRedirectUri: dontChangeRedirectUri.value,
-            redirectUri: redirectUri ?? getUrl(),
-          });
-
           keycloak.value &&
             keycloak.value.logout({
               redirectUri: redirectUri ?? getUrl(),
@@ -303,26 +290,26 @@ export const isRtExp = () => {
   }
 };
 
-const isPopup = () => {
-  console.log('run isPopup');
-  // для авторизации в popup - это запускается в дочернем окне
-  try {
-    // Отправляем сообщение родителю
-    if (window.opener) {
-      console.log('window opener');
-
-      window.opener.postMessage(
-        {
-          type: 'keycloak-auth-success',
-          message: 'success',
-        },
-        '*'
-      );
-    }
-  } catch (err) {
-    console.error('Error in login-popup-redirect.html:', err);
-  }
-};
+// const isPopup = () => {
+//   console.log('run isPopup');
+//   // для авторизации в popup - это запускается в дочернем окне
+//   try {
+//     // Отправляем сообщение родителю
+//     if (window.opener) {
+//       console.log('window opener');
+
+//       window.opener.postMessage(
+//         {
+//           type: 'keycloak-auth-success',
+//           message: 'success',
+//         },
+//         '*'
+//       );
+//     }
+//   } catch (err) {
+//     console.warn('Error in login-popup-redirect.html:', err);
+//   }
+// };
 
 let isInitKeycloak = false;
 
@@ -334,18 +321,18 @@ export async function initKeycloak() {
   if (!OPENID_REALM) throw new Error('Не задана переменная keycloak: realm');
   if (!OPENID_CLIENT_ID) throw new Error('Не задана переменная keycloak: clientId');
 
-  console.log({
-    OPENID_URL,
-    OPENID_REALM,
-    OPENID_CLIENT_ID,
-
-    VITE_OPENID_URL: import.meta.env?.VITE_OPENID_URL,
-    VITE_PUBLIC_KEYCLOAK_URL: import.meta.env?.VITE_PUBLIC_KEYCLOAK_URL,
-    VITE_OPENID_REALM: import.meta.env?.VITE_OPENID_REALM,
-    VITE_PUBLIC_KEYCLOAK_REALM: import.meta.env?.VITE_PUBLIC_KEYCLOAK_REALM,
-    VITE_OPENID_CLIENT_ID: import.meta.env?.VITE_OPENID_CLIENT_ID,
-    VITE_PUBLIC_KEYCLOAK_CLIENT_ID: import.meta.env?.VITE_PUBLIC_KEYCLOAK_CLIENT_ID,
-  });
+  // console.log({
+  //   OPENID_URL,
+  //   OPENID_REALM,
+  //   OPENID_CLIENT_ID,
+
+  //   VITE_OPENID_URL: import.meta.env?.VITE_OPENID_URL,
+  //   VITE_PUBLIC_KEYCLOAK_URL: import.meta.env?.VITE_PUBLIC_KEYCLOAK_URL,
+  //   VITE_OPENID_REALM: import.meta.env?.VITE_OPENID_REALM,
+  //   VITE_PUBLIC_KEYCLOAK_REALM: import.meta.env?.VITE_PUBLIC_KEYCLOAK_REALM,
+  //   VITE_OPENID_CLIENT_ID: import.meta.env?.VITE_OPENID_CLIENT_ID,
+  //   VITE_PUBLIC_KEYCLOAK_CLIENT_ID: import.meta.env?.VITE_PUBLIC_KEYCLOAK_CLIENT_ID,
+  // });
 
   keycloak.value = new Keycloak({
     url: OPENID_URL,
@@ -353,10 +340,6 @@ export async function initKeycloak() {
     clientId: OPENID_CLIENT_ID,
   });
 
-  console.log({
-    keycloak: keycloak.value,
-  });
-
   const isNeedAuth = !!getToken() && !isRtExp();
 
   // window.opener - если находимся в popup (но не в passport), то 100% уже авторизованы и можно поставить login-required
@@ -385,25 +368,15 @@ export async function initKeycloak() {
     if (idToken) initOptions.idToken = idToken;
   }
 
-  console.log({
-    initOptions,
-  });
-
   try {
-    console.log('before keycloak init');
-
     const res = await keycloak.value.init(initOptions);
 
-    console.log('after keycloak init', {
-      res,
-    });
-
     setTokens();
 
     if (res) {
       //await keycloak.value.updateToken(70);
       setTokens();
-      isPopup();
+      // isPopup();
       keycloakUserData.value = keycloak.value?.tokenParsed ?? null;
       isAuth.value = true;
       try {
@@ -427,7 +400,7 @@ export async function initKeycloak() {
     }
     return isAuth.value;
   } catch (error) {
-    console.error('Ошибка Keycloak:', error);
+    console.warn('Ошибка Keycloak:', error);
     isAuth.value = false;
     return false;
   } finally {
@@ -457,8 +430,6 @@ let _keycloakInit: IUseKeycloak | null = null;
 export const keycloakInit = (dontChangeRedirectUri?: Ref<boolean>, keycloakRedirectUriIsLogout?: Ref<string | undefined>): IUseKeycloak => {
   if (_keycloakInit) return _keycloakInit;
 
-  console.log('>>>>> Lazy keycloakInit called');
-
   dontChangeRedirectUri ||= inject('dontChangeRedirectUri', ref(false));
   keycloakRedirectUriIsLogout ||= inject('keycloakRedirectUriIsLogout', ref(undefined));
 
@@ -475,8 +446,5 @@ export const keycloakInit = (dontChangeRedirectUri?: Ref<boolean>, keycloakRedir
     isAtExp,
     isRtExp,
   };
-
-  console.log('@alfabit/keycloak fn keycloakInit', {_keycloakInit});
-
   return _keycloakInit;
 };

package/src/plugins/keycloak.ts

@@ -2,8 +2,6 @@ import { ref } from 'vue';
 import { createKeycloakInit, getAuthMethods, keycloakInit } from '../composables';
 
 export const useKeycloak = () => {
-  console.trace('Trace: useKeycloak');
-  console.log('@alfabit/keycloak fn useKeycloak');
   const keycloak = keycloakInit(ref(false), ref(undefined));
   const auth = getAuthMethods();
   return {
@@ -13,13 +11,11 @@ export const useKeycloak = () => {
 };
 
 export const createKeycloak = () => {
-  console.log('@alfabit/keycloak fn createKeycloak');
   createKeycloakInit();
 };
 
 export const keycloakPlugin = {
   install() {
-    console.log('@alfabit/keycloak plugin install');
     createKeycloak();
     //app.config.globalProperties.$keycloak = useKeycloak();
   },