add tests

.eslintignore

@@ -1,3 +1,4 @@
 dist
 *.d.ts
-*.js
+*.js
+test

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
       uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./coverage/lcov.info
+        file: ./.coverage/lcov.info
         name: codecov
     - name: Publish
       run: node build/publish.js

.gitignore

@@ -22,4 +22,6 @@ packages/**/*.js
 packages/**/*.js.map
 packages/**/*.d.ts
 
-*.mmdb
+*.mmdb
+
+.coverage

jest.config.js

@@ -9,9 +9,8 @@ module.exports = {
     preset: 'ts-jest',
     testEnvironment: 'node',
     moduleFileExtensions: ['ts', 'js', 'json'],
-    moduleNameMapper: {
+    collectCoverage: true,
-        '[\\w-]+': '<rootDir>/packages/$0/src',
+    coverageDirectory: '<rootDir>/.coverage',
-    },
     coverageProvider: 'v8',
     coverageReporters: ['text', 'lcov'],
     coveragePathIgnorePatterns: [

package.json

@@ -16,6 +16,7 @@
     "license": "AGPL-3.0-only",
     "devDependencies": {
         "@types/cross-spawn": "^6.0.2",
+        "@types/jest": "^26.0.9",
         "@types/node": "^14.0.27",
         "@typescript-eslint/eslint-plugin": "^3.8.0",
         "@typescript-eslint/parser": "^3.8.0",
@@ -36,4 +37,4 @@
         "fs-extra": "^9.0.1",
         "yargs": "^15.4.1"
     }
-}
+}

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.12.11",
+    "version": "2.12.12",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/src/entry/setup.ts

@@ -52,12 +52,6 @@ class Loader {
                         <input name="name" type="text" value="hydro">
                       </label>
                     </div></div>
-                    <div class="row"><div class="columns">
-                      <label class="inverse material textbox">
-                        {{ _('Table Prefix') }}
-                        <input name="prefix" type="text" placeholder="{{ _('Leave blank if none') }}">>
-                      </label>
-                    </div></div>
                     <div class="row"><div class="columns">
                       <label class="inverse material textbox">
                         {{ _('Database Username') }}
@@ -109,7 +103,7 @@ async function get(ctx: Context) {
 
 async function post(ctx: Context) {
     const {
-        host, port, name, username, password, prefix,
+        host, port, name, username, password,
     } = ctx.request.body;
     let mongourl = 'mongodb://';
     if (username) mongourl += `${username}:${password}@`;
@@ -119,7 +113,7 @@ async function post(ctx: Context) {
             useNewUrlParser: true, useUnifiedTopology: true,
         });
         const db = Database.db(name);
-        const coll = prefix ? db.collection('system') : db.collection(`${prefix}.system`);
+        const coll = db.collection('system');
         await Promise.all([
             coll.updateOne(
                 { _id: 'server.host' },

packages/hydrooj/test/lib.pwhash.spec.ts

@@ -0,0 +1,14 @@
+import 'hydrooj';
+import pwhash from 'hydrooj/src/lib/hash.hydro';
+import 'hydrooj/src/utils';
+
+describe('Hash', () => {
+    test('server', () => {
+        const password1 = 'password1';
+        const salt1 = '0326Bc23E6fac733K01g29fBBUSAj7O4';
+        const salt2 = String.random(32);
+        const hash1 = '70a2db6a53ecd75d8d4b19d8647a416b4e812c1a6635c4a1f5069a00382fdcb6';
+        expect(pwhash(password1, salt1)).toStrictEqual(hash1);
+        expect(pwhash(password1, salt2)).not.toEqual(hash1);
+    });
+});