diff --git a/pages/api/_.js b/pages/api/_.js index 89140011..346250cb 100644 --- a/pages/api/_.js +++ b/pages/api/_.js @@ -1,11 +1,5 @@ -import "isomorphic-fetch"; - -import * as MW from "~/node_common/middleware"; - -const initCORS = MW.init(MW.CORS); - export default async (req, res) => { - initCORS(req, res); - - return res.status(200).json({ decorator: "SERVER_HEALTH_CHECK", data: { slate: true } }); + return res + .status(200) + .json({ decorator: "SERVER_HEALTH_CHECK", data: { slate: true } }); }; diff --git a/pages/api/addresses/send.js b/pages/api/addresses/send.js index a98fbd63..a5fae10d 100644 --- a/pages/api/addresses/send.js +++ b/pages/api/addresses/send.js @@ -3,18 +3,12 @@ import * as Utilities from "~/node_common/utilities"; import * as Data from "~/node_common/data"; import * as Powergate from "~/node_common/powergate"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(500) - .json({ decorator: "SERVER_SEND_FILECOIN", error: true }); + .send({ decorator: "SERVER_SEND_FILECOIN", error: true }); } const user = await Data.getUserById({ @@ -24,13 +18,13 @@ export default async (req, res) => { if (!user) { return res .status(404) - .json({ decorator: "SERVER_SEND_FILECOIN_USER_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_SEND_FILECOIN_USER_NOT_FOUND", error: true }); } if (user.error) { return res .status(500) - .json({ decorator: "SERVER_SEND_FILECOIN_USER_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_SEND_FILECOIN_USER_NOT_FOUND", error: true }); } const PG = Powergate.get(user); @@ -49,5 +43,5 @@ export default async (req, res) => { .send({ decorator: "SERVER_SEND_FILECOIN_ACTION_FAILURE", error: true }); } - return res.status(200).json({ decorator: "SERVER_SEND_FILECOIN" }); + return res.status(200).send({ decorator: "SERVER_SEND_FILECOIN" }); }; diff --git a/pages/api/data/[upload].js b/pages/api/data/[upload].js index 25c2e11e..3e08090e 100644 --- a/pages/api/data/[upload].js +++ b/pages/api/data/[upload].js @@ -1,12 +1,8 @@ -import * as MW from "~/node_common/middleware"; import * as Upload from "~/node_common/upload"; import * as Utilities from "~/node_common/utilities"; import * as Data from "~/node_common/data"; import * as LibraryManager from "~/node_common/managers/library"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - // NOTE(jim): To support multipart request. export const config = { api: { @@ -15,9 +11,6 @@ export const config = { }; export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); const user = await Data.getUserById({ id, @@ -28,13 +21,17 @@ export default async (req, res) => { }); if (!response) { - return res.status(404).send({ decorator: "SERVER_UPLOAD_ERROR", error: true }); + return res + .status(404) + .send({ decorator: "SERVER_UPLOAD_ERROR", error: true }); } if (response.error) { // NOTE(jim): To debug potential textile issues with matching CIDs. console.log({ message: response.message }); - return res.status(500).send({ decorator: response.decorator, error: response.error }); + return res + .status(500) + .send({ decorator: response.decorator, error: response.error }); } const { data, ipfs } = response; diff --git a/pages/api/data/archive.js b/pages/api/data/archive.js index 962bca10..b6134129 100644 --- a/pages/api/data/archive.js +++ b/pages/api/data/archive.js @@ -2,18 +2,12 @@ import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(403) - .json({ decorator: "SERVER_REMOVE_DATA_NOT_ALLOWED", error: true }); + .send({ decorator: "SERVER_REMOVE_DATA_NOT_ALLOWED", error: true }); } const user = await Data.getUserById({ @@ -21,14 +15,14 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_BUCKET_ARCHIVE_DEAL_USER_NOT_FOUND", error: true, }); } if (user.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_BUCKET_ARCHIVE_DEAL_USER_NOT_FOUND", error: true, }); diff --git a/pages/api/data/cid-status.js b/pages/api/data/cid-status.js index b492d8c0..645c3f2b 100644 --- a/pages/api/data/cid-status.js +++ b/pages/api/data/cid-status.js @@ -1,12 +1,8 @@ -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as Powergate from "~/node_common/powergate"; import * as LibraryManager from "~/node_common/managers/library"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - const check = async (PG, jobId) => new Promise((resolve) => { const jobsCancel = PG.ffs.watchJobs((j) => { @@ -15,9 +11,6 @@ const check = async (PG, jobId) => }); export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - if (!req.body.data) { return res .status(500) diff --git a/pages/api/data/get.js b/pages/api/data/get.js index 74b5997a..15e42e25 100644 --- a/pages/api/data/get.js +++ b/pages/api/data/get.js @@ -1,30 +1,29 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - const TEXTILE_KEY_INFO = { key: Environment.TEXTILE_HUB_KEY, secret: Environment.TEXTILE_HUB_SECRET, }; export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { - return res.status(500).json({ decorator: "SERVER_GET_BUCKET_DATA", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_GET_BUCKET_DATA", error: true }); } const user = await Data.getUserById({ id, }); - const { buckets, bucketKey, bucketName } = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api); + const { + buckets, + bucketKey, + bucketName, + } = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api); const r = await buckets.list(); const items = await buckets.listIpfsPath(r[0].path); diff --git a/pages/api/data/remove.js b/pages/api/data/remove.js index 5e3ea590..20cb47cc 100644 --- a/pages/api/data/remove.js +++ b/pages/api/data/remove.js @@ -1,29 +1,30 @@ -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as Strings from "~/common/strings"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - if (Strings.isEmpty(req.body.data.cid)) { - return res.status(500).json({ decorator: "SERVER_REMOVE_DATA_NO_CID", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_REMOVE_DATA_NO_CID", error: true }); } const id = Utilities.getIdFromCookie(req); if (!id) { - return res.status(403).json({ decorator: "SERVER_REMOVE_DATA_NOT_ALLOWED", error: true }); + return res + .status(403) + .send({ decorator: "SERVER_REMOVE_DATA_NOT_ALLOWED", error: true }); } const user = await Data.getUserById({ id, }); - const { buckets, bucketKey, bucketName } = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api); + const { + buckets, + bucketKey, + bucketName, + } = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api); const r = await buckets.list(); const items = await buckets.listIpfsPath(r[0].path); @@ -37,7 +38,9 @@ export default async (req, res) => { } if (!entity) { - return res.status(500).json({ decorator: "SERVER_REMOVE_DATA_NO_CID", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_REMOVE_DATA_NO_CID", error: true }); } // remove from your bucket @@ -49,7 +52,9 @@ export default async (req, res) => { bucketRemoval = await buckets.removePath(bucketKey, entity.name); } catch (e) { console.log(e); - return res.status(500).json({ decorator: "SERVER_REMOVE_DATA_NO_LINK", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_REMOVE_DATA_NO_LINK", error: true }); } // NOTE(jim): @@ -63,7 +68,9 @@ export default async (req, res) => { updated_at: new Date(), data: { ...slate.data, - objects: slate.data.objects.filter((o) => !o.url.includes(req.body.data.cid)), + objects: slate.data.objects.filter( + (o) => !o.url.includes(req.body.data.cid) + ), }, }); } @@ -77,7 +84,9 @@ export default async (req, res) => { library: [ { ...user.data.library[0], - children: user.data.library[0].children.filter((o) => !o.ipfs.includes(req.body.data.cid)), + children: user.data.library[0].children.filter( + (o) => !o.ipfs.includes(req.body.data.cid) + ), }, ], }, diff --git a/pages/api/data/storage-deal.js b/pages/api/data/storage-deal.js index 854f2ab5..c7ae9f7c 100644 --- a/pages/api/data/storage-deal.js +++ b/pages/api/data/storage-deal.js @@ -1,18 +1,9 @@ -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as Powergate from "~/node_common/powergate"; import * as LibraryManager from "~/node_common/managers/library"; -// import { ffsOptions } from "@textile/powergate-client"; - -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - if (!req.body.ipfs) { return res.status(500).send({ decorator: "SERVER_NO_CID", error: true }); } @@ -26,13 +17,13 @@ export default async (req, res) => { if (!user) { return res .status(404) - .json({ decorator: "SERVER_STORAGE_DEAL_USER_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_STORAGE_DEAL_USER_NOT_FOUND", error: true }); } if (user.error) { return res .status(500) - .json({ decorator: "SERVER_STORAGE_DEAL_USER_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_STORAGE_DEAL_USER_NOT_FOUND", error: true }); } const data = LibraryManager.getDataByIPFS(user, req.body.ipfs); @@ -44,13 +35,6 @@ export default async (req, res) => { let jobId; try { throw new Error("Powergate disabled"); - /* - const Deal = await PG.ffs.pushStorageConfig( - cid, - ffsOptions.withOverride(true) - ); - jobId = Deal && Deal.jobId ? Deal.jobId : null; - */ } catch (e) { console.log(e); return res.status(500).send({ diff --git a/pages/api/directory.js b/pages/api/directory.js index d9b72937..08177f15 100644 --- a/pages/api/directory.js +++ b/pages/api/directory.js @@ -1,14 +1,7 @@ -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Serializers from "~/node_common/serializers"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const users = await Data.getEveryUser(); const slates = await Data.getEverySlate(); diff --git a/pages/api/hydrate.js b/pages/api/hydrate.js index bb0e95c9..2c8d7a4b 100644 --- a/pages/api/hydrate.js +++ b/pages/api/hydrate.js @@ -1,24 +1,23 @@ -import * as MW from "~/node_common/middleware"; import * as ViewerManager from "~/node_common/managers/viewer"; import * as Utilities from "~/node_common/utilities"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { - return res.status(500).json({ decorator: "SERVER_HYDRATE_FAILURE", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_HYDRATE_FAILURE", error: true }); } const data = await ViewerManager.getById({ id }); if (!data) { - return res.status(500).json({ decorator: "SERVER_VIEWER_DATA_ERROR", error: true, data: null }); + return res + .status(500) + .send({ decorator: "SERVER_VIEWER_DATA_ERROR", error: true, data: null }); } - return res.status(200).send({ decorator: "SERVER_HYDRATE", success: true, data }); + return res + .status(200) + .send({ decorator: "SERVER_HYDRATE", success: true, data }); }; diff --git a/pages/api/keys/delete.js b/pages/api/keys/delete.js index 893315f0..9e27a378 100644 --- a/pages/api/keys/delete.js +++ b/pages/api/keys/delete.js @@ -3,18 +3,12 @@ import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(500) - .json({ decorator: "SERVER_DELETE_API_KEY_AUTH", error: true }); + .send({ decorator: "SERVER_DELETE_API_KEY_AUTH", error: true }); } const user = await Data.getUserById({ @@ -22,14 +16,14 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_DELETE_API_KEY_USER_NOT_FOUND", error: true, }); } if (user.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_DELETE_API_KEY_USER_NOT_FOUND", error: true, }); @@ -38,21 +32,21 @@ export default async (req, res) => { const key = await Data.getAPIKey({ id: req.body.data.id }); if (key.owner_id !== user.id) { - return res.status(403).json({ + return res.status(403).send({ decorator: "SERVER_DELETE_API_KEY_NOT_FOUND", error: true, }); } if (!key) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_DELETE_API_KEY_NOT_FOUND", error: true, }); } if (key.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_DELETE_API_KEY_NOT_FOUND", error: true, }); @@ -61,18 +55,18 @@ export default async (req, res) => { const response = await Data.deleteAPIKeyById({ id: key.id }); if (!response) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_DELETE_API_KEY_ERROR", error: true, }); } if (response.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_DELETE_API_KEY_ERROR", error: true, }); } - return res.status(200).json({ decorator: "SERVER_DELETE_API_KEY" }); + return res.status(200).send({ decorator: "SERVER_DELETE_API_KEY" }); }; diff --git a/pages/api/keys/generate.js b/pages/api/keys/generate.js index c40580b9..fa6d46ec 100644 --- a/pages/api/keys/generate.js +++ b/pages/api/keys/generate.js @@ -1,22 +1,15 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import { v4 as uuid } from "uuid"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(500) - .json({ decorator: "SERVER_GENERATE_API_KEY_AUTH", error: true }); + .send({ decorator: "SERVER_GENERATE_API_KEY_AUTH", error: true }); } const user = await Data.getUserById({ @@ -24,14 +17,14 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_GENERATE_API_KEY_USER_NOT_FOUND", error: true, }); } if (user.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_GENERATE_API_KEY_USER_NOT_FOUND", error: true, }); @@ -40,7 +33,7 @@ export default async (req, res) => { const keys = await Data.getAPIKeysByUserId({ userId: user.id }); if (keys.length > 9) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_GENERATE_API_KEY_TOO_MANY_KEYS", error: true, }); @@ -52,18 +45,18 @@ export default async (req, res) => { }); if (!key) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_GENERATE_API_KEY_ERROR", error: true, }); } if (key.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_GENERATE_API_KEY_ERROR", error: true, }); } - return res.status(200).json({ decorator: "SERVER_GENERATE_API_KEY", key }); + return res.status(200).send({ decorator: "SERVER_GENERATE_API_KEY", key }); }; diff --git a/pages/api/search/[query].js b/pages/api/search/[query].js index c7917329..ed10017e 100644 --- a/pages/api/search/[query].js +++ b/pages/api/search/[query].js @@ -2,13 +2,7 @@ import * as MW from "~/node_common/middleware"; import * as Strings from "~/common/strings"; import * as Data from "~/node_common/data"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - if (Strings.isEmpty(req.query.query)) { return { decorator: "SERVER_SEARCH_NO_QUERY", diff --git a/pages/api/search/slates/[query].js b/pages/api/search/slates/[query].js index 4b15584e..a7f94f62 100644 --- a/pages/api/search/slates/[query].js +++ b/pages/api/search/slates/[query].js @@ -1,15 +1,8 @@ -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Serializers from "~/node_common/serializers"; import * as Strings from "~/common/strings"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - if (Strings.isEmpty(req.query.query)) { return { decorator: "SERVER_SEARCH_NO_QUERY", diff --git a/pages/api/sign-in.js b/pages/api/sign-in.js index 8cdb47ec..6a9e4f09 100644 --- a/pages/api/sign-in.js +++ b/pages/api/sign-in.js @@ -1,16 +1,11 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Utilities from "~/node_common/utilities"; import * as Data from "~/node_common/data"; import * as Strings from "~/common/strings"; import JWT from "jsonwebtoken"; -const initCORS = MW.init(MW.CORS); - export default async (req, res) => { - initCORS(req, res); - // NOTE(jim): We don't need to validate here. if (Strings.isEmpty(req.body.data.username)) { return res.status(500).send({ decorator: "SERVER_SIGN_IN", error: true }); diff --git a/pages/api/slates/add-url.js b/pages/api/slates/add-url.js index 419c97e9..0ab979bc 100644 --- a/pages/api/slates/add-url.js +++ b/pages/api/slates/add-url.js @@ -7,7 +7,7 @@ export default async (req, res) => { if (!id) { return res .status(403) - .json({ decorator: "SERVER_ADD_TO_SLATE_USER_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_ADD_TO_SLATE_USER_NOT_FOUND", error: true }); } const user = await Data.getUserById({ @@ -15,14 +15,14 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_ADD_TO_SLATE_USER_NOT_FOUND", error: true, }); } if (user.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_ADD_TO_SLATE_USER_NOT_FOUND", error: true, }); @@ -31,14 +31,14 @@ export default async (req, res) => { const slate = await Data.getSlateById({ id: req.body.slate.id }); if (!slate) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_ADD_TO_SLATE_SLATE_NOT_FOUND", error: true, }); } if (slate.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_ADD_TO_SLATE_SLATE_NOT_FOUND", error: true, }); @@ -82,14 +82,14 @@ export default async (req, res) => { }); if (!update) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_ADD_TO_SLATE_ERROR", error: true, }); } if (update.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_ADD_TO_SLATE_ERROR", error: true, }); @@ -97,5 +97,5 @@ export default async (req, res) => { return res .status(200) - .json({ decorator: "SERVER_SLATE_ADD_TO_SLATE", slate }); + .send({ decorator: "SERVER_SLATE_ADD_TO_SLATE", slate }); }; diff --git a/pages/api/slates/create.js b/pages/api/slates/create.js index 9932bee7..39402384 100644 --- a/pages/api/slates/create.js +++ b/pages/api/slates/create.js @@ -1,20 +1,13 @@ -import * as MW from "~/node_common/middleware"; import * as Utilities from "~/node_common/utilities"; import * as Data from "~/node_common/data"; import * as Strings from "~/common/strings"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(500) - .json({ decorator: "SERVER_FIND_USER_CREATE_SLATE", error: true }); + .send({ decorator: "SERVER_FIND_USER_CREATE_SLATE", error: true }); } const user = await Data.getUserById({ @@ -42,7 +35,7 @@ export default async (req, res) => { if (found) { return res .status(500) - .json({ decorator: "SERVER_EXISTING_SLATE", error: true }); + .send({ decorator: "SERVER_EXISTING_SLATE", error: true }); } const slate = await Data.createSlate({ @@ -59,14 +52,14 @@ export default async (req, res) => { if (!slate) { return res .status(500) - .json({ decorator: "SERVER_CREATE_SLATE", error: true }); + .send({ decorator: "SERVER_CREATE_SLATE", error: true }); } if (slate.error) { return res .status(500) - .json({ decorator: "SERVER_CREATE_SLATE", error: true }); + .send({ decorator: "SERVER_CREATE_SLATE", error: true }); } - return res.status(200).json({ decorator: "SERVER_CREATE_SLATE", slate }); + return res.status(200).send({ decorator: "SERVER_CREATE_SLATE", slate }); }; diff --git a/pages/api/slates/delete.js b/pages/api/slates/delete.js index 8674682d..0d9cefe7 100644 --- a/pages/api/slates/delete.js +++ b/pages/api/slates/delete.js @@ -1,20 +1,13 @@ -import * as MW from "~/node_common/middleware"; import * as Utilities from "~/node_common/utilities"; import * as Data from "~/node_common/data"; import * as Strings from "~/common/strings"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(500) - .json({ decorator: "SERVER_DELETE_SLATE", error: true }); + .send({ decorator: "SERVER_DELETE_SLATE", error: true }); } const user = await Data.getUserById({ @@ -22,14 +15,14 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_DELETE_SLATE_USER_NOT_FOUND", error: true, }); } if (user.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_DELETE_SLATE_USER_NOT_FOUND", error: true, }); @@ -40,13 +33,13 @@ export default async (req, res) => { if (!slate) { return res .status(404) - .json({ decorator: "SERVER_DELETE_SLATE_SLATE_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_DELETE_SLATE_SLATE_NOT_FOUND", error: true }); } if (slate.error) { return res .status(500) - .json({ decorator: "SERVER_DELETE_SLATE_SLATE_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_DELETE_SLATE_SLATE_NOT_FOUND", error: true }); } const deleteResponse = await Data.deleteSlateById({ id: slate.id }); @@ -54,16 +47,16 @@ export default async (req, res) => { if (!deleteResponse) { return res .status(404) - .json({ decorator: "SERVER_DELETE_SLATE", error: true }); + .send({ decorator: "SERVER_DELETE_SLATE", error: true }); } if (deleteResponse.error) { return res .status(500) - .json({ decorator: "SERVER_DELETE_SLATE", error: true }); + .send({ decorator: "SERVER_DELETE_SLATE", error: true }); } return res .status(200) - .json({ decorator: "SERVER_DELETE_SLATE", error: false }); + .send({ decorator: "SERVER_DELETE_SLATE", error: false }); }; diff --git a/pages/api/slates/update.js b/pages/api/slates/update.js index 517d0174..2c22e20d 100644 --- a/pages/api/slates/update.js +++ b/pages/api/slates/update.js @@ -1,20 +1,13 @@ -import * as MW from "~/node_common/middleware"; import * as Utilities from "~/node_common/utilities"; import * as Data from "~/node_common/data"; import * as Strings from "~/common/strings"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(500) - .json({ decorator: "SERVER_FIND_USER_UPDATE_SLATE", error: true }); + .send({ decorator: "SERVER_FIND_USER_UPDATE_SLATE", error: true }); } const user = await Data.getUserById({ @@ -22,14 +15,14 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_FIND_USER_UPDATE_SLATE_USER_NOT_FOUND", error: true, }); } if (user.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_FIND_USER_UPDATE_SLATE_USER_NOT_FOUND", error: true, }); @@ -40,24 +33,24 @@ export default async (req, res) => { if (!response) { return res .status(404) - .json({ decorator: "SERVER_UPDATE_SLATE_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_UPDATE_SLATE_NOT_FOUND", error: true }); } if (response.error) { return res .status(500) - .json({ decorator: "SERVER_UPDATE_SLATE_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_UPDATE_SLATE_NOT_FOUND", error: true }); } if (!req.body.data) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_UPDATE_SLATE_MUST_PROVIDE_DATA", error: true, }); } if (!req.body.data.data.name) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_UPDATE_SLATE_MUST_PROVIDE_NAME", error: true, }); @@ -76,14 +69,14 @@ export default async (req, res) => { if (!slate) { return res .status(404) - .json({ decorator: "SERVER_UPDATE_SLATE", error: true }); + .send({ decorator: "SERVER_UPDATE_SLATE", error: true }); } if (slate.error) { return res .status(500) - .json({ decorator: "SERVER_UPDATE_SLATE", error: true }); + .send({ decorator: "SERVER_UPDATE_SLATE", error: true }); } - return res.status(200).json({ decorator: "SERVER_UPDATE_SLATE", slate }); + return res.status(200).send({ decorator: "SERVER_UPDATE_SLATE", slate }); }; diff --git a/pages/api/subscribe.js b/pages/api/subscribe.js index d46cb08c..87bc97ab 100644 --- a/pages/api/subscribe.js +++ b/pages/api/subscribe.js @@ -1,20 +1,13 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as Serializers from "~/node_common/serializers"; import * as Validations from "~/common/validations"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { - return res.status(500).json({ decorator: "SERVER_SUBSCRIBE", error: true }); + return res.status(500).send({ decorator: "SERVER_SUBSCRIBE", error: true }); } const user = await Data.getUserById({ @@ -24,24 +17,24 @@ export default async (req, res) => { if (!user) { return res .status(404) - .json({ decorator: "SERVER_SUBSCRIBE_USER_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_SUBSCRIBE_USER_NOT_FOUND", error: true }); } if (user.error) { return res .status(500) - .json({ decorator: "SERVER_SUBSCRIBE_USER_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_SUBSCRIBE_USER_NOT_FOUND", error: true }); } if (!req.body.data || (!req.body.data.userId && !req.body.data.slateId)) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_SUBSCRIBE_MUST_PROVIDE_SLATE_OR_USER", error: true, }); } if (user.id === req.body.data.userId) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_SUBSCRIBE_CAN_NOT_SUBSCRIBE_TO_YOURSELF", error: true, }); @@ -54,14 +47,14 @@ export default async (req, res) => { }); if (!targetUser) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_SUBSCRIBE_TARGET_USER_NOT_FOUND", error: true, }); } if (targetUser.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_SUBSCRIBE_TARGET_USER_NOT_FOUND", error: true, }); @@ -73,14 +66,14 @@ export default async (req, res) => { targetSlate = await Data.getSlateById({ id: req.body.data.slateId }); if (!targetSlate) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_SUBSCRIBE_TARGET_SLATE_NOT_FOUND", error: true, }); } if (targetSlate.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_SUBSCRIBE_TARGET_SLATE_NOT_FOUND", error: true, }); @@ -94,7 +87,7 @@ export default async (req, res) => { }); if (existingResponse && existingResponse.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_SUBSCRIBE_SUBSCRIPTION_CHECK_ERROR", error: true, }); @@ -109,18 +102,18 @@ export default async (req, res) => { if (!unsubscribeResponse) { return res .status(404) - .json({ decorator: "SERVER_UNSUBSCRIBE_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_UNSUBSCRIBE_NOT_FOUND", error: true }); } if (unsubscribeResponse.error) { return res .status(500) - .json({ decorator: "SERVER_UNSUBSCRIBE_ERROR", error: true }); + .send({ decorator: "SERVER_UNSUBSCRIBE_ERROR", error: true }); } return res .status(200) - .json({ decorator: "SERVER_UNSUBSCRIBE", data: unsubscribeResponse }); + .send({ decorator: "SERVER_UNSUBSCRIBE", data: unsubscribeResponse }); } const subscribeResponse = await Data.createSubscription({ @@ -132,16 +125,16 @@ export default async (req, res) => { if (!subscribeResponse) { return res .status(404) - .json({ decorator: "SERVER_SUBSCRIBE_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_SUBSCRIBE_NOT_FOUND", error: true }); } if (subscribeResponse.error) { return res .status(500) - .json({ decorator: "SERVER_SUBSCRIBE_ERROR", error: true }); + .send({ decorator: "SERVER_SUBSCRIBE_ERROR", error: true }); } - return res.status(200).json({ + return res.status(200).send({ decorator: "SERVER_SUBSCRIBE", data: { ...subscribeResponse, diff --git a/pages/api/users/check.js b/pages/api/users/check.js index e1757d9b..f239f604 100644 --- a/pages/api/users/check.js +++ b/pages/api/users/check.js @@ -1,5 +1,4 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as Serializers from "~/node_common/serializers"; @@ -8,29 +7,25 @@ import { Buckets, PrivateKey } from "@textile/hub"; import JWT from "jsonwebtoken"; -const initCORS = MW.init(MW.CORS); - const TEXTILE_KEY_INFO = { key: Environment.TEXTILE_HUB_KEY, secret: Environment.TEXTILE_HUB_SECRET, }; export default async (req, res) => { - initCORS(req, res); - const user = await Data.getUserByUsername({ username: req.body.data.username, }); if (!user) { - return res.status(200).json({ decorator: "USER_NOT_FOUND" }); + return res.status(200).send({ decorator: "USER_NOT_FOUND" }); } if (user.error) { - return res.status(500).json({ decorator: "USER_NOT_FOUND", error: true }); + return res.status(500).send({ decorator: "USER_NOT_FOUND", error: true }); } return res .status(200) - .json({ decorator: "USER_FOUND", data: Serializers.user(user) }); + .send({ decorator: "USER_FOUND", data: Serializers.user(user) }); }; diff --git a/pages/api/users/create.js b/pages/api/users/create.js index 19d859ca..13796524 100644 --- a/pages/api/users/create.js +++ b/pages/api/users/create.js @@ -1,5 +1,4 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as LibraryManager from "~/node_common/managers/library"; @@ -9,25 +8,27 @@ import BCrypt from "bcrypt"; import { PrivateKey } from "@textile/hub"; -const initCORS = MW.init(MW.CORS); - export default async (req, res) => { - initCORS(req, res); - const existing = await Data.getUserByUsername({ username: req.body.data.username, }); if (existing) { - return res.status(403).json({ decorator: "SERVER_EXISTING_USER_ALREADY", error: true }); + return res + .status(403) + .send({ decorator: "SERVER_EXISTING_USER_ALREADY", error: true }); } if (!Validations.username(req.body.data.username)) { - return res.status(500).send({ decorator: "SERVER_INVALID_USERNAME", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_INVALID_USERNAME", error: true }); } if (!Validations.password(req.body.data.password)) { - return res.status(500).send({ decorator: "SERVER_INVALID_PASSWORD", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_INVALID_PASSWORD", error: true }); } const rounds = Number(Environment.LOCAL_PASSWORD_ROUNDS); @@ -42,7 +43,11 @@ export default async (req, res) => { // TODO(jim): // Don't do this once you refactor. - const { buckets, bucketKey, bucketName } = await Utilities.getBucketAPIFromUserToken(api); + const { + buckets, + bucketKey, + bucketName, + } = await Utilities.getBucketAPIFromUserToken(api); const user = await Data.createUser({ password: hash, @@ -58,14 +63,18 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ decorator: "SERVER_USER_CREATE_USER_NOT_FOUND", error: true }); + return res + .status(404) + .send({ decorator: "SERVER_USER_CREATE_USER_NOT_FOUND", error: true }); } if (user.error) { - return res.status(500).json({ decorator: "SERVER_USER_CREATE_USER_NOT_FOUND", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_USER_CREATE_USER_NOT_FOUND", error: true }); } - return res.status(200).json({ + return res.status(200).send({ decorator: "SERVER_USER_CREATE", user: { username: user.username, id: user.id }, }); diff --git a/pages/api/users/delete.js b/pages/api/users/delete.js index 5f9f3293..e8c919cf 100644 --- a/pages/api/users/delete.js +++ b/pages/api/users/delete.js @@ -1,5 +1,4 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; @@ -7,21 +6,17 @@ import { Buckets, PrivateKey } from "@textile/hub"; import JWT from "jsonwebtoken"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - const TEXTILE_KEY_INFO = { key: Environment.TEXTILE_HUB_KEY, secret: Environment.TEXTILE_HUB_SECRET, }; export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { - return res.status(500).json({ decorator: "SERVER_USER_DELETE", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_USER_DELETE", error: true }); } const user = await Data.getUserById({ @@ -29,11 +24,15 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ decorator: "SERVER_USER_DELETE_USER_NOT_FOUND", error: true }); + return res + .status(404) + .send({ decorator: "SERVER_USER_DELETE_USER_NOT_FOUND", error: true }); } if (user.error) { - return res.status(500).json({ decorator: "SERVER_USER_DELETE_USER_NOT_FOUND", error: true }); + return res + .status(500) + .send({ decorator: "SERVER_USER_DELETE_USER_NOT_FOUND", error: true }); } await Data.deleteAPIKeysForUserId({ userId: user.id }); @@ -56,8 +55,10 @@ export default async (req, res) => { }); if (!deleted) { - return res.status(200).json({ decorator: "SERVER_USER_DELETE", error: true }); + return res + .status(200) + .send({ decorator: "SERVER_USER_DELETE", error: true }); } - return res.status(200).json({ decorator: "SERVER_USER_DELETE", deleted }); + return res.status(200).send({ decorator: "SERVER_USER_DELETE", deleted }); }; diff --git a/pages/api/users/trust-delete.js b/pages/api/users/trust-delete.js index b516b27c..81044460 100644 --- a/pages/api/users/trust-delete.js +++ b/pages/api/users/trust-delete.js @@ -1,21 +1,14 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as Validations from "~/common/validations"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(500) - .json({ decorator: "SERVER_TRUST_DELETE", error: true }); + .send({ decorator: "SERVER_TRUST_DELETE", error: true }); } const user = await Data.getUserById({ @@ -23,21 +16,21 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_TRUST_DELETE_USER_NOT_FOUND", error: true, }); } if (user.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUST_DELETE_USER_NOT_FOUND", error: true, }); } if (!req.body.data) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUST_DELETE_MUST_PROVIDE_ID", error: true, }); @@ -49,5 +42,5 @@ export default async (req, res) => { return res .status(200) - .json({ decorator: "SERVER_TRUST_UPDATE", data: response }); + .send({ decorator: "SERVER_TRUST_UPDATE", data: response }); }; diff --git a/pages/api/users/trust-update.js b/pages/api/users/trust-update.js index 8b121f8b..7c3e73ee 100644 --- a/pages/api/users/trust-update.js +++ b/pages/api/users/trust-update.js @@ -1,22 +1,15 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as Serializers from "~/node_common/serializers"; import * as Validations from "~/common/validations"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(500) - .json({ decorator: "SERVER_TRUST_UPDATE", error: true }); + .send({ decorator: "SERVER_TRUST_UPDATE", error: true }); } const user = await Data.getUserById({ @@ -24,28 +17,28 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_TRUST_UPDATE_USER_NOT_FOUND", error: true, }); } if (user.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUST_UPDATE_USER_NOT_FOUND", error: true, }); } if (!req.body.data || !req.body.data.userId) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUST_UPDATE_MUST_PROVIDE_SOMEONE_TO_TRUST", error: true, }); } if (user.id === req.body.data.userId) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUST_UPDATE_CAN_NOT_TRUST_YOURSELF", error: true, }); @@ -56,14 +49,14 @@ export default async (req, res) => { }); if (!targetUser) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_TRUST_UPDATE_TARGET_USER_NOT_FOUND", error: true, }); } if (targetUser.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUST_UPDATE_TARGET_USER_NOT_FOUND", error: true, }); @@ -75,14 +68,14 @@ export default async (req, res) => { }); if (!existingResponse) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_TRUST_UPDATE_CHECK_ERROR", error: true, }); } if (existingResponse.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUST_UPDATE_CHECK_ERROR", error: true, }); @@ -93,7 +86,7 @@ export default async (req, res) => { data: { ...existingResponse.data, verified: true }, }); - return res.status(200).json({ + return res.status(200).send({ decorator: "SERVER_TRUST_UPDATE", data: { type: "TRUSTED_RELATIONSHIP", diff --git a/pages/api/users/trust.js b/pages/api/users/trust.js index 55fce6a3..3130add6 100644 --- a/pages/api/users/trust.js +++ b/pages/api/users/trust.js @@ -1,20 +1,13 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as Serializers from "~/node_common/serializers"; import * as Validations from "~/common/validations"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { - return res.status(500).json({ decorator: "SERVER_TRUST", error: true }); + return res.status(500).send({ decorator: "SERVER_TRUST", error: true }); } const user = await Data.getUserById({ @@ -22,28 +15,28 @@ export default async (req, res) => { }); if (!user) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_USER_NOT_FOUND", error: true, }); } if (user.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_USER_NOT_FOUND", error: true, }); } if (!req.body.data || !req.body.data.userId) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_MUST_PROVIDE_SOMEONE_TO_TRUST", error: true, }); } if (user.id === req.body.data.userId) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_CAN_NOT_TRUST_YOURSELF", error: true, }); @@ -54,14 +47,14 @@ export default async (req, res) => { }); if (!targetUser) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_TARGET_USER_NOT_FOUND", error: true, }); } if (targetUser.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_TARGET_USER_NOT_FOUND", error: true, }); @@ -73,7 +66,7 @@ export default async (req, res) => { }); if (existingResponse && existingResponse.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_CHECK_ERROR", error: true, }); @@ -85,7 +78,7 @@ export default async (req, res) => { }); if (invertedResponse) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_INVERTED_CHECK_ERROR", error: true, }); @@ -101,20 +94,20 @@ export default async (req, res) => { ); if (!deleteRelationshipResponse) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_DELETE_TRUSTED_RELATIONSHIP_NOT_FOUND", error: true, }); } if (deleteRelationshipResponse.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "SERVER_DELETE_TRUSTED_RELATIONSHIP_ERROR", error: true, }); } - return res.status(200).json({ + return res.status(200).send({ decorator: "SERVER_DELETE_TRUSTED_RELATIONSHIP", data: deleteRelationshipResponse, }); @@ -126,7 +119,7 @@ export default async (req, res) => { }); if (!trustResponse) { - return res.status(404).json({ + return res.status(404).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_NOT_FOUND", error: true, }); @@ -135,10 +128,10 @@ export default async (req, res) => { if (trustResponse.error) { return res .status(500) - .json({ decorator: "SERVER_TRUSTED_RELATIONSHIP_ERROR", error: true }); + .send({ decorator: "SERVER_TRUSTED_RELATIONSHIP_ERROR", error: true }); } - return res.status(200).json({ + return res.status(200).send({ decorator: "SERVER_TRUSTED_RELATIONSHIP", data: { ...trustResponse, diff --git a/pages/api/users/update.js b/pages/api/users/update.js index 9f2748cb..3e7ebd18 100644 --- a/pages/api/users/update.js +++ b/pages/api/users/update.js @@ -1,23 +1,16 @@ import * as Environment from "~/node_common/environment"; -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; import * as Validations from "~/common/validations"; import BCrypt from "bcrypt"; -const initCORS = MW.init(MW.CORS); -const initAuth = MW.init(MW.RequireCookieAuthentication); - export default async (req, res) => { - initCORS(req, res); - initAuth(req, res); - const id = Utilities.getIdFromCookie(req); if (!id) { return res .status(500) - .json({ decorator: "SERVER_USER_UPDATE", error: true }); + .send({ decorator: "SERVER_USER_UPDATE", error: true }); } const user = await Data.getUserById({ @@ -27,13 +20,13 @@ export default async (req, res) => { if (!user) { return res .status(404) - .json({ decorator: "SERVER_USER_UPDATE_USER_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_USER_UPDATE_USER_NOT_FOUND", error: true }); } if (user.error) { return res .status(500) - .json({ decorator: "SERVER_USER_UPDATE_USER_NOT_FOUND", error: true }); + .send({ decorator: "SERVER_USER_UPDATE_USER_NOT_FOUND", error: true }); } // const PG = Powergate.get(user); @@ -64,7 +57,7 @@ export default async (req, res) => { if (!Validations.password(req.body.password)) { return res .status(500) - .json({ decorator: "SERVER_INVALID_PASSWORD", error: true }); + .send({ decorator: "SERVER_INVALID_PASSWORD", error: true }); } const rounds = Number(Environment.LOCAL_PASSWORD_ROUNDS); @@ -78,32 +71,5 @@ export default async (req, res) => { }); } - // TODO(jim): POWERGATE_ISSUE 0.2.0 - // Should work when our hosted Powergate works. - /* - if (req.body.type === "SET_DEFAULT_STORAGE_CONFIG") { - let data; - try { - data = await PG.ffs.setDefaultStorageConfig(req.body.config); - } catch (e) { - console.log(e); - return res.status(500).send({ decorator: "SERVER_USER_UPDATE_SETTINGS_CONFIG", error: true }); - } - } - */ - - // TODO(jim): POWERGATE_ISSUE 0.2.0 - // Should work when our hosted Powergate works. - /* - if (req.body.type === "CREATE_FILECOIN_ADDRESS") { - let data; - try { - data = await PG.ffs.newAddr(req.body.address.name, req.body.address.type, req.body.address.makeDefault); - } catch (e) { - return res.status(500).send({ decorator: "SERVER_CREATE_FILECOIN_ADDRESS", error: true }); - } - } - */ - - return res.status(200).json({ decorator: "SERVER_USER_UPDATE" }); + return res.status(200).send({ decorator: "SERVER_USER_UPDATE" }); }; diff --git a/pages/api/v1/get-slate.js b/pages/api/v1/get-slate.js index 20fc2472..54f49e5e 100644 --- a/pages/api/v1/get-slate.js +++ b/pages/api/v1/get-slate.js @@ -1,14 +1,9 @@ -import * as MW from "~/node_common/middleware"; import * as Utilities from "~/node_common/utilities"; import * as Data from "~/node_common/data"; import * as Strings from "~/common/strings"; import * as Powergate from "~/node_common/powergate"; -const initCORS = MW.init(MW.CORS); - export default async (req, res) => { - initCORS(req, res); - if (Strings.isEmpty(req.headers.authorization)) { return res.status(404).send({ decorator: "SERVER_API_KEY_MISSING", @@ -43,13 +38,13 @@ export default async (req, res) => { if (!user) { return res .status(404) - .json({ decorator: "V1_GET_SLATE_USER_NOT_FOUND", error: true }); + .send({ decorator: "V1_GET_SLATE_USER_NOT_FOUND", error: true }); } if (user.error) { return res .status(500) - .json({ decorator: "V1_GET_SLATE_USER_NOT_FOUND", error: true }); + .send({ decorator: "V1_GET_SLATE_USER_NOT_FOUND", error: true }); } let slateId = req.body.data ? req.body.data.id : null; @@ -60,35 +55,35 @@ export default async (req, res) => { if (!slates) { return res .status(404) - .json({ decorator: "V1_GET_SLATE_SLATE_NOT_FOUND", error: true }); + .send({ decorator: "V1_GET_SLATE_SLATE_NOT_FOUND", error: true }); } if (slates.error || !slates.length) { return res .status(500) - .json({ decorator: "V1_GET_SLATE_SLATE_NOT_FOUND", error: true }); + .send({ decorator: "V1_GET_SLATE_SLATE_NOT_FOUND", error: true }); } return res .status(200) - .json({ decorator: "V1_GET_SLATE_MOST_RECENT", slate: slates[0] }); + .send({ decorator: "V1_GET_SLATE_MOST_RECENT", slate: slates[0] }); } slate = await Data.getSlateById({ id: slateId }); if (!slate) { - return res.status(404).json({ + return res.status(404).send({ decorator: "V1_GET_SLATE_NOT_FOUND", error: true, }); } if (slate.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "V1_GET_SLATE_SLATE_NOT_FOUND", error: true, }); } - return res.status(200).json({ decorator: "V1_GET_SLATE", slate }); + return res.status(200).send({ decorator: "V1_GET_SLATE", slate }); }; diff --git a/pages/api/v1/get.js b/pages/api/v1/get.js index 0c60acd3..90642dd1 100644 --- a/pages/api/v1/get.js +++ b/pages/api/v1/get.js @@ -1,14 +1,9 @@ -import * as MW from "~/node_common/middleware"; import * as Utilities from "~/node_common/utilities"; import * as Data from "~/node_common/data"; import * as Strings from "~/common/strings"; import * as Powergate from "~/node_common/powergate"; -const initCORS = MW.init(MW.CORS); - export default async (req, res) => { - initCORS(req, res); - if (Strings.isEmpty(req.headers.authorization)) { return res.status(404).send({ decorator: "SERVER_API_KEY_MISSING", @@ -43,13 +38,13 @@ export default async (req, res) => { if (!user) { return res .status(404) - .json({ decorator: "V1_GET_SLATE_USER_NOT_FOUND", error: true }); + .send({ decorator: "V1_GET_SLATE_USER_NOT_FOUND", error: true }); } if (user.error) { return res .status(500) - .json({ decorator: "V1_GET_SLATE_USER_NOT_FOUND", error: true }); + .send({ decorator: "V1_GET_SLATE_USER_NOT_FOUND", error: true }); } const slates = await Data.getSlatesByUserId({ @@ -58,18 +53,18 @@ export default async (req, res) => { }); if (!slates) { - return res.status(404).json({ + return res.status(404).send({ decorator: "V1_GET_SLATES_NOT_FOUND", error: true, }); } if (slates.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "V1_GET_SLATES_NOT_FOUND", error: true, }); } - return res.status(200).json({ decorator: "V1_GET", slates }); + return res.status(200).send({ decorator: "V1_GET", slates }); }; diff --git a/pages/api/v1/upload-data/[id].js b/pages/api/v1/upload-data/[id].js index 1a431593..71262253 100644 --- a/pages/api/v1/upload-data/[id].js +++ b/pages/api/v1/upload-data/[id].js @@ -1,12 +1,9 @@ -import * as MW from "~/node_common/middleware"; import * as Data from "~/node_common/data"; import * as Constants from "~/node_common/constants"; import * as LibraryManager from "~/node_common/managers/library"; import * as Strings from "~/common/strings"; import * as Upload from "~/node_common/upload"; -const initCORS = MW.init(MW.CORS); - // NOTE(jim): To support multipart request. export const config = { api: { @@ -15,8 +12,6 @@ export const config = { }; export default async (req, res) => { - initCORS(req, res); - if (Strings.isEmpty(req.headers.authorization)) { return res.status(404).send({ decorator: "SERVER_API_KEY_MISSING", @@ -27,14 +22,14 @@ export default async (req, res) => { let slate = await Data.getSlateById({ id: req.query.id }); if (!slate) { - return res.status(404).json({ + return res.status(404).send({ decorator: "V1_SERVER_UPLOAD_SLATE_NOT_FOUND", error: true, }); } if (slate.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "V1_SERVER_UPLOAD_SLATE_NOT_FOUND", error: true, }); @@ -101,14 +96,14 @@ export default async (req, res) => { slate = await Data.getSlateById({ id: req.query.id }); if (!slate) { - return res.status(404).json({ + return res.status(404).send({ decorator: "V1_SERVER_UPLOAD_SLATE_NOT_FOUND", error: true, }); } if (slate.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "V1_SERVER_UPLOAD_SLATE_NOT_FOUND", error: true, }); @@ -153,14 +148,14 @@ export default async (req, res) => { }); if (!updatedSlate) { - return res.status(500).json({ + return res.status(500).send({ decorator: "V1_SERVER_UPLOAD_TO_SLATE_ERROR", error: true, }); } if (updatedSlate.error) { - return res.status(500).json({ + return res.status(500).send({ decorator: "V1_SERVER_UPLOAD_TO_SLATE_ERROR", error: true, });