From aa271efdcbd6c75e6dd695b15382fa466b3c0510 Mon Sep 17 00:00:00 2001 From: "@wwwjim" Date: Tue, 11 Aug 2020 00:05:42 -0700 Subject: [PATCH] buckets: fixes data/get endpoint --- components/core/Application.js | 21 +++++++++++++++------ pages/api/data/get.js | 32 ++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/components/core/Application.js b/components/core/Application.js index 6d1e0e1a..2302096d 100644 --- a/components/core/Application.js +++ b/components/core/Application.js @@ -59,7 +59,6 @@ export default class ApplicationPage extends React.Component { window.addEventListener("dragleave", this._handleDragLeave); window.addEventListener("dragover", this._handleDragOver); window.addEventListener("drop", this._handleDrop); - window.addEventListener("online", this._handleOnlineStatus); window.addEventListener("offline", this._handleOnlineStatus); } @@ -254,7 +253,8 @@ export default class ApplicationPage extends React.Component { _handleDeleteYourself = async () => { // TODO(jim): // Put this somewhere better for messages. - const message = "Do you really want to delete your account? It will be permanently removed"; + const message = + "Do you really want to delete your account? It will be permanently removed"; if (!window.confirm(message)) { return false; } @@ -450,8 +450,12 @@ export default class ApplicationPage extends React.Component { - + url="https://slate.host/_" + > + ); } @@ -528,12 +532,17 @@ export default class ApplicationPage extends React.Component { return ( - + + onDismissSidebar={this._handleDismissSidebar} + > {scene} diff --git a/pages/api/data/get.js b/pages/api/data/get.js index 9312167c..197798fe 100644 --- a/pages/api/data/get.js +++ b/pages/api/data/get.js @@ -1,18 +1,42 @@ +import * as Environment from "~/node_common/environment"; import * as MW from "~/node_common/middleware"; -import * as Constants from "~/node_common/constants"; import * as Data from "~/node_common/data"; import * as Utilities from "~/node_common/utilities"; -import FS from "fs-extra"; - 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 { buckets } = await Utilities.getBucketAPI(); + const id = Utilities.getIdFromCookie(req); + if (!id) { + return res + .status(500) + .json({ decorator: "SERVER_DELETE_SLATE", error: true }); + } + + const user = await Data.getUserById({ + id, + }); + + const { + buckets, + bucketKey, + bucketName, + } = await Utilities.getBucketAPIFromUserToken(user.data.tokens.api); + + const r = await buckets.list(); + const items = await buckets.listIpfsPath(r[0].path); return res.status(200).send({ decorator: "SERVER_GET", + data: items.itemsList, }); };