[fix] many GitHub copilot bugs

TechQuery · TechQuery · commit 96e9c9bd9aa2 · 2025-09-01T03:19:34.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -35,10 +35,7 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
+.env*local
 
 # vercel
 .vercel
diff --git a/components/Git/Issue/Card.tsx b/components/Git/Issue/Card.tsx
@@ -48,7 +48,7 @@ export const IssueCard: FC<IssueCardProps> = ({
         )}
       </div>
 
-      <article dangerouslySetInnerHTML={{ __html: marked(body || '', { async: false }) as string }} />
+      <article dangerouslySetInnerHTML={{ __html: marked(body || '', { async: false }) }} />
 
       <footer className="flex items-center justify-between">
         {user && (
diff --git a/components/Member/Card.tsx b/components/Member/Card.tsx
@@ -59,7 +59,7 @@ export const MemberCard: FC<MemberCardProps> = observer(
       </ul>
 
       <p
-        dangerouslySetInnerHTML={{ __html: marked((summary as string) || '', { async: false }) as string }}
+        dangerouslySetInnerHTML={{ __html: marked((summary as string) || '', { async: false }) }}
         className="text-neutral-500"
       />
     </li>
diff --git a/components/User/SessionBox.tsx b/components/User/SessionBox.tsx
@@ -1,19 +1,19 @@
+import { User } from '@idea2app/data-server';
 import { Drawer, List, ListItem, ListItemButton, ListItemText } from '@mui/material';
-import { JwtPayload } from 'jsonwebtoken';
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import Link from 'next/link';
+import { JWTProps } from 'next-ssr-middleware';
 import { Component, HTMLAttributes, JSX } from 'react';
 
 import { PageHead } from '../PageHead';
 import { SessionForm } from './SessionForm';
 
 export type MenuItem = Pick<JSX.IntrinsicElements['a'], 'href' | 'title'>;
 
-export interface SessionBoxProps extends HTMLAttributes<HTMLDivElement> {
+export interface SessionBoxProps extends HTMLAttributes<HTMLDivElement>, JWTProps<User> {
   path?: string;
   menu?: MenuItem[];
-  jwtPayload?: JwtPayload;
 }
 
 @observer
@@ -33,7 +33,7 @@ export class SessionBox extends Component<SessionBoxProps> {
         <div>
           <List
             component="nav"
-            className="flex-col px-3 sticky-top"
+            className="sticky-top flex-col px-3"
             style={{ top: '5rem', minWidth: '200px' }}
           >
             {menu.map(({ href, title }) => (
@@ -53,17 +53,14 @@ export class SessionBox extends Component<SessionBoxProps> {
         <main className="flex-1 pb-3">
           <PageHead title={title} />
 
-          <h1 className="text-3xl font-bold mb-4">{title}</h1>
+          <h1 className="mb-4 text-3xl font-bold">{title}</h1>
 
           {children}
 
           <Drawer
             anchor="right"
+            slotProps={{ paper: { className: 'p-4', style: { width: '400px' } } }}
             open={this.modalShown}
-            PaperProps={{
-              className: 'p-4',
-              style: { width: '400px' },
-            }}
             onClose={() => (this.modalShown = false)}
           >
             <SessionForm onSignIn={() => window.location.reload()} />
@@ -72,4 +69,4 @@ export class SessionBox extends Component<SessionBoxProps> {
       </div>
     );
   }
-}
+}
diff --git a/components/User/SessionForm.tsx b/components/User/SessionForm.tsx
@@ -1,3 +1,4 @@
+import { PhoneSignInData } from '@idea2app/data-server';
 import { Button, IconButton, InputAdornment, Tab, Tabs, TextField } from '@mui/material';
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
@@ -10,12 +11,7 @@ import userStore from '../../models/User';
 import { SymbolIcon } from '../Icon';
 
 export interface SessionFormProps {
-  onSignIn?: (data?: SignInData) => any;
-}
-
-export interface SignInData {
-  phone: string;
-  password: string;
+  onSignIn?: (data?: PhoneSignInData) => any;
 }
 
 @observer
@@ -32,11 +28,11 @@ export class SessionForm extends ObservedComponent<SessionFormProps, typeof i18n
     const { t } = this.observedContext;
 
     if (this.signType === 'up') {
-      const { phone } = formToJSON<SignInData>(event.currentTarget.form!);
+      const { mobilePhone } = formToJSON<PhoneSignInData>(event.currentTarget.form!);
 
-      if (!phone) throw new Error(t('phone_required_for_webauthn'));
+      if (!mobilePhone) throw new Error(t('phone_required_for_webauthn'));
 
-      await userStore.signUpWebAuthn(phone);
+      await userStore.signUpWebAuthn(mobilePhone);
     } else {
       await userStore.signInWebAuthn();
     }
@@ -48,18 +44,18 @@ export class SessionForm extends ObservedComponent<SessionFormProps, typeof i18n
     event.stopPropagation();
 
     const { t } = this.observedContext;
-    const { phone, password } = formToJSON<SignInData>(event.currentTarget);
+    const { mobilePhone, password } = formToJSON<PhoneSignInData>(event.currentTarget);
 
     if (this.signType === 'up') {
-      await userStore.signUp(phone, password);
+      await userStore.signUp(mobilePhone, password);
 
       this.signType = 'in';
 
       alert(t('registration_success_please_login'));
     } else {
-      await userStore.signIn(phone, password);
+      await userStore.signIn(mobilePhone, password);
 
-      this.props.onSignIn?.({ phone, password });
+      this.props.onSignIn?.({ mobilePhone, password });
     }
   };
 
@@ -82,7 +78,7 @@ export class SessionForm extends ObservedComponent<SessionFormProps, typeof i18n
         </Tabs>
 
         <TextField
-          name="phone"
+          name="mobilePhone"
           type="tel"
           required
           fullWidth
diff --git a/models/Base.ts b/models/Base.ts
@@ -1,14 +1,14 @@
+import { Base, ListChunk } from '@idea2app/data-server';
 import { HTTPClient } from 'koajax';
 import MIME from 'mime';
 import { githubClient } from 'mobx-github';
 import { TableCellValue, TableCellMedia, TableCellAttachment } from 'mobx-lark';
-import { Filter, ListModel, toggle, IDType, DataObject } from 'mobx-restful';
-import type { PageData } from 'mobx-restful';
+import { Filter, ListModel, toggle, IDType } from 'mobx-restful';
 import { buildURLData } from 'web-utility';
 
-import { API_Host, GITHUB_TOKEN, isServer } from './configuration';
+import { Own_API_Host, GITHUB_TOKEN, isServer } from './configuration';
 
-if (!isServer()) githubClient.baseURI = `${API_Host}/api/GitHub/`;
+if (!isServer()) githubClient.baseURI = `${Own_API_Host}/api/GitHub/`;
 
 githubClient.use(({ request }, next) => {
   if (GITHUB_TOKEN)
@@ -22,7 +22,7 @@ githubClient.use(({ request }, next) => {
 export { githubClient };
 
 export const larkClient = new HTTPClient({
-  baseURI: `${API_Host}/api/Lark/`,
+  baseURI: `${Own_API_Host}/api/Lark/`,
   responseType: 'json',
 });
 
@@ -38,7 +38,7 @@ export function fileURLOf(field: TableCellValue, cache = false) {
   return URI;
 }
 
-export abstract class TableModel<D extends DataObject, F extends Filter<D> = Filter<D>> extends ListModel<
+export abstract class TableModel<D extends Base, F extends Filter<D> = Filter<D>> extends ListModel<
   D,
   F
 > {
@@ -52,7 +52,7 @@ export abstract class TableModel<D extends DataObject, F extends Filter<D> = Fil
   }
 
   async loadPage(pageIndex: number, pageSize: number, filter: F) {
-    const { body } = await this.client.get<{ list: D[], count: number }>(
+    const { body } = await this.client.get<ListChunk<D>>(
       `${this.baseURI}?${buildURLData({ ...filter, pageIndex, pageSize })}`,
     );
 
diff --git a/models/User.ts b/models/User.ts
@@ -1,20 +1,12 @@
+import { User, WebAuthnChallenge } from '@idea2app/data-server';
 import { clear } from 'idb-keyval';
 import { HTTPClient } from 'koajax';
 import { observable, reaction } from 'mobx';
 import { persist, restore, toggle } from 'mobx-restful';
 import { setCookie } from 'web-utility';
-import { User as GitHubUser } from 'mobx-github';
 
 import { TableModel } from './Base';
-import { API_Host, isServer } from './configuration';
-
-export interface User extends GitHubUser {
-  token?: string;
-}
-
-export interface WebAuthnChallenge {
-  string: string;
-}
+import { API_HOST, isServer } from './configuration';
 
 export class UserModel extends TableModel<User> {
   baseURI = 'user';
@@ -29,8 +21,8 @@ export class UserModel extends TableModel<User> {
   );
   restored = !isServer() && restore(this, 'User');
 
-  client = new HTTPClient({ baseURI: API_Host, responseType: 'json' }).use(({ request }, next) => {
-    const isSameDomain = API_Host.startsWith(new URL(request.path, API_Host).origin);
+  client = new HTTPClient({ baseURI: API_HOST, responseType: 'json' }).use(({ request }, next) => {
+    const isSameDomain = API_HOST.startsWith(new URL(request.path, API_HOST).origin);
 
     if (isSameDomain && this.session)
       request.headers = {
diff --git a/models/configuration.ts b/models/configuration.ts
@@ -7,18 +7,20 @@ export const isServer = () => typeof window === 'undefined';
 
 export const { VERCEL, VERCEL_URL, JWT_SECRET, GITHUB_TOKEN, CACHE_REPOSITORY } = process.env;
 
-export const API_Host = isServer()
+export const Own_API_Host = isServer()
   ? VERCEL_URL
     ? `https://${VERCEL_URL}`
     : 'http://localhost:3000'
   : globalThis.location.origin;
 
+export const API_HOST = process.env.NEXT_PUBLIC_API_HOST!;
+
 export const CACHE_HOST = process.env.NEXT_PUBLIC_CACHE_HOST!,
   CrawlerEmail = `crawler@idea2.app`;
 
 export const ProxyBaseURL = `https://idea2.app/proxy`;
 
-export const LARK_API_HOST = `${API_Host}/api/Lark/`;
+export const LARK_API_HOST = `${Own_API_Host}/api/Lark/`;
 
 export const LarkAppMeta = {
   id: process.env.LARK_APP_ID!,
diff --git a/next.config.ts b/next.config.ts
@@ -45,7 +45,7 @@ const nextConfig = withPWA({
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return config;
   },
-  rewrites: rewrites as any,
+  rewrites,
 });
 
 export default isDev || !SENTRY_AUTH_TOKEN
diff --git a/package.json b/package.json
@@ -12,7 +12,6 @@
     "@emotion/server": "^11.11.0",
     "@emotion/styled": "^11.14.1",
     "@giscus/react": "^3.1.0",
-    "@idea2app/data-server": "^1.0.0-rc.0",
     "@koa/bodyparser": "^6.0.0",
     "@koa/router": "^14.0.0",
     "@mui/lab": "^7.0.0-beta.16",
@@ -51,6 +50,7 @@
     "@cspell/eslint-plugin": "^9.2.0",
     "@eslint/compat": "^1.3.2",
     "@eslint/js": "^9.34.0",
+    "@idea2app/data-server": "^1.0.0-rc.0",
     "@next/eslint-plugin-next": "^15.5.2",
     "@stylistic/eslint-plugin": "^5.2.3",
     "@tailwindcss/postcss": "^4.1.12",
@@ -82,6 +82,7 @@
     "typescript-eslint": "^8.41.0"
   },
   "resolutions": {
+    "mobx-github": "$mobx-github",
     "next": "$next"
   },
   "pnpm": {
@@ -107,6 +108,7 @@
     "*.{html,md,less,json,yml,js,mjs,ts,tsx}": "prettier --write"
   },
   "scripts": {
+    "e": "pnpx dotenv-cli -e .env.personal.local -- pnpm",
     "prepare": "husky || true",
     "install": "xgit download https://github.com/idea2app/key-vault main idea2app.github.io  ||  true",
     "dev": "next dev",
diff --git a/pages/dashboard/index.tsx b/pages/dashboard/index.tsx
@@ -1,3 +1,4 @@
+import { User } from '@idea2app/data-server';
 import { Container, Typography } from '@mui/material';
 import { observer } from 'mobx-react';
 import { useRouter } from 'next/router';
@@ -7,7 +8,7 @@ import { FC, useContext } from 'react';
 import { SessionBox } from '../../components/User/SessionBox';
 import { I18nContext } from '../../models/Translation';
 
-interface DashboardPageProps extends JWTProps {}
+interface DashboardPageProps extends JWTProps<User> {}
 
 export const getServerSideProps = compose<{}, DashboardPageProps>(jwtVerifier());
 
@@ -16,15 +17,10 @@ const DashboardPage: FC<DashboardPageProps> = observer(({ jwtPayload }) => {
   const i18n = useContext(I18nContext);
   const { t } = i18n;
 
-  const menuItems = [{ href: '/dashboard', title: t('overview') }];
+  const menu = [{ href: '/dashboard', title: t('overview') }];
 
   return (
-    <SessionBox
-      title={t('backend_management')}
-      path={asPath}
-      menu={menuItems}
-      jwtPayload={jwtPayload}
-    >
+    <SessionBox title={t('backend_management')} path={asPath} {...{ menu, jwtPayload }}>
       <Container maxWidth="lg" className="py-16 text-center">
         <Typography variant="h3" component="h1">
           {t('welcome_use')}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/translation/zh-CN.ts b/translation/zh-CN.ts
@@ -88,6 +88,6 @@ export default {
   overview: '概览',
   profile: '个人资料',
   settings: '设置',
-  phone_required_for_webauthn: '手机号是WebAuthn注册的必填项',
+  phone_required_for_webauthn: '手机号是 WebAuthn 注册的必填项',
   registration_success_please_login: '注册成功，请登录',
 } as const;
diff --git a/translation/zh-TW.ts b/translation/zh-TW.ts
@@ -87,6 +87,6 @@ export default {
   overview: '概覽',
   profile: '個人資料',
   settings: '設定',
-  phone_required_for_webauthn: '手機號是WebAuthn註冊的必填項',
+  phone_required_for_webauthn: '手機號是 WebAuthn 註冊的必填項',
   registration_success_please_login: '註冊成功，請登入',
 } as const;
