Merge pull request #31 from jorbush/fix-jwt

Fix JWT token issue
jorbush · Sep 30, 2024 · 12451c6 · 12451c6
2 parents 16fc324 + b6cfb6f
commit 12451c6
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 2 deletions.
diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml
@@ -33,6 +33,7 @@ jobs:
           flyctl secrets set SPRING_DATASOURCE_URL="${{ secrets.SPRING_DATASOURCE_URL }}"
           flyctl secrets set SPRING_DATASOURCE_USERNAME="${{ secrets.SPRING_DATASOURCE_USERNAME }}"
           flyctl secrets set SPRING_DATASOURCE_PASSWORD="${{ secrets.SPRING_DATASOURCE_PASSWORD }}"
+          flyctl secrets set APP_JWTSECRET="${{ secrets.APP_JWTSECRET }}"
 
       - name: Deploy to Fly.io
         env:

diff --git a/postrify-backend/src/main/java/com/postrify/postrifybackend/controller/PostController.java b/postrify-backend/src/main/java/com/postrify/postrifybackend/controller/PostController.java
@@ -40,6 +40,9 @@ public List<PostResponseDTO> getPostsByUser(@PathVariable final Long userId) {
   @PostMapping
   public ResponseEntity<PostResponseDTO> createPost(
       @RequestBody final PostRequest postRequest, final Authentication authentication) {
+    if (authentication == null) {
+      return ResponseEntity.status(401).build();
+    }
     String username = authentication.getName();
     User user = userService.findByUsername(username);
 
@@ -57,6 +60,9 @@ public ResponseEntity<PostResponseDTO> updatePost(
       @PathVariable final Long id,
       @RequestBody final PostRequest postRequest,
       final Authentication authentication) {
+    if (authentication == null) {
+      return ResponseEntity.status(401).build();
+    }
     String username = authentication.getName();
     User user = userService.findByUsername(username);
 
@@ -71,6 +77,9 @@ public ResponseEntity<PostResponseDTO> updatePost(
   @DeleteMapping("/{id}")
   public ResponseEntity<Void> deletePost(
       @PathVariable final Long id, final Authentication authentication) {
+    if (authentication == null) {
+      return ResponseEntity.status(401).build();
+    }
     String username = authentication.getName();
     User user = userService.findByUsername(username);
     postService.deletePost(id, user);

diff --git a/postrify-backend/src/main/resources/application.properties b/postrify-backend/src/main/resources/application.properties
@@ -4,5 +4,5 @@ spring.datasource.username=postgres
 spring.datasource.password=postgres
 spring.jpa.hibernate.ddl-auto=update
 app.jwtSecret=YourJwtSecretKey
-app.jwtExpirationInMs=86400000
+app.jwtExpirationInMs=2592000000
 spring.jpa.open-in-view=false
diff --git a/postrify-frontend/src/app/components/post-detail/post-detail.component.ts b/postrify-frontend/src/app/components/post-detail/post-detail.component.ts
@@ -4,6 +4,7 @@ import { PostResponseDTO } from '../../models/post-response.model';
 import { AuthService } from '../../services/auth.service';
 import { PostService } from '../../services/post.service';
 import { CommonModule } from '@angular/common';
+import { ToastService } from '../../services/toast.service';
 
 @Component({
   selector: 'app-post-detail',
@@ -219,6 +220,7 @@ export class PostDetailComponent implements OnInit {
     private postService: PostService,
     private router: Router,
     private authService: AuthService,
+    private toastService: ToastService,
   ) {}
 
   ngOnInit(): void {
@@ -249,7 +251,17 @@ export class PostDetailComponent implements OnInit {
             console.log('Post deleted successfully');
             this.router.navigate(['/']);
           },
-          error: (error) => console.error('Error deleting post', error),
+          error: (error) => {
+            console.error('Error deleting post', error);
+            this.toastService.show('Error deleting post', 'error');
+            if (error.status === 401) {
+              this.toastService.show(
+                'You need to be logged in to delete a post',
+                'error',
+              );
+              this.router.navigate(['/login']);
+            }
+          },
         });
       }
     }

diff --git a/postrify-frontend/src/app/components/post-form/post-form.component.ts b/postrify-frontend/src/app/components/post-form/post-form.component.ts
@@ -165,6 +165,13 @@ export class PostFormComponent {
       error: (error) => {
         console.error('Error creating post', error);
         this.toastService.show('Error creating post', 'error');
+        if (error.status === 401) {
+          this.toastService.show(
+            'You need to be logged in to create a post',
+            'error',
+          );
+          this.router.navigate(['/login']);
+        }
       },
     });
   }

diff --git a/postrify-frontend/src/app/components/post-update/post-update.component.ts b/postrify-frontend/src/app/components/post-update/post-update.component.ts
@@ -169,6 +169,7 @@ export class PostUpdateComponent implements OnInit {
         },
         error: (error) => {
           console.error('Error fetching post data', error);
+          this.toastService.show('Error fetching post data', 'error');
         },
       });
     }
@@ -185,6 +186,13 @@ export class PostUpdateComponent implements OnInit {
       error: (error) => {
         console.error('Error updating post', error);
         this.toastService.show('Error updating post', 'error');
+        if (error.status === 401) {
+          this.toastService.show(
+            'You need to be logged in to update a post',
+            'error',
+          );
+          this.router.navigate(['/login']);
+        }
       },
     });
   }