Add feature to send share with email

This commit is contained in:
Elias Schneider
2022-05-06 10:25:10 +02:00
parent 506e6b0cab
commit ce19d22c68
22 changed files with 365 additions and 189 deletions

View File

@@ -3,14 +3,30 @@ import { ShareDocument } from "../../../../types/Appwrite.type";
import { AppwriteFileWithPreview } from "../../../../types/File.type";
import awServer from "../../../../utils/appwriteServer.util";
import { checkSecurity } from "../../../../utils/shares/security.util";
import * as jose from "jose";
const handler = async (req: NextApiRequest, res: NextApiResponse) => {
const shareId = req.query.shareId as string;
const fileList: AppwriteFileWithPreview[] = [];
const hashedPassword = req.cookies[`${shareId}-password`];
if (!(await shareExists(shareId)))
let shareDocument;
try {
shareDocument = await awServer.database.getDocument<ShareDocument>(
"shares",
shareId
);
} catch {
return res.status(404).json({ message: "not_found" });
}
if (!shareExists(shareDocument)) {
return res.status(404).json({ message: "not_found" });
}
if (!hasUserAccess(req.cookies.aw_token, shareDocument)) {
return res.status(403).json({ message: "forbidden" });
}
try {
await checkSecurity(shareId, hashedPassword);
@@ -20,8 +36,9 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
addVisitorCount(shareId);
const fileListWithoutPreview = (await awServer.storage.listFiles(shareId, undefined, 100))
.files;
const fileListWithoutPreview = (
await awServer.storage.listFiles(shareId, undefined, 100)
).files;
for (const file of fileListWithoutPreview) {
const filePreview = await awServer.storage.getFilePreview(
@@ -39,18 +56,20 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
res.status(200).json(fileList);
};
const shareExists = async (shareId: string) => {
const hasUserAccess = (jwt: string, shareDocument: ShareDocument) => {
if (shareDocument.users?.length == 0) return true;
try {
const shareDocument = await awServer.database.getDocument<ShareDocument>(
"shares",
shareId
);
return shareDocument.enabled && shareDocument.expiresAt > Date.now();
} catch (e) {
const userId = jose.decodeJwt(jwt).userId as string;
return shareDocument.users?.includes(userId);
} catch {
return false;
}
};
const shareExists = async (shareDocument: ShareDocument) => {
return shareDocument.enabled && shareDocument.expiresAt > Date.now();
};
const addVisitorCount = async (shareId: string) => {
const currentDocument = await awServer.database.getDocument<ShareDocument>(
"shares",

View File

@@ -0,0 +1,12 @@
import type { NextApiRequest, NextApiResponse } from "next";
import awServer from "../../../../utils/appwriteServer.util";
const handler = async (req: NextApiRequest, res: NextApiResponse) => {
const email = req.query.email as string;
const doesExists = (await awServer.user.list(`"${email}"`)).total != 0;
res.status(200).json({ exists: doesExists });
};
export default handler;

View File

@@ -8,6 +8,7 @@ import FileList from "../../components/share/FileList";
import showEnterPasswordModal from "../../components/share/showEnterPasswordModal";
import showShareNotFoundModal from "../../components/share/showShareNotFoundModal";
import showVisitorLimitExceededModal from "../../components/share/showVisitorLimitExceededModal";
import authService from "../../services/auth.service";
import shareService from "../../services/share.service";
import { AppwriteFileWithPreview } from "../../types/File.type";
@@ -24,7 +25,13 @@ const Share = () => {
});
};
const getFiles = (password?: string) =>
const getFiles = async (password?: string) => {
try {
await authService.createJWT();
} catch {
//
}
shareService
.get(shareId, password)
.then((files) => {
@@ -40,6 +47,7 @@ const Share = () => {
showVisitorLimitExceededModal(modals);
}
});
};
useEffect(() => {
getFiles();
@@ -47,7 +55,10 @@ const Share = () => {
return (
<>
<Meta title={`Share ${shareId}`} />
<Meta
title={`Share ${shareId}`}
description="Look what I've shared with you."
/>
<Group position="right">
<DownloadAllButton
shareId={shareId}

View File

@@ -11,31 +11,34 @@ import showCreateUploadModal from "../components/upload/showCreateUploadModal";
import { FileUpload } from "../types/File.type";
import aw from "../utils/appwrite.util";
import { IsSignedInContext } from "../utils/auth.util";
import { useConfig } from "../utils/config.util";
import toast from "../utils/toast.util";
const Upload = () => {
const router = useRouter();
const modals = useModals();
const config = useConfig();
const isSignedIn = useContext(IsSignedInContext);
const [files, setFiles] = useState<FileUpload[]>([]);
const [isUploading, setisUploading] = useState(false);
let shareMode: "email" | "standard";
const uploadFiles = async (
id: string,
expiration: number,
security: { password?: string; maxVisitors?: number }
security: { password?: string; maxVisitors?: number },
emails?: string[]
) => {
setisUploading(true);
try {
files.forEach((file) => {
file.uploadingState = "inProgress";
});
const bucketId = JSON.parse(
(
await aw.functions.createExecution(
"createShare",
JSON.stringify({ id, security, expiration }),
JSON.stringify({ id, security, expiration, emails }),
false
)
).stdout
@@ -56,7 +59,8 @@ const Upload = () => {
showCompletedUploadModal(
modals,
`${window.location.origin}/share/${bucketId}`,
new Date(Date.now() + expiration * 60 * 1000).toLocaleString()
new Date(Date.now() + expiration * 60 * 1000).toLocaleString(),
shareMode
);
setFiles([]);
}
@@ -96,11 +100,21 @@ const Upload = () => {
>
<Menu.Item
icon={<Link size={16} />}
onClick={() => showCreateUploadModal(modals, uploadFiles)}
onClick={() => {
shareMode = "standard";
showCreateUploadModal(shareMode, modals, uploadFiles);
}}
>
Share with link
</Menu.Item>
<Menu.Item disabled icon={<Mail size={16} />}>
<Menu.Item
disabled={!config.MAIL_SHARE_ENABLED}
icon={<Mail size={16} />}
onClick={() => {
shareMode = "email";
showCreateUploadModal(shareMode, modals, uploadFiles);
}}
>
Share with email
</Menu.Item>
</Menu>