@alfabit/keycloak 0.0.7 → 0.0.9

package/package.json

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

package/src/composables/use-keycloak.ts

@@ -1,7 +1,7 @@
 import Keycloak, { type KeycloakInitOptions } from 'keycloak-js';
 import { inject, reactive, readonly, type Ref, ref } from 'vue';
 import { postWebLogin } from '../api/wallet/endpoints';
-import { AppNameEnum, APP_NAME, IS_TELEGRAM_MINI_APP, KEYCLOAK_LOGIN_REQUIRED, OPENID_CLIENT_ID, OPENID_REALM, OPENID_URL } from '@alfabit/constants';
+import { AppNameEnum, APP_NAME, IS_TELEGRAM_MINI_APP, KEYCLOAK_LOGIN_REQUIRED, OPENID_CLIENT_ID, OPENID_REALM, OPENID_URL, LocationEnum } from '@alfabit/constants';
 
 export type TIdpHint = 'email' | 'google' | 'apple';
 
@@ -33,10 +33,11 @@ const keycloak = ref<Keycloak | null>(null);
 const isAuth = ref(false);
 const checkAuth = ref(false);
 const keycloakUserData = ref<Keycloak.KeycloakTokenParsed | null>(null);
+const locale = ref('en');
 
-console.log({
-  location: window.location,
-});
+export const setKeycloakLocale = (newLocale: LocationEnum) => {
+  locale.value = newLocale;
+};
 
 const isInitialized = ref(false);
 
@@ -44,20 +45,17 @@ const getUrl = (dontChangeRedirectUri = false, keycloakRedirectUriIsLogout: stri
   const url = new URL(window.location.href);
   const searchParams = new URLSearchParams(window.location.search);
 
-  console.log('getUrl', {
-    dontChangeRedirectUri,
-    keycloakRedirectUriIsLogout,
-    redirect_uri: searchParams.get('redirect_uri'),
-  });
-
   if (searchParams.has('redirect_uri')) {
     const redirectUri = searchParams.get('redirect_uri');
     if (!!redirectUri) return redirectUri;
   }
 
   // если в роуте в meta есть параметр keycloakRedirectUriIsLogout - возвращаем его
-  if (!!keycloakRedirectUriIsLogout && typeof keycloakRedirectUriIsLogout === 'string') return keycloakRedirectUriIsLogout;
+  if (!!keycloakRedirectUriIsLogout && typeof keycloakRedirectUriIsLogout === 'string') return `${locale.value}/${keycloakRedirectUriIsLogout}`;
 
+  console.log({
+    dontChangeRedirectUri,
+  });
   // если в $route.meta (который передаем из родительского приложения) есть параметр dontChangeRedirectUri - то из адреса ну нужно удалять или добавлять /user
   // если нет - то ничего не делать
 
@@ -165,6 +163,7 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
         keycloak.value.login({
           redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value, keycloakRedirectUriIsLogout.value),
           loginHint: email ?? '',
+          locale: locale.value,
         });
       } else {
         console.warn('Keycloak not defined! #login');
@@ -174,6 +173,12 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
       if (keycloak.value) {
         clearTokens();
         setTimeout(() => {
+          console.log('logout', {
+            keycloakRedirectUriIsLogout: keycloakRedirectUriIsLogout.value,
+            dontChangeRedirectUri: dontChangeRedirectUri.value,
+            redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value, keycloakRedirectUriIsLogout.value),
+          });
+
           keycloak.value &&
             keycloak.value.logout({
               redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value, keycloakRedirectUriIsLogout.value),
@@ -188,6 +193,7 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
         keycloak.value.register({
           redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value),
           loginHint: email ?? '',
+          locale: locale.value,
         });
       } else {
         console.warn('Keycloak not defined! #register');
@@ -210,6 +216,7 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
         keycloak.value.login({
           redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value),
           idpHint: 'apple',
+          locale: locale.value,
         });
       } else {
         console.warn('Keycloak not defined! #loginWithApple');
@@ -220,6 +227,7 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
         keycloak.value.login({
           redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value),
           idpHint: 'telegram',
+          locale: locale.value,
         });
       } else {
         console.warn('Keycloak not defined! #loginWithTelegram');
@@ -342,6 +350,10 @@ export async function initKeycloak() {
     clientId: OPENID_CLIENT_ID,
   });
 
+  console.log({
+    keycloak: keycloak.value,
+  });
+
   const isNeedAuth = !!getToken() && !isRtExp();
 
   // window.opener - если находимся в popup (но не в passport), то 100% уже авторизованы и можно поставить login-required