my changes

nejc-skerjanc · nejc-skerjanc · commit 50633cad2493 · 2021-03-15T09:02:38.000Z
diff --git a/haproxy-webauthn.cfg b/haproxy-webauthn.cfg
@@ -4,8 +4,9 @@ defaults
    timeout server  50000ms
 
 frontend https-in
-   bind *:7000 ssl crt ./localhostca.pem
+   bind *:443 ssl crt ./ubiworldca.pem
    use_backend http_backend
 
 backend http_backend
-   server server1 localhost:8000
+   redirect scheme https if !{ ssl_fc }
+   server server1 localhost:8000 check
diff --git a/package.json b/package.json
@@ -23,6 +23,8 @@
    },
    "license": "MIT",
    "devDependencies": {
+      "@babel/preset-env": "^7.13.9",
+      "@babel/preset-react": "^7.12.13",
       "@types/cbor": "^2.0.0",
       "@types/express": "^4.16.1",
       "@types/node": "^11.13.7",
@@ -40,6 +42,7 @@
       "tslint": "^5.16.0",
       "tslint-eslint-rules": "^5.4.0",
       "typescript": "^3.4.5",
+      "util": "^0.12.3",
       "webpack": "^4.30.0",
       "webpack-cli": "^3.3.1",
       "webpack-dev-middleware": "^3.6.2",
@@ -48,9 +51,11 @@
    "dependencies": {
       "@types/elliptic": "^6.4.6",
       "cbor": "^4.1.5",
+      "cbor-web": "^7.0.3",
       "elliptic": "^6.4.1",
       "eosjs": "file:external/eosjs",
       "eosjs-ecc": "^4.0.4",
+      "fast-text-encoding": "^1.0.3",
       "node-fetch": "^2.3.0",
       "react": "^16.8.6",
       "react-dom": "^16.8.6",
diff --git a/src/client/ClientRoot.tsx b/src/client/ClientRoot.tsx
diff --git a/src/client/index.html b/src/client/index.html
@@ -3,6 +3,8 @@
 
 <head>
     <meta charset="UTF-8">
+    <!--<script src='https://unpkg.com/bignumber.js'></script>
+    <script src='https://unpkg.com/cbor-web'></script>-->
     <title>Something goes here...</title>
 </head>
 
diff --git a/src/server/server-loader.js b/src/server/server-loader.js
@@ -2,8 +2,20 @@ const express = require('express');
 const webpack = require('webpack');
 const webpackDevMiddleware = require('webpack-dev-middleware');
 
+const fs = require('fs');
+
 const app = express();
 const server = require('http').Server(app);
+
+var options = {
+    key: fs.readFileSync('./ubiworldca.pem'),
+    cert: fs.readFileSync('./ubiworldca.pem')
+  };
+
+const https = require('https');
+
+const serverhttps = https.createServer(options, app);
+
 const config = require('../../webpack.config.js');
 const compiler = webpack(config);
 
@@ -31,12 +43,12 @@ app.use(function (req, res, next) {
     getServerMain().router(req, res, next);
 })
 
-let io = require('socket.io')(server);
+let io = require('socket.io')(serverhttps);
 io.on('connection', socket => {
     getServerMain().connected(socket);
 });
 
-server.listen(8000);
+serverhttps.listen(8000);
 
 const formatHost = {
     getCanonicalFileName: path => path,
diff --git a/src/server/server.ts b/src/server/server.ts
@@ -1,17 +1,17 @@
-import * as cbor from 'cbor';
-import { Numeric, Serialize } from 'eosjs';
+//import * as util from 'util';
+//import * as cbor from 'cbor';
+//import { Numeric, Serialize } from 'eosjs';
 import * as express from 'express';
 import * as fs from 'fs';
 import * as SocketIO from 'socket.io';
-import * as util from 'util';
 import { Key } from '../common/Key';
 
 const keysPath = 'keys.json';
 
 let unloadedModule = false;
 export const router = express.Router();
 
-const textDecoder = new util.TextDecoder();
+//const textDecoder = new util.TextDecoder();
 
 interface AddKeyArgs {
     rpid: string;
@@ -58,17 +58,18 @@ async function sendKeys() {
 
 async function addKey(k: AddKeyArgs) {
     try {
-        const decoded = await decodeKey(k);
+        var r = 9;
+        /*const decoded = await decodeKey(k);
         console.log(decoded);
         keys.push(decoded);
         fs.writeFileSync(keysPath, JSON.stringify(keys, null, 4));
-        sendKeys();
+        sendKeys();*/
     } catch (e) {
         console.log('??????', e);
         socket.emit('err', e.message);
     }
 }
-
+/*
 async function decodeKey(k: AddKeyArgs): Promise<Key> {
     // todo: check RP ID hash
     // todo: check signature
@@ -134,6 +135,7 @@ async function decodeKey(k: AddKeyArgs): Promise<Key> {
         key,
     };
 }
+*/
 
 let socketIO: SocketIO.Server;
 export function start(io: SocketIO.Server) {
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,9 @@
 {
     "compilerOptions": {
+        "typeRoots": [
+            //"node_modules",
+            "node_modules/@types"
+        ],
         "module": "es2015",
         "target": "es2017",
         "outDir": "dist",
@@ -14,6 +18,9 @@
     },
     "include": [
         "src/**/*.ts",
-        "node_modules/eosjs/**/*.d.ts"
-    ]
+        "node_modules/eosjs/**/*.d.ts",
+        "node_modules/@types", 
+        "src/client/customUtils.ts",
+        //"src/client/utils/customUtils.d.ts"    
+]
 }
diff --git a/tsconfig.server.json b/tsconfig.server.json
@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+        "typeRoots": ["node_modules/@types"],
         "module": "umd",
         "target": "es2017",
         "outDir": "dist",
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
+const { WebpackError } = require('webpack');
 
 module.exports = {
     entry: {
@@ -23,7 +24,11 @@ module.exports = {
         ]
     },
     resolve: {
-        extensions: ['.tsx', '.ts', '.js']
+        extensions: ['.tsx', '.ts', '.js'],
+        alias: {
+            util3: require.resolve("util/"),
+            utils: path.resolve(__dirname, 'src/client/utils/'),
+        }
     },
     devtool: 'inline-source-map',
     devServer: {
@@ -40,8 +45,13 @@ module.exports = {
         new webpack.NoEmitOnErrorsPlugin(),
     ],
     output: {
+        libraryExport: 'default', //Nejc's line
         filename: '[name].bundle.js',
         path: path.resolve(__dirname, 'dist'),
         publicPath: '/'
+    },
+    node: {
+        fs: "empty",
+        net: 'empty'
     }
 };
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
	`3`	`+ "typeRoots": ["node_modules/@types"],`
`3`	`4`	`"module": "umd",`
`4`	`5`	`"target": "es2017",`
`5`	`6`	`"outDir": "dist",`