[fix] some detail bugs

Signed-off-by: TechQuery <shiy2008@gmail.com>

models/Base/User.ts

@@ -61,13 +61,6 @@ export class UserModel extends BaseListModel<User> {
     return (this.session = body!);
   }
 
-  @toggle('downloading')
-  async getSession() {
-    const { body } = await this.client.get<User>(`${this.baseURI}/session`);
-
-    return (this.session = body!);
-  }
-
   async signOut() {
     this.session = undefined;
 

models/Personnel/Election.ts

@@ -1,17 +1,18 @@
+import { VoteTicket } from '@kaiyuanshe/kys-service';
 import { observable } from 'mobx';
 import { BaseModel, persist, restore, toggle } from 'mobx-restful';
 
+import { isServer } from '../Base';
 import userStore from '../Base/User';
 
-export interface VoteTicket {
-  electionName: string;
-  publicKey: string;
-  signature: string;
-}
+export const buffer2hex = (buffer: ArrayBufferLike) =>
+  Array.from(new Uint8Array(buffer), x => x.toString(16).padStart(2, '0')).join(
+    '',
+  );
 
 export class ElectionModel extends BaseModel {
   client = userStore.client;
-  algorithm = { name: 'ECDSA', namedCurve: 'P-384' };
+  algorithm = { name: 'ECDSA', namedCurve: 'P-384', hash: { name: 'SHA-256' } };
 
   @persist()
   @observable
@@ -25,7 +26,7 @@ export class ElectionModel extends BaseModel {
   @observable
   accessor currentVoteTicket: VoteTicket | undefined;
 
-  restored = restore(this, 'Electron');
+  restored = !isServer() && restore(this, 'Electron');
 
   @toggle('uploading')
   async makePublicKey() {
@@ -47,17 +48,21 @@ export class ElectionModel extends BaseModel {
 
   @toggle('uploading')
   async savePublicKey(electionName: string, jsonWebKey = this.publicKey) {
+    await userStore.restored;
+
     const { body } = await this.client.post(
       `election/${electionName}/public-key`,
       { jsonWebKey },
     );
-    await userStore.getSession();
-
     return body!;
   }
 
   @toggle('uploading')
   async signVoteTicket(electionName: string) {
+    await this.restored;
+
+    if (this.currentVoteTicket) return this.currentVoteTicket;
+
     await this.makePublicKey();
     await this.savePublicKey(electionName);
 
@@ -69,7 +74,7 @@ export class ElectionModel extends BaseModel {
     return (this.currentVoteTicket = {
       electionName,
       publicKey: this.publicKey,
-      signature: new TextDecoder().decode(signature),
+      signature: buffer2hex(signature),
     });
   }
 }

package.json

@@ -59,7 +59,7 @@
     "@eslint/compat": "^1.2.5",
     "@eslint/eslintrc": "^3.2.0",
     "@eslint/js": "^9.18.0",
-    "@kaiyuanshe/kys-service": "^1.0.0-rc.1",
+    "@kaiyuanshe/kys-service": "^1.0.0-rc.2",
     "@softonus/prettier-plugin-duplicate-remover": "^1.1.2",
     "@types/eslint-config-prettier": "^6.11.3",
     "@types/eslint__eslintrc": "^2.1.2",

pages/election/[year]/vote.tsx

@@ -47,33 +47,32 @@ export default class ElectionVotePage extends Component<
     await this.electionStore.signVoteTicket(this.electionName);
   }
 
-  renderVoteForm = () => (
-    <SessionBox autoCover>
-      <Row xs={1} sm={2}>
-        <Col>
-          <h2 className="text-center">{t('director_election_voting')}</h2>
-          <iframe
-            className="w-100 vh-100 border-0"
-            src={`${VoteForm.理事}?${this.formData}`}
-          />
-        </Col>
-        <Col>
-          <h2 className="text-center">{t('member_application_voting')}</h2>
-          <iframe
-            className="w-100 vh-100 border-0"
-            src={`${VoteForm.正式成员}?${this.formData}`}
-          />
-        </Col>
-      </Row>
-    </SessionBox>
+  renderVoteForm = (formData: URLSearchParams) => (
+    <Row xs={1} sm={2}>
+      <Col>
+        <h2 className="text-center">{t('director_election_voting')}</h2>
+        <iframe
+          className="w-100 vh-100 border-0"
+          src={`${VoteForm.理事}?${formData}`}
+        />
+      </Col>
+      <Col>
+        <h2 className="text-center">{t('member_application_voting')}</h2>
+        <iframe
+          className="w-100 vh-100 border-0"
+          src={`${VoteForm.正式成员}?${formData}`}
+        />
+      </Col>
+    </Row>
   );
 
   render() {
-    const { year } = this.props.route.params!,
+    const { props, electionStore, formData } = this;
+    const { year } = props.route.params!,
       electionVoting = textJoin(t('election'), t('voting'));
 
     const title = `${year} ${electionVoting}`,
-      loading = this.electionStore.uploading > 0;
+      loading = electionStore.uploading > 0;
 
     return (
       <Container className="my-4">
@@ -88,7 +87,9 @@ export default class ElectionVotePage extends Component<
 
         {loading && <Loading />}
 
-        {this.renderVoteForm()}
+        <SessionBox autoCover>
+          {formData && this.renderVoteForm(formData)}
+        </SessionBox>
       </Container>
     );
   }

translation/en-US.ts

@@ -288,10 +288,6 @@ export default {
   this_term_proposition: 'This term proposition',
   recommendation: 'recommendation',
   vote_for_me: 'Vote for Me',
-  vote_code_save_tips:
-    'Please copy the one-time "Vote Verification Code" of this election to avoid being unable to vote when this page is accidentally closed and reopened.',
-  vote_code_fill_tips:
-    'Please paste the "Vote Verification Code" copied when you first opened this voting page below.',
 
   // Member pages
   related: 'Related',

translation/zh-CN.ts

@@ -281,10 +281,6 @@ export default {
   this_term_proposition: '本届主张',
   recommendation: '推荐语',
   vote_for_me: '投我一票',
-  vote_code_save_tips:
-    '请复制本次选举的一次性“投票校验码”，以免本页面意外关闭后再次打开时无法投票。',
-  vote_code_fill_tips:
-    '请将本次选举首次打开本投票页时复制的“投票校验码”粘贴于下方投票表单内。',
 
   // Member pages
   related: '相关',

translation/zh-TW.ts

@@ -281,10 +281,6 @@ export default {
   this_term_proposition: '本屆主張',
   recommendation: '推薦語',
   vote_for_me: '投我一票',
-  vote_code_save_tips:
-    '請複製本次選舉的一次性“投票校驗碼”，以免本頁面意外關閉後再次打開時無法投票。',
-  vote_code_fill_tips:
-    '請將本次選舉首次打開本投票頁時複製的“投票校驗碼”粘貼於下方投票表單內。',
 
   // Member pages
   related: '相關',