From acdea924a2a7cdd2dc1fdb83ff6cac2eeef26526 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Tue, 27 Nov 2018 08:23:23 +1100 Subject: [PATCH] Updated Webpack, built extremely basic blog insertion tool. --- package.json | 2 +- .../server/api/methods/blog/CreateBlogPost.js | 86 +++++++++++++++++++ .../server/api/methods/blog/GetBlogArticle.js | 5 +- .../api/methods/blog/GetBlogArticles.js | 5 +- 4 files changed, 89 insertions(+), 9 deletions(-) create mode 100644 private/server/api/methods/blog/CreateBlogPost.js diff --git a/package.json b/package.json index 9dfcd04..42f8026 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "terser-webpack-plugin": "^1.1.0", "uglifyjs-webpack-plugin": "^2.0.1", "url-loader": "^1.1.2", - "webpack": "^4.22.0" + "webpack": "^4.26.1" }, "devDependencies": { "nodemon": "^1.18.4", diff --git a/private/server/api/methods/blog/CreateBlogPost.js b/private/server/api/methods/blog/CreateBlogPost.js new file mode 100644 index 0000000..eac806e --- /dev/null +++ b/private/server/api/methods/blog/CreateBlogPost.js @@ -0,0 +1,86 @@ +// Copyright (c) 2018 Dominic Masters +// +// MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +const APIHandler = require('./../../APIHandler'); + +const ERRORS = { + password: 'Missing, or invalid password', + title: 'Missing or invalid title', + image: 'Missing or invalid image', + shortDescription: 'Missing or invalid Short Description', + description: 'Missing or invalid description', + internal: 'An internal error occurred' +}; + +const LENGTHS = { + title: 128, + image: 512, + shortDescription: 2048, + description: 65536 +}; + +module.exports = class GetBlogArticle extends APIHandler { + constructor(api) { + super(api, ['POST'], '/blog/article'); + } + + async handle(request) { + //Until we have the server running passport or some other auth service... + if(!request.hasString('password', 128)) return { ok: false, data: ERRORS.password }; + let password = request.getString('password', 128); + if(password !== request.getApp().getConfig().get('admin.password')) return { ok: false, data: ERRORS.password }; + //Everything after this point should be fine to keep. + + if(!request.hasString('title', LENGTHS.title)) return { ok: false, data: ERRORS.title }; + if(!request.hasString('image', LENGTHS.image)) return { ok: false, data: ERRORS.image }; + if(!request.hasString('shortDescription', LENGTHS.shortDescription)) return { ok: false, data: ERRORS.shortDescription }; + if(!request.hasString('description', LENGTHS.description)) return { ok: false, data: ERRORS.description }; + + let title = request.getString('title', LENGTHS.title); + let image = request.getString('image', LENGTHS.image); + let shortDescription = request.getString('shortDescription', LENGTHS.shortDescription); + let description = request.getString('description', LENGTHS.description); + + //Generate a handle + let handle; + let iteration = -1; + while(!handle) { + let testingHandle = request.getApp().createHandle(`${title}${iteration>0?iteration:''}`); + iteration++; + let existingArticle = await request.getApp().getArticles().getArticleByHandle(testingHandle); + if(existingArticle) continue; + handle = testingHandle; + } + + //Create the article + let article; + try { + article = await request.getApp().getArticles().addArticle(handle, title, image, shortDescription, description); + } catch(e) { + console.error(e); + return { ok: 500, data: ERRORS.internal }; + } + + return { ok: true, data: article }; + } +} diff --git a/private/server/api/methods/blog/GetBlogArticle.js b/private/server/api/methods/blog/GetBlogArticle.js index 10fbebb..649e5db 100644 --- a/private/server/api/methods/blog/GetBlogArticle.js +++ b/private/server/api/methods/blog/GetBlogArticle.js @@ -21,10 +21,7 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -const - APIHandler = require('./../../APIHandler'), - sanitizeHtml = require('sanitize-html') -; +const APIHandler = require('./../../APIHandler'); const ERRORS = { missingHandle: "Missing article handle.", diff --git a/private/server/api/methods/blog/GetBlogArticles.js b/private/server/api/methods/blog/GetBlogArticles.js index 4bddc4f..f2f16f4 100644 --- a/private/server/api/methods/blog/GetBlogArticles.js +++ b/private/server/api/methods/blog/GetBlogArticles.js @@ -21,10 +21,7 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -const - APIHandler = require('./../../APIHandler'), - sanitizeHtml = require('sanitize-html') -; +const APIHandler = require('./../../APIHandler'); const ERRORS = { tooMany: "Cannot return this many"