@@ -39,19 +26,6 @@ export default function DashboardPage() {
-
-
-
-
- Your account isn't confirmed yet. Please check your inbox and confirm your account.
- Otherwise your account will be deactivate after 48 hours.
-
-
-
-
-
Notifications
-
-
-
-
-
- | You're done! There are no notifications unread for you. |
-
-
-
-
-
0}>
-
-
-
- {item =>
-
-
- {item.subject}
- {item.content}
-
- |
-
- }
-
-
-
-
-
-
-
);
}
\ No newline at end of file
diff --git a/pkg/view/src/stores/userinfo.tsx b/pkg/view/src/stores/userinfo.tsx
index fd4d10f..7bf0c8f 100644
--- a/pkg/view/src/stores/userinfo.tsx
+++ b/pkg/view/src/stores/userinfo.tsx
@@ -1,95 +1,91 @@
import Cookie from "universal-cookie";
-import { createContext, useContext } from "solid-js";
-import { createStore } from "solid-js/store";
+import {createContext, useContext} from "solid-js";
+import {createStore} from "solid-js/store";
export interface Userinfo {
- isLoggedIn: boolean,
- displayName: string,
- profiles: any,
- meta: any
+ isLoggedIn: boolean,
+ displayName: string,
+ profiles: any,
}
const UserinfoContext = createContext
();
const defaultUserinfo: Userinfo = {
- isLoggedIn: false,
- displayName: "Citizen",
- profiles: null,
- meta: null
+ isLoggedIn: false,
+ displayName: "Citizen",
+ profiles: null,
};
const [userinfo, setUserinfo] = createStore(structuredClone(defaultUserinfo));
export function getAtk(): string {
- return new Cookie().get("access_token");
+ return new Cookie().get("access_token");
}
export async function refreshAtk() {
- const rtk = new Cookie().get("refresh_token");
+ const rtk = new Cookie().get("refresh_token");
- const res = await fetch("/api/auth/token", {
- method: "POST",
- headers: { "Content-Type": "application/json" },
- body: JSON.stringify({
- refresh_token: rtk,
- grant_type: "refresh_token"
- })
- });
- if (res.status !== 200) {
- console.error(await res.text())
- } else {
- const data = await res.json();
- new Cookie().set("access_token", data["access_token"], { path: "/", maxAge: undefined });
- new Cookie().set("refresh_token", data["refresh_token"], { path: "/", maxAge: undefined });
- }
+ const res = await fetch("/api/auth/refresh", {
+ method: "POST",
+ headers: {"Content-Type": "application/json"},
+ body: JSON.stringify({
+ refresh_token: rtk,
+ })
+ });
+ if (res.status !== 200) {
+ console.error(await res.text())
+ } else {
+ const data = await res.json();
+ new Cookie().set("access_token", data["access_token"], {path: "/", maxAge: undefined});
+ new Cookie().set("refresh_token", data["refresh_token"], {path: "/", maxAge: undefined});
+ }
}
function checkLoggedIn(): boolean {
- return new Cookie().get("access_token");
+ return new Cookie().get("access_token");
}
export async function readProfiles(recovering = true) {
- if (!checkLoggedIn()) return;
+ if (!checkLoggedIn()) return;
- const res = await fetch("/api/users/me", {
- headers: { "Authorization": `Bearer ${getAtk()}` }
- });
+ const res = await fetch("/api/users/me", {
+ headers: {"Authorization": `Bearer ${getAtk()}`}
+ });
- if (res.status !== 200) {
- if (recovering) {
- // Auto retry after refresh access token
- await refreshAtk();
- return await readProfiles(false);
- } else {
- clearUserinfo();
- window.location.reload();
+ if (res.status !== 200) {
+ if (recovering) {
+ // Auto retry after refresh access token
+ await refreshAtk();
+ return await readProfiles(false);
+ } else {
+ clearUserinfo();
+ window.location.reload();
+ }
}
- }
- const data = await res.json();
+ const data = await res.json();
- setUserinfo({
- isLoggedIn: true,
- displayName: data["nick"],
- profiles: null,
- meta: data
- });
+ setUserinfo({
+ isLoggedIn: true,
+ displayName: data["name"],
+ profiles: data,
+ });
}
export function clearUserinfo() {
- new Cookie().remove("access_token", { path: "/", maxAge: undefined });
- new Cookie().remove("refresh_token", { path: "/", maxAge: undefined });
- setUserinfo(defaultUserinfo);
+ new Cookie().remove("access_token", {path: "/", maxAge: undefined});
+ new Cookie().remove("refresh_token", {path: "/", maxAge: undefined});
+ setUserinfo(defaultUserinfo);
}
export function UserinfoProvider(props: any) {
- return (
-
- {props.children}
-
- );
+ return (
+
+ {props.children}
+
+ );
}
export function useUserinfo() {
- return useContext(UserinfoContext);
+ return useContext(UserinfoContext);
}
\ No newline at end of file
diff --git a/pkg/view/vite.config.ts b/pkg/view/vite.config.ts
index e8abad0..dec5cb7 100644
--- a/pkg/view/vite.config.ts
+++ b/pkg/view/vite.config.ts
@@ -6,8 +6,8 @@ export default defineConfig({
plugins: [devtools({ autoname: true }), solid()],
server: {
proxy: {
- "/api": "http://localhost:8444",
- "/.well-known": "http://localhost:8444"
+ "/api": "http://localhost:8445",
+ "/.well-known": "http://localhost:8445"
}
}
});