From d1f194128d658fe03af920265b59865ea45fd7c8 Mon Sep 17 00:00:00 2001 From: Yarmo Mackenbach Date: Sun, 2 May 2021 22:48:18 +0200 Subject: [PATCH] Fix profile generation without specified protocol --- routes/main.js | 70 +++++++++++++++++++++++------------------------ routes/profile.js | 10 +++++-- routes/util.js | 20 +++++++------- 3 files changed, 53 insertions(+), 47 deletions(-) diff --git a/routes/main.js b/routes/main.js index e997122..adda9b8 100644 --- a/routes/main.js +++ b/routes/main.js @@ -27,18 +27,18 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see . */ -const router = require('express').Router(); -const md = require('markdown-it')({typographer: true}); -const fs = require('fs'); +const router = require('express').Router() +const md = require('markdown-it')({typographer: true}) +const fs = require('fs') -md.use(require("markdown-it-anchor"), { "level": 2, "permalink": true, "permalinkClass": 'header-anchor', "permalinkSymbol": '¶', "permalinkBefore": false }); -md.use(require("markdown-it-table-of-contents"), { "includeLevel": [2, 3], "listType": "ol" }); -md.use(require('markdown-it-title')); +md.use(require("markdown-it-anchor"), { "level": 2, "permalink": true, "permalinkClass": 'header-anchor', "permalinkSymbol": '¶', "permalinkBefore": false }) +md.use(require("markdown-it-table-of-contents"), { "includeLevel": [2, 3], "listType": "ol" }) +md.use(require('markdown-it-title')) if (process.env.ONION_URL) { router.get('/*', (req, res, next) => { - res.header('Onion-Location', process.env.ONION_URL); - next(); + res.header('Onion-Location', process.env.ONION_URL) + next() }); } @@ -55,47 +55,47 @@ router.get('/', (req, res) => { } } - res.render('index', { highlights: highlights, demoData: require('../server/demo.js').data }); -}); + res.render('index', { highlights: highlights, demoData: require('../server/demo.js').data }) +}) router.get('/about', (req, res) => { - let rawContent = fs.readFileSync(`./content/about.md`, "utf8"); - const content = md.render(rawContent); - res.render(`long-form-content`, { title: `About Keyoxide`, content: content }); -}); + let rawContent = fs.readFileSync(`./content/about.md`, "utf8") + const content = md.render(rawContent) + res.render(`long-form-content`, { title: `About Keyoxide`, content: content }) +}) router.get('/getting-started', (req, res) => { - let rawContent = fs.readFileSync(`./content/getting-started.md`, "utf8"); - const content = md.render(rawContent); - res.render(`long-form-content`, { title: `Getting started`, content: content }); -}); + let rawContent = fs.readFileSync(`./content/getting-started.md`, "utf8") + const content = md.render(rawContent) + res.render(`long-form-content`, { title: `Getting started`, content: content }) +}) router.get('/faq', (req, res) => { - const mdAlt = require('markdown-it')({typographer: true}); - mdAlt.use(require("markdown-it-anchor"), { "level": 2, "permalink": true, "permalinkClass": 'header-anchor', "permalinkSymbol": '¶', "permalinkBefore": false }); - mdAlt.use(require("markdown-it-table-of-contents"), { "includeLevel": [2], "listType": "ul" }); + const mdAlt = require('markdown-it')({typographer: true}) + mdAlt.use(require("markdown-it-anchor"), { "level": 2, "permalink": true, "permalinkClass": 'header-anchor', "permalinkSymbol": '¶', "permalinkBefore": false }) + mdAlt.use(require("markdown-it-table-of-contents"), { "includeLevel": [2], "listType": "ul" }) - let rawContent = fs.readFileSync(`./content/faq.md`, "utf8"); - rawContent = rawContent.replace('${domain}', req.app.get('domain')); - const content = mdAlt.render(rawContent); - res.render(`long-form-content`, { title: `Frequently Asked Questions`, content: content }); -}); + let rawContent = fs.readFileSync(`./content/faq.md`, "utf8") + rawContent = rawContent.replace('${domain}', req.app.get('domain')) + const content = mdAlt.render(rawContent) + res.render(`long-form-content`, { title: `Frequently Asked Questions`, content: content }) +}) router.get('/guides', (req, res) => { - res.render('guides', { title: `Guides - Keyoxide` }); -}); + res.render('guides', { title: `Guides - Keyoxide` }) +}) router.get('/guides/:guideId', (req, res) => { - let env = {}; + let env = {} fs.readFile(`./content/guides/${req.params.guideId}.md`, "utf8", (err, data) => { if (err) { - res.render(`404`); + res.render(`404`) return } - const content = md.render(data, env); - res.render(`long-form-content`, { title: `${env.title} - Keyoxide`, content: content }); - }); -}); + const content = md.render(data, env) + res.render(`long-form-content`, { title: `${env.title} - Keyoxide`, content: content }) + }) +}) -module.exports = router; +module.exports = router diff --git a/routes/profile.js b/routes/profile.js index 95ead2c..6a5d139 100644 --- a/routes/profile.js +++ b/routes/profile.js @@ -62,8 +62,14 @@ router.get('/keybase/:username/:fingerprint', async (req, res) => { res.render('profile', { mode: 'keybase', uid: `${req.params.username}/${req.params.fingerprint}` }) }) -router.get('/:input', async (req, res) => { - res.render('profile', { mode: 'auto', uid: req.params.input }) +router.get('/:id', async (req, res) => { + let data + if (req.params.id.includes('@')) { + data = await kx.generateWKDProfile(req.params.id) + } else { + data = await kx.generateHKPProfile(req.params.id) + } + res.render('profile', { data: data }) }) module.exports = router diff --git a/routes/util.js b/routes/util.js index 3adf603..24b2dd1 100644 --- a/routes/util.js +++ b/routes/util.js @@ -27,34 +27,34 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see . */ -const router = require('express').Router(); +const router = require('express').Router() router.get('/profile-url', function(req, res) { res.render('util/profile-url') -}); +}) router.get('/profile-url/:input', function(req, res) { res.render('util/profile-url', { input: req.params.input }) -}); +}) router.get('/qr', function(req, res) { res.render('util/qr') -}); +}) router.get('/qr/:input', function(req, res) { res.render('util/qr', { input: req.params.input }) -}); +}) router.get('/qrfp', function(req, res) { res.render('util/qrfp') -}); +}) router.get('/qrfp/:input', function(req, res) { res.render('util/qrfp', { input: req.params.input }) -}); +}) router.get('/wkd', function(req, res) { res.render('util/wkd') -}); +}) router.get('/wkd/:input', function(req, res) { res.render('util/wkd', { input: req.params.input }) -}); +}) -module.exports = router; +module.exports = router