@alfabit/keycloak 0.0.8 → 0.0.10

package/package.json

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

package/src/composables/use-keycloak.ts

@@ -35,31 +35,36 @@ const checkAuth = ref(false);
 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) => {
   locale.value = newLocale;
 };
 
+export const setDontChangeRedirectUri = (newDontChangeRedirectUri: boolean) => {
+  dontChangeRedirectUri.value = newDontChangeRedirectUri;
+};
+
+export const setKeycloakRedirectUriIsLogout = (newKeycloakRedirectUriIsLogout: string | undefined) => {
+  keycloakRedirectUriIsLogout.value = newKeycloakRedirectUriIsLogout;
+};
+
 const isInitialized = ref(false);
 
-const getUrl = (dontChangeRedirectUri = false, keycloakRedirectUriIsLogout: string | undefined = undefined): string => {
+const getUrl = (): string => {
   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.value && typeof keycloakRedirectUriIsLogout.value === 'string') return `${url.origin}/${locale.value}/${keycloakRedirectUriIsLogout.value}`;
 
-  // если в $route.meta (который передаем из родительского приложения) есть параметр dontChangeRedirectUri - то из адреса ну нужно удалять или добавлять /user
+  // если в $route.meta (который передаем из родительского приложения) есть параметр dontChangeRedirectUri - то из адреса НЕ нужно удалять или добавлять /user
   // если нет - то ничего не делать
 
   // if (!dontChangeRedirectUri) {
@@ -85,19 +90,14 @@ const getUrl = (dontChangeRedirectUri = false, keycloakRedirectUriIsLogout: stri
   return url.toString();
 };
 
-interface IGetAuthMethodsParams {
-  dontChangeRedirectUri?: Ref<boolean>;
-  keycloakRedirectUriIsLogout?: Ref<string | undefined>;
-}
-
 function isMobile() {
   return /Mobi|Android|iPhone|iPad|iPod/i.test(navigator.userAgent);
 }
 
-export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRedirectUriIsLogout = ref(undefined) }: IGetAuthMethodsParams) => {
+export const getAuthMethods = () => {
   const methods = reactive({
     async loginPopup(idpHint: TIdpHint, redirectUri?: string) {
-      redirectUri = redirectUri ?? getUrl(dontChangeRedirectUri.value, keycloakRedirectUriIsLogout.value);
+      redirectUri = redirectUri ?? getUrl();
 
       console.log({
         isMobile: isMobile(),
@@ -164,7 +164,7 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
     login(email?: string, redirectUri?: string) {
       if (keycloak.value) {
         keycloak.value.login({
-          redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value, keycloakRedirectUriIsLogout.value),
+          redirectUri: redirectUri ?? getUrl(),
           loginHint: email ?? '',
           locale: locale.value,
         });
@@ -176,9 +176,15 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
       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(dontChangeRedirectUri.value, keycloakRedirectUriIsLogout.value),
+              redirectUri: redirectUri ?? getUrl(),
             });
         }, 100);
       } else {
@@ -188,7 +194,7 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
     register(email?: string, redirectUri?: string) {
       if (keycloak.value) {
         keycloak.value.register({
-          redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value),
+          redirectUri: redirectUri ?? getUrl(),
           loginHint: email ?? '',
           locale: locale.value,
         });
@@ -201,7 +207,7 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
         keycloak.value
           ?.createLoginUrl({
             idpHint: 'google',
-            redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value),
+            redirectUri: redirectUri ?? getUrl(),
           })
           .then((loginUrl) => (window.location.href = `${loginUrl}&prompt=select_account`));
       } else {
@@ -211,7 +217,7 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
     loginWithApple(redirectUri?: string) {
       if (keycloak.value) {
         keycloak.value.login({
-          redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value),
+          redirectUri: redirectUri ?? getUrl(),
           idpHint: 'apple',
           locale: locale.value,
         });
@@ -222,7 +228,7 @@ export const getAuthMethods = ({ dontChangeRedirectUri = ref(false), keycloakRed
     loginWithTelegram(redirectUri?: string) {
       if (keycloak.value) {
         keycloak.value.login({
-          redirectUri: redirectUri ?? getUrl(dontChangeRedirectUri.value),
+          redirectUri: redirectUri ?? getUrl(),
           idpHint: 'telegram',
           locale: locale.value,
         });
@@ -347,6 +353,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
@@ -460,7 +470,7 @@ export const keycloakInit = (dontChangeRedirectUri?: Ref<boolean>, keycloakRedir
 
     keycloakUserData,
 
-    ...getAuthMethods({ dontChangeRedirectUri, keycloakRedirectUriIsLogout }),
+    ...getAuthMethods(),
     getToken,
     isAtExp,
     isRtExp,

package/src/plugins/keycloak.ts

@@ -1,37 +1,22 @@
-import { computed, ref, type App, type Ref } from 'vue';
+import { ref } from 'vue';
 import { createKeycloakInit, getAuthMethods, keycloakInit } from '../composables';
 
-interface KeycloakPluginOptions {
-  dontChangeRedirectUri?: Ref<boolean>;
-  keycloakRedirectUriIsLogout?: Ref<string | undefined>;
-}
-
-let dontChangeRedirectUriInit = ref(false);
-let keycloakRedirectUriIsLogoutInit = ref<string | undefined>(undefined);
-
 export const useKeycloak = () => {
   const keycloak = keycloakInit(ref(false), ref(undefined));
-  const auth = getAuthMethods({
-    dontChangeRedirectUri: dontChangeRedirectUriInit,
-    keycloakRedirectUriIsLogout: keycloakRedirectUriIsLogoutInit,
-  });
-
+  const auth = getAuthMethods();
   return {
     ...keycloak,
     ...auth,
   };
 };
 
-export const createKeycloak = (options: KeycloakPluginOptions = {}) => {
-  const { dontChangeRedirectUri, keycloakRedirectUriIsLogout } = options;
-  dontChangeRedirectUriInit = computed(() => dontChangeRedirectUri?.value ?? false);
-  keycloakRedirectUriIsLogoutInit = computed(() => keycloakRedirectUriIsLogout?.value ?? undefined);
+export const createKeycloak = () => {
   createKeycloakInit();
 };
 
 export const keycloakPlugin = {
-  install(_: App, options: KeycloakPluginOptions = {}) {
-    createKeycloak(options);
+  install() {
+    createKeycloak();
     //app.config.globalProperties.$keycloak = useKeycloak();
   },
 };