From 954d084b4f67ed03a5f9260a1342d172917ad743 Mon Sep 17 00:00:00 2001 From: undefined Date: Sun, 11 Sep 2022 01:48:24 +0800 Subject: [PATCH] ui: remove stupid base32 encoder --- packages/ui-default/package.json | 3 +-- packages/ui-default/pages/home_security.page.ts | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 8f1aabe40..c98758210 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.40.4", + "version": "4.40.5", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", @@ -102,7 +102,6 @@ "stylus-loader": "^7.0.0", "tether": "1.4.7", "tether-drop": "^1.4.2", - "thirty-two": "^1.0.2", "through2": "^4.0.2", "timeago-react": "^3.0.5", "timeago.js": "^4.0.2", diff --git a/packages/ui-default/pages/home_security.page.ts b/packages/ui-default/pages/home_security.page.ts index 7837bc5ac..8d649f1dd 100644 --- a/packages/ui-default/pages/home_security.page.ts +++ b/packages/ui-default/pages/home_security.page.ts @@ -1,6 +1,5 @@ import $ from 'jquery'; import QRCode from 'qrcode'; -import b32 from 'thirty-two'; import { ActionDialog } from 'vj/components/dialog'; import Notification from 'vj/components/notification'; import { NamedPage } from 'vj/misc/Page'; @@ -34,8 +33,7 @@ export default new NamedPage('home_security', () => { return true; }, }).open(); - const secret = b32.encode(crypto.getRandomValues(new Uint8Array(8))) - .toString('utf8').replace(/=/g, '').toUpperCase(); + const secret = String.random(13, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567'); $('#secret').on('click', () => $('#secret').html(secret)); const uri = `otpauth://totp/Hydro:${UserContext.uname}?secret=${secret}&issuer=Hydro`; const canvas = document.getElementById('qrcode');