fix: redirect users to login for authenticated actions

sunaurus · Mar 30, 2024 · 0fe22e5 · 0fe22e5
1 parent 9d7c58f
commit 0fe22e5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/app/communities/SubscribeButton.tsx b/src/app/communities/SubscribeButton.tsx
@@ -14,16 +14,6 @@ export const SubscribeButton = (props: {
   readonly communityId: number;
   readonly communityName: string;
 }) => {
-  const { pending } = useFormStatus();
-
-  if (!props.loggedInUser) {
-    return null;
-  }
-
-  if (pending) {
-    return <Spinner />;
-  }
-
   switch (props.currentStatus) {
     case "Subscribed":
       return (

diff --git a/src/app/create_post/page.tsx b/src/app/create_post/page.tsx
@@ -2,10 +2,19 @@ import { apiClient } from "@/app/apiClient";
 import { formatCommunityName } from "@/app/c/formatCommunityName";
 import { PageWithSidebar } from "@/app/PageWithSidebar";
 import { PostEditor } from "@/app/create_post/PostEditor";
+import { loginPageWithRedirectAction } from "@/app/login/authActions";
 
 const CreatePostPage = async (props: {
   readonly searchParams: { community_id?: number };
 }) => {
+  const { my_user: loggedInUser } = await apiClient.getSite();
+  if (!loggedInUser) {
+    await loginPageWithRedirectAction(
+      `/create_post?community_id=${props.searchParams.community_id}`,
+      true,
+    );
+  }
+
   const { community_view: communityView, moderators: mods } =
     await apiClient.getCommunity({
       id: props.searchParams.community_id,

diff --git a/src/app/post/[id]/edit/page.tsx b/src/app/post/[id]/edit/page.tsx
@@ -2,8 +2,14 @@ import { apiClient } from "@/app/apiClient";
 import { formatCommunityName } from "@/app/c/formatCommunityName";
 import { PageWithSidebar } from "@/app/PageWithSidebar";
 import { PostEditor } from "@/app/create_post/PostEditor";
+import { loginPageWithRedirectAction } from "@/app/login/authActions";
 
 const EditPostPage = async (props: { readonly params: { id: number } }) => {
+  const { my_user: loggedInUser } = await apiClient.getSite();
+  if (!loggedInUser) {
+    await loginPageWithRedirectAction(`/post/${props.params.id}/edit`, true);
+  }
+
   const {
     post_view: postView,
     community_view: communityView,