@vc-shell/framework 1.0.295 → 1.0.297

package/dist/shared/components/sign-in/external-providers.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"external-providers.vue.d.ts","sourceRoot":"","sources":["../../../../shared/components/sign-in/external-providers.vue.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,KAAK;IACpB,SAAS,EAAE,0BAA0B,EAAE,CAAC;CACzC;;AAqED,wBAMG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC"}
+{"version":3,"file":"external-providers.vue.d.ts","sourceRoot":"","sources":["../../../../shared/components/sign-in/external-providers.vue.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,WAAW,KAAK;IACpB,SAAS,EAAE,0BAA0B,EAAE,CAAC;CACzC;;AA+ED,wBAMG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC"}

package/dist/shared/components/sign-in/useExternalProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useExternalProvider.d.ts","sourceRoot":"","sources":["../../../../shared/components/sign-in/useExternalProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAwB,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE9F,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,GAAG,CAAC;QAAE,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;IACpD,MAAM,EAAE,CAAC,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9D,OAAO,EAAE,CAAC,kBAAkB,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,YAAY,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,GAAG,SAAS,CAAC,CAAC;CACvE;AAID,eAAO,MAAM,mBAAmB,QAAO,oBAwFtC,CAAC"}
+{"version":3,"file":"useExternalProvider.d.ts","sourceRoot":"","sources":["../../../../shared/components/sign-in/useExternalProvider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAwB,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE9F,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,GAAG,CAAC;QAAE,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC,CAAC;IACpD,MAAM,EAAE,CAAC,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9D,OAAO,EAAE,CAAC,kBAAkB,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,YAAY,EAAE,MAAM,OAAO,CAAC,0BAA0B,EAAE,GAAG,SAAS,CAAC,CAAC;CACvE;AAID,eAAO,MAAM,mBAAmB,QAAO,oBAgFtC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.295",
+  "version": "1.0.297",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -61,9 +61,9 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/quill": "^2.0.14",
-    "@vc-shell/api-client-generator": "^1.0.295",
-    "@vc-shell/config-generator": "^1.0.295",
-    "@vc-shell/ts-config": "^1.0.295",
+    "@vc-shell/api-client-generator": "^1.0.297",
+    "@vc-shell/config-generator": "^1.0.297",
+    "@vc-shell/ts-config": "^1.0.297",
     "@vitejs/plugin-vue": "5.0.3",
     "cypress-signalr-mock": "^1.5.0",
     "sass": "^1.69.6",

package/shared/components/sign-in/external-provider.vue

@@ -4,7 +4,7 @@
     class="vc-external-provider"
     @click="$emit('signIn')"
   >
-    <div class="vc-external-provider__content">
+    <div class="tw-flex tw-flex-row tw-items-center tw-gap-2">
       <VcImage
         :src="logo"
         class="vc-external-provider__icon"
@@ -28,11 +28,3 @@ export interface Emits {
 defineEmits<Emits>();
 defineProps<Props>();
 </script>
-
-<style lang="scss">
-.vc-external-provider {
-  &__content {
-    @apply tw-flex tw-flex-row tw-items-center tw-gap-2;
-  }
-}
-</style>

package/shared/components/sign-in/external-providers.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="vc-external-providers">
+  <div class="tw-flex tw-justify-center tw-mt-4 tw-flex-wrap tw-gap-2">
     <component
       :is="loadProviderComponent(provider.authenticationType!)"
       v-for="provider in providers"
@@ -13,7 +13,7 @@
 
 <script setup lang="ts">
 import { defineProps, defineAsyncComponent } from "vue";
-import type { Component } from "vue";
+import type { Component, AsyncComponentLoader } from "vue";
 import { ExternalSignInProviderInfo } from "../../../core/api/platform";
 
 export interface Props {
@@ -22,18 +22,22 @@ export interface Props {
 
 defineProps<Props>();
 
-const loadProviderComponent = (providerName: string) => {
-  return defineAsyncComponent<Component>({
-    loader: () => import(/* @vite-ignore */ `./${providerName.toLowerCase()}.vue`),
-    onError(error) {
-      console.error(`Failed to load ${providerName} provider component`, error);
-    },
-  });
+const components = import.meta.glob("./*.vue");
+
+const loadProviderComponent = (providerName: string): Component | null => {
+  const componentPath = `./${providerName.toLowerCase()}.vue`;
+  const loader: AsyncComponentLoader = components[componentPath];
+
+  if (loader !== undefined) {
+    return defineAsyncComponent({
+      loader,
+      onError(error) {
+        console.error(`Failed to load ${providerName} provider component`, error);
+      },
+    });
+  } else {
+    console.error(`Component for provider "${providerName}" not found at path "${componentPath}"`);
+    return null;
+  }
 };
 </script>
-
-<style lang="scss">
-.vc-external-providers {
-  @apply tw-flex tw-justify-center tw-mt-4 tw-flex-wrap tw-gap-2;
-}
-</style>

package/shared/components/sign-in/useExternalProvider.ts

@@ -29,52 +29,44 @@ export const useExternalProvider = (): IUseExternalProvider => {
 
   async function externalSignIn(authenticationType: string, oidcUrl: string) {
     try {
-      const origin = location.origin;
-      const finalReturnUrl = location.pathname ?? getReturnUrlValue() ?? "/";
+      let url_ = window.location.origin + "externalsignin?";
+      const returnUrl = window.location.pathname ?? "/";
 
-      if (!authenticationType) {
-        throw new Error("The parameter 'authenticationType' cannot be null or undefined.");
-      }
-
-      // const oidcUrlObject = new URL(oidcUrl, origin);
-      // const callbackUrl = new URL("/auth/callback", origin);
-      const url = new URL("/externalsignin", origin);
-      console.log("url", url);
+      const signInData = {
+        providerType: authenticationType,
+      };
 
-      // Set query parameters
-      // callbackUrl.searchParams.set("returnUrl", finalReturnUrl);
-      url.searchParams.set("authenticationType", authenticationType);
-      // url.searchParams.set("callbackUrl", callbackUrl.href);
-      url.searchParams.set("returnUrl", finalReturnUrl);
+      externalSignInStorage.value = signInData;
 
-      // Store sign-in data
-      externalSignInStorage.value = { providerType: authenticationType };
+      if (authenticationType === null) throw new Error("The parameter 'authenticationType' cannot be null.");
+      else {
+        if (authenticationType !== undefined)
+          url_ += "authenticationType=" + encodeURIComponent("" + authenticationType) + "&";
+        if (returnUrl !== undefined) url_ += "returnUrl=" + encodeURIComponent("" + returnUrl) + "&";
+      }
+      url_ = url_.replace(/[?&]$/, "");
 
-      console.log("url", url);
-      // Redirect to the constructed URL
-      location.assign(url);
+      window.location.href = url_;
     } catch (e) {
       console.error(e);
+
       throw e;
     }
   }
 
   async function externalSignOut(authenticationType: string): Promise<void> {
     try {
-      const origin = location.origin;
-      const returnUrl = location.pathname ?? "/";
+      let url_ = window.location.origin + "externalsignin/signout?";
 
-      const url = new URL("/externalsignin/signout", origin);
+      if (authenticationType !== undefined)
+        url_ += "authenticationType=" + encodeURIComponent("" + authenticationType) + "&";
+      if (window.location.pathname !== undefined)
+        url_ += "returnUrl=" + encodeURIComponent("" + window.location.pathname) + "&";
 
-      // Set query parameters
-      url.searchParams.set("authenticationType", authenticationType);
-      url.searchParams.set("returnUrl", returnUrl);
+      url_ = url_.replace(/[?&]$/, "");
+      window.location.href = url_;
 
-      // Clear sign-in data
       externalSignInStorage.value = {};
-
-      // Redirect to the sign-out URL
-      location.assign(url);
     } catch (e) {
       console.error(e);
       throw e;