feat: add share url alias /s

stonith404 · Jul 22, 2023 · 231a2e9 · 231a2e9
1 parent 7827b68
commit 231a2e9
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 10 deletions.
diff --git a/backend/src/email/email.service.ts b/backend/src/email/email.service.ts
@@ -54,7 +54,7 @@ export class EmailService {
     if (!this.config.get("email.enableShareEmailRecipients"))
       throw new InternalServerErrorException("Email service disabled");
 
-    const shareUrl = `${this.config.get("general.appUrl")}/share/${shareId}`;
+    const shareUrl = `${this.config.get("general.appUrl")}/s/${shareId}`;
 
     await this.sendMail(
       recipientEmail,
@@ -75,7 +75,7 @@ export class EmailService {
   }
 
   async sendMailToReverseShareCreator(recipientEmail: string, shareId: string) {
-    const shareUrl = `${this.config.get("general.appUrl")}/share/${shareId}`;
+    const shareUrl = `${this.config.get("general.appUrl")}/s/${shareId}`;
 
     await this.sendMail(
       recipientEmail,

diff --git a/frontend/src/components/account/showShareInformationsModal.tsx b/frontend/src/components/account/showShareInformationsModal.tsx
@@ -15,7 +15,7 @@ const showShareInformationsModal = (
   maxShareSize: number
 ) => {
   const t = translateOutsideContext();
-  const link = `${appUrl}/share/${share.id}`;
+  const link = `${appUrl}/s/${share.id}`;
 
   let shareSize: number = 0;
   for (let file of share.files as FileMetaData[])

diff --git a/frontend/src/components/account/showShareLinkModal.tsx b/frontend/src/components/account/showShareLinkModal.tsx
@@ -8,7 +8,7 @@ const showShareLinkModal = (
   appUrl: string
 ) => {
   const t = translateOutsideContext();
-  const link = `${appUrl}/share/${shareId}`;
+  const link = `${appUrl}/s/${shareId}`;
   return modals.openModal({
     title: t("account.shares.modal.share-link"),
     children: (

diff --git a/frontend/src/components/upload/modals/showCompletedUploadModal.tsx b/frontend/src/components/upload/modals/showCompletedUploadModal.tsx
@@ -30,7 +30,7 @@ const Body = ({ share, appUrl }: { share: Share; appUrl: string }) => {
   const router = useRouter();
   const t = useTranslate();
 
-  const link = `${appUrl}/share/${share.id}`;
+  const link = `${appUrl}/s/${share.id}`;
 
   return (
     <Stack align="stretch">

diff --git a/frontend/src/components/upload/modals/showCreateUploadModal.tsx b/frontend/src/components/upload/modals/showCreateUploadModal.tsx
@@ -168,8 +168,7 @@ const CreateUploadModalBody = ({
               color: theme.colors.gray[6],
             })}
           >
-            {options.appUrl}/share/
-            {form.values.link == "" ? "myAwesomeShare" : form.values.link}
+            {`${options.appUrl}/s/${form.values.link}`}
           </Text>
           {!options.isReverseShare && (
             <>

diff --git a/frontend/src/middleware.ts b/frontend/src/middleware.ts
@@ -14,7 +14,7 @@ export const config = {
 export async function middleware(request: NextRequest) {
   const routes = {
     unauthenticated: new Routes(["/auth/*", "/"]),
-    public: new Routes(["/share/*", "/upload/*"]),
+    public: new Routes(["/share/*", "/s/*", "/upload/*"]),
     admin: new Routes(["/admin/*"]),
     account: new Routes(["/account*"]),
     disabled: new Routes([]),

diff --git a/frontend/src/pages/account/reverseShares.tsx b/frontend/src/pages/account/reverseShares.tsx
@@ -159,7 +159,7 @@ const MyShares = () => {
                                   onClick={() => {
                                     if (window.isSecureContext) {
                                       clipboard.copy(
-                                        `${appUrl}/share/${share.id}`
+                                        `${appUrl}/s/${share.id}`
                                       );
                                       toast.success(t("common.notify.copied"));
                                     } else {

diff --git a/frontend/src/pages/account/shares.tsx b/frontend/src/pages/account/shares.tsx
@@ -132,7 +132,7 @@ const MyShares = () => {
                         onClick={() => {
                           if (window.isSecureContext) {
                             clipboard.copy(
-                              `${config.get("general.appUrl")}/share/${
+                              `${config.get("general.appUrl")}/s/${
                                 share.id
                               }`
                             );

diff --git a/frontend/src/pages/s/[shareId].ts b/frontend/src/pages/s/[shareId].ts
@@ -0,0 +1,18 @@
+import { GetServerSidePropsContext } from "next";
+
+// Redirect to the share page
+export function getServerSideProps(context: GetServerSidePropsContext) {
+  const { shareId } = context.params!;
+
+  return {
+    props: {},
+    redirect: {
+      permanent: false,
+      destination: "/share/" + shareId,
+    },
+  };
+}
+
+export default function ShareAlias() {
+  return null;
+}