RIFFMASTER: add pdf generation authorized with token

Backend/Spring/.idea/workspace.xml

@@ -222,7 +222,7 @@
       <workItem from="1687011079341" duration="18876000" />
       <workItem from="1687039482556" duration="614000" />
       <workItem from="1687040353033" duration="220000" />
-      <workItem from="1687069497459" duration="15660000" />
+      <workItem from="1687069497459" duration="18536000" />
     </task>
     <task id="LOCAL-00001" summary="add basic hello world and transfering data to server">
       <created>1679575346987</created>

Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/security/CustomInterceptor.java

@@ -36,6 +36,9 @@ public class CustomInterceptor implements HandlerInterceptor {
         userRoles.put("DELETE", Set.of("ROLE_ADMIN"));
         endpointRoles.put("/users", userRoles);
 
+        Map<String, Set<String>> pdfRoles = new HashMap<>();
+        pdfRoles.put("GET", Set.of("ROLE_USER", "ROLE_MODERATOR", "ROLE_ADMIN"));
+        endpointRoles.put("/pdf", pdfRoles);
 
     }
 
@@ -98,6 +101,7 @@ public class CustomInterceptor implements HandlerInterceptor {
                         return HandlerInterceptor.super.preHandle(request, response, handler);
                     }
                     else {
+                        System.out.println("nie udało sie zautoryzować xddd");
                         response.setStatus(HttpStatus.FORBIDDEN.value());
                         response.getWriter().write("Unauthorized access");
                         return false;
@@ -129,15 +133,24 @@ public class CustomInterceptor implements HandlerInterceptor {
     }
 
     private boolean isAuthorized(String endpoint, String method, Set<String> roles) {
+        // Remove the variable part from the endpoint
+        String mainEndpoint = endpoint.split("/\\d+")[0];
+
         System.out.println("Authorization in isAuthorized() method");
-        System.out.println("    endpoint: " + endpoint);
+        System.out.println("    endpoint: " + mainEndpoint);
         System.out.println("    method: " + method);
         System.out.println("    roles: " + roles);
 
 
-        Map<String, Set<String>> methodRoles = endpointRoles.get(endpoint);
+        Map<String, Set<String>> methodRoles = endpointRoles.get(mainEndpoint);
+
+        System.out.println("methodRoles " + methodRoles);
+
         if (methodRoles != null) {
             Set<String> requiredRoles = methodRoles.get(method);
+
+            System.out.println("requiredRoles " + requiredRoles);
+
             if (requiredRoles != null) {
                 return !Collections.disjoint(roles, requiredRoles);
             }
@@ -145,6 +158,8 @@ public class CustomInterceptor implements HandlerInterceptor {
         return false;
     }
 
+
+
     @Override
     public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
         HandlerInterceptor.super.postHandle(request, response, handler, modelAndView);

Frontend/RiffMasterFront/.idea/workspace.xml

@@ -6,9 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="d91bc08d-d968-4797-8fb3-ef602a37db2a" name="Changes" comment="RIFFMASTER: add frontend business logic (riff, song)">
       <change beforePath="$PROJECT_DIR$/../../Backend/Spring/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/configuration/SecurityConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/configuration/SecurityConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/configuration/SpringConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/configuration/SpringConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/security/JwtTokenUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/security/JwtTokenUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/security/CustomInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../Backend/Spring/src/main/java/pl/dmcs/jwoszczyk/security/CustomInterceptor.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -115,7 +113,7 @@
       <workItem from="1687011087000" duration="9476000" />
       <workItem from="1687039479377" duration="859000" />
       <workItem from="1687040351475" duration="221000" />
-      <workItem from="1687069506147" duration="9763000" />
+      <workItem from="1687069506147" duration="11478000" />
     </task>
     <task id="LOCAL-00001" summary="RIFFMASTER: add frontend project">
       <created>1685976235580</created>

Frontend/RiffMasterFront/src/app/Services/song.service.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { Song } from '../models/song';
 import { parseString } from 'xml2js';
 import { Riff } from '../models/riff';
-
+import { map } from 'rxjs/operators';
 @Injectable({
   providedIn: 'root'
 })
@@ -23,9 +23,9 @@ export class SongService {
 
 
   uploadSong(song: Song): Observable<Song> {
-    const headers = new HttpHeaders({
-      'Content-Type': 'application/json'
-    });
+    const headers = new HttpHeaders()
+      .set('Content-Type', 'application/json')
+      .set('Authorization', sessionStorage.getItem("jwtToken")!);
 
     return this.http.post<Song>(this.apiUrl, song, { headers });
   }
@@ -116,9 +116,16 @@ export class SongService {
 
 
   generatePdf(songId: number): Observable<Blob> {
-    return this.http.get(`${this.pdfUrl}/${songId}`, { responseType: 'blob' });
+    const headers = new HttpHeaders()
+      .set('Content-Type', 'application/json')
+      .set('Authorization', sessionStorage.getItem("jwtToken")!);
+
+
+
+    return this.http.get(`${this.pdfUrl}/${songId}`, { responseType: 'blob', headers: headers });
   }
 
+
   deleteSong(id: number): Observable<void> {
     const url = `${this.apiUrl}/${id}`;
     return this.http.delete<void>(url);