{title}
++
+
+
+
+
diff --git a/web/src/App.tsx b/web/src/App.tsx
deleted file mode 100644
index fa875f43..00000000
--- a/web/src/App.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import HelloDemo from "./components";
-import {HttpClientProvider} from "./http/HttpClientContext";
-import {MantineProvider} from '@mantine/core'
-
-function App() {
-
- const serviceUrl = import.meta.env.VITE_SERVICE_URL as string || "";
- console.log(import.meta.env.MODE);
-
- return (
- Demo
--
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ v>
+
+
+
+
+
+{app.name}
+
+ Admin
+ +User name: {result} + + +
+
+
+
+
+ 
+
+
+
+
+
+ - HelloDemo -- ); -} - -export default HelloDemo; - diff --git a/web/src/components/PLA.svelte b/web/src/components/PLA.svelte new file mode 100644 index 00000000..e2c775d5 --- /dev/null +++ b/web/src/components/PLA.svelte @@ -0,0 +1,7 @@ + + + +
+
+
diff --git a/web/src/components/PLToggle.svelte b/web/src/components/PLToggle.svelte
new file mode 100644
index 00000000..452af02a
--- /dev/null
+++ b/web/src/components/PLToggle.svelte
@@ -0,0 +1,52 @@
+
+
+
+
diff --git a/web/src/components/index.ts b/web/src/components/index.ts
deleted file mode 100644
index b11ca639..00000000
--- a/web/src/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './HelloDemo';
diff --git a/web/src/favicon.svg b/web/src/favicon.svg
deleted file mode 100644
index de4aeddc..00000000
--- a/web/src/favicon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
diff --git a/web/src/http/HttpClient.ts b/web/src/http/HttpClient.ts
index 962bb455..cefbfec5 100644
--- a/web/src/http/HttpClient.ts
+++ b/web/src/http/HttpClient.ts
@@ -1,15 +1,108 @@
+import type {AuthResult} from "./generated";
+import {AuthResourceApiFactory, GreetingResourceApiFactory} from "./generated";
+import applyCaseConverter from "axios-case-converter";
+import axios from "axios";
+import {authData, store} from "../auth/AuthStore";
+import {loginModule} from "../settings";
+import {navigateTo} from "svelte-router-spa";
-import React from 'react';
-import HttpContext from './HttpClientContext';
+let auth: AuthResult = null;
+let refresh = false;
-const useHttpClient = () => {
- const httpClient = React.useContext(HttpContext);
+const axiosInstance = applyCaseConverter(
+ axios.create({
+ timeout: 10000,
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+);
- if (!httpClient) {
- throw new Error('The Http Client was not initialized.');
+function setAuthData(value: AuthResult) {
+ console.log("token changed");
+ auth = value;
+ axiosInstance.defaults.headers.common['Authorization'] = `Bearer ${auth?.token}`;
+}
+
+authData.subscribe(value => {
+ setAuthData(value);
+});
+
+const gotoLogin = () => {
+ console.log("redirect to login");
+ navigateTo(loginModule.href);
+}
+
+axiosInstance.interceptors.response.use(resp => resp, async error => {
+ if (error.response.status === 401 && !refresh) {
+ refresh = true;
+ const response = await refreshToken();
+ if (response.status === 200) {
+ store.setAuthData(response.data);
+ setAuthData(response.data);
+ error.config.headers.Authorization = `Bearer ${response.data.token}`;
+ refresh = false;
+ return axiosInstance(error.config);
+ }
}
+ refresh = false;
+ gotoLogin();
+ return
+});
+
+const refreshToken = async () => {
+ try {
+ console.log("refreshToken")
+ const response = await httpClient.auth.apiAuthRefreshGet(
+ {
+ headers: {
+ Authorization: `Bearer ${auth?.refreshToken}`
+ }
+ }
+ )
+ const authResult = response.data;
+ if (!authResult?.token) {
+ console.log("refreshToken failed")
+ store.clearAuthData();
+ return response
+ }
+ console.log("refreshToken ok")
+ return response;
+ } catch (error) {
+ console.log("refreshToken failed", error)
+ store.clearAuthData();
+ }
+ }
+;
- return httpClient;
+// axiosInstance.interceptors.request.use(async (config) => {
+// if (config.url.endsWith("/auth/signin")) {
+// return config;
+// }
+// let token = auth?.token;
+// if (config.url.endsWith("/auth/refresh")) {
+// token = auth?.refreshToken;
+// }
+// if (token) {
+// config.headers.Authorization = `Bearer ${token}`;
+// } else {
+// gotoLogin();
+// }
+// return config;
+// },
+// function (error) {
+// console.log(error);
+// return Promise.reject(error);
+// }
+// );
+
+const getFactory = (baseUrl: string) => {
+ console.log("base url: " + baseUrl);
+ return {
+ hello: GreetingResourceApiFactory(undefined, baseUrl, axiosInstance),
+ auth: AuthResourceApiFactory(undefined, baseUrl, axiosInstance)
+ }
};
-export default useHttpClient;
+export const httpClient = getFactory(import.meta.env.VITE_BASE_URL)
+
diff --git a/web/src/http/HttpClientContext.tsx b/web/src/http/HttpClientContext.tsx
deleted file mode 100644
index 6fcb2ab9..00000000
--- a/web/src/http/HttpClientContext.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, {useEffect, useState} from "react";
-import {GreetingResourceApi} from "./generated";
-import {AxiosInstance} from "axios";
-import axiosInstance from './getAxiosInstance';
-
-// @ts-ignore
-const HttpContext = React.createContext
+
+
+ +
+
diff --git a/web/src/lib/Logo.svelte b/web/src/lib/Logo.svelte
new file mode 100644
index 00000000..1af3dc40
--- /dev/null
+++ b/web/src/lib/Logo.svelte
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {#if fiteredData.length > 0}
+ -
+ {#each fiteredData as item}
+
+ {/each}
+