Infrastructure/pingvin-share
0
Fork 0
mirror of https://github.com/stonith404/pingvin-share.git synced 2025-01-29 01:28:59 -05:00
Code Issues Activity

fix: shareUrl uses wrong origin

Browse source
This commit is contained in:
Elias Schneider 2023-01-11 13:06:38 +01:00
parent 02e41e2437
commit f1b44f87fa
5 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/components/account/showShareLinkModal.tsx
View file

@ -1,8 +1,8 @@
import { Stack, TextInput } from "@mantine/core"; import { Stack, TextInput } from "@mantine/core";
import { ModalsContextProps } from "@mantine/modals/lib/context"; import { ModalsContextProps } from "@mantine/modals/lib/context";
const showShareLinkModal = (modals: ModalsContextProps, shareId: string) => { const showShareLinkModal = (modals: ModalsContextProps, shareId: string, appUrl : string) => {
const link = `${window.location.origin}/share/${shareId}`; const link = `${appUrl}/share/${shareId}`;
return modals.openModal({ return modals.openModal({
title: "Share link", title: "Share link",
children: ( children: (

13
frontend/src/components/upload/modals/showCompletedUploadModal.tsx
View file

@ -15,7 +15,11 @@ import { TbCopy } from "react-icons/tb";
import { Share } from "../../../types/share.type"; import { Share } from "../../../types/share.type";
import toast from "../../../utils/toast.util"; import toast from "../../../utils/toast.util";
const showCompletedUploadModal = (modals: ModalsContextProps, share: Share) => { const showCompletedUploadModal = (
modals: ModalsContextProps,
share: Share,
appUrl: string
) => {
return modals.openModal({ return modals.openModal({
closeOnClickOutside: false, closeOnClickOutside: false,
withCloseButton: false, withCloseButton: false,
@ -25,15 +29,16 @@ const showCompletedUploadModal = (modals: ModalsContextProps, share: Share) => {
<Title order={4}>Share ready</Title> <Title order={4}>Share ready</Title>
</Stack> </Stack>
), ),
children: <Body share={share} />, children: <Body share={share} appUrl={appUrl} />,
}); });
}; };
const Body = ({ share }: { share: Share }) => { const Body = ({ share, appUrl }: { share: Share; appUrl: string }) => {
const clipboard = useClipboard({ timeout: 500 }); const clipboard = useClipboard({ timeout: 500 });
const modals = useModals(); const modals = useModals();
const router = useRouter(); const router = useRouter();
const link = `${window.location.origin}/share/${share.id}`;
const link = `${appUrl}/share/${share.id}`;
return ( return (
<Stack align="stretch"> <Stack align="stretch">
<TextInput <TextInput

4
frontend/src/components/upload/modals/showCreateUploadModal.tsx
View file

@ -30,6 +30,7 @@ const showCreateUploadModal = (
modals: ModalsContextProps, modals: ModalsContextProps,
options: { options: {
isUserSignedIn: boolean; isUserSignedIn: boolean;
appUrl: string;
allowUnauthenticatedShares: boolean; allowUnauthenticatedShares: boolean;
enableEmailRecepients: boolean; enableEmailRecepients: boolean;
}, },
@ -53,6 +54,7 @@ const CreateUploadModalBody = ({
uploadCallback: (createShare: CreateShare) => void; uploadCallback: (createShare: CreateShare) => void;
options: { options: {
isUserSignedIn: boolean; isUserSignedIn: boolean;
appUrl: string;
allowUnauthenticatedShares: boolean; allowUnauthenticatedShares: boolean;
enableEmailRecepients: boolean; enableEmailRecepients: boolean;
}; };
@ -156,7 +158,7 @@ const CreateUploadModalBody = ({
color: theme.colors.gray[6], color: theme.colors.gray[6],
})} })}
> >
{window.location.origin}/share/ {options.appUrl}/share/
{form.values.link == "" ? "myAwesomeShare" : form.values.link} {form.values.link == "" ? "myAwesomeShare" : form.values.link}
</Text> </Text>
<Grid align={form.errors.link ? "center" : "flex-end"}> <Grid align={form.errors.link ? "center" : "flex-end"}>

11
frontend/src/pages/account/shares.tsx
View file

@ -19,6 +19,7 @@ import { useEffect, useState } from "react";
import { TbLink, TbTrash } from "react-icons/tb"; import { TbLink, TbTrash } from "react-icons/tb";
import showShareLinkModal from "../../components/account/showShareLinkModal"; import showShareLinkModal from "../../components/account/showShareLinkModal";
import Meta from "../../components/Meta"; import Meta from "../../components/Meta";
import useConfig from "../../hooks/config.hook";
import useUser from "../../hooks/user.hook"; import useUser from "../../hooks/user.hook";
import shareService from "../../services/share.service"; import shareService from "../../services/share.service";
import { MyShare } from "../../types/share.type"; import { MyShare } from "../../types/share.type";
@ -28,6 +29,8 @@ const MyShares = () => {
const modals = useModals(); const modals = useModals();
const clipboard = useClipboard(); const clipboard = useClipboard();
const router = useRouter(); const router = useRouter();
const config = useConfig();
const { user } = useUser(); const { user } = useUser();
const [shares, setShares] = useState<MyShare[]>(); const [shares, setShares] = useState<MyShare[]>();
@ -86,13 +89,17 @@ const MyShares = () => {
onClick={() => { onClick={() => {
if (window.isSecureContext) { if (window.isSecureContext) {
clipboard.copy( clipboard.copy(
`${window.location.origin}/share/${share.id}` `${config.get("APP_URL")}/share/${share.id}`
); );
toast.success( toast.success(
"Your link was copied to the keyboard." "Your link was copied to the keyboard."
); );
} else { } else {
showShareLinkModal(modals, share.id); showShareLinkModal(
modals,
share.id,
config.get("APP_URL")
);
} }
}} }}
> >

3
frontend/src/pages/upload.tsx
View file

@ -140,7 +140,7 @@ const Upload = () => {
.completeShare(createdShare.id) .completeShare(createdShare.id)
.then(() => { .then(() => {
setisUploading(false); setisUploading(false);
showCompletedUploadModal(modals, createdShare); showCompletedUploadModal(modals, createdShare, config.get("APP_URL"));
setFiles([]); setFiles([]);
}) })
.catch(() => .catch(() =>
@ -164,6 +164,7 @@ const Upload = () => {
modals, modals,
{ {
isUserSignedIn: user ? true : false, isUserSignedIn: user ? true : false,
appUrl: config.get("APP_URL"),
allowUnauthenticatedShares: config.get( allowUnauthenticatedShares: config.get(
"ALLOW_UNAUTHENTICATED_SHARES" "ALLOW_UNAUTHENTICATED_SHARES"
), ),