Minor fixes after switching authentication

Author: klakegg

src/main/java/no/java/submit/controller/TalkController.java

@@ -66,7 +66,11 @@ public TemplateInstance all() {
     @GET
     @Path("{sessionId}")
     public TemplateInstance view(@PathParam("sessionId") String sessionId, @Context SecurityIdentity securityIdentity) {
-        var session = talksService.getSession(securityIdentity.getPrincipal().getName(), sessionId);
+        var email = UserHelper.getEmail(securityIdentity);
+        var session = talksService.getSession(email, sessionId);
+
+        if (!session.containsEmail(email))
+            throw new NotAllowedException("Not allowed to view this session");
 
         return talk.data("session", session);
     }
@@ -84,7 +88,7 @@ public TemplateInstance newSession(@Context SecurityIdentity securityIdentity) {
         }};
         form.speakers = new ArrayList<>();
         form.speakers.add(new SpeakerForm() {{
-            this.email = securityIdentity.getPrincipal().getName();
+            this.email = UserHelper.getEmail(securityIdentity);
         }});
 
         return sessionForm
@@ -114,7 +118,7 @@ public Object newSessionPost(SessionForm form, @Context SecurityIdentity securit
         // Prepare form for sending
         var session = form.asSession();
         session.conferenceId = conferenceService.current().id;
-        session.postedBy = securityIdentity.getPrincipal().getName();
+        session.postedBy = UserHelper.getEmail(securityIdentity);
         session.status = initialStatus;
 
         // Send form data
@@ -129,7 +133,12 @@ public Object newSessionPost(SessionForm form, @Context SecurityIdentity securit
     @GET
     @Path("{sessionId}/edit")
     public TemplateInstance editSession(@PathParam("sessionId") String sessionId, @Context SecurityIdentity securityIdentity) {
-        var session = talksService.getSession(securityIdentity.getPrincipal().getName(), sessionId);
+        var email = UserHelper.getEmail(securityIdentity);
+
+        var session = talksService.getSession(email, sessionId);
+
+        if (!session.containsEmail(email))
+            throw new NotAllowedException("Not allowed to view this session");
 
         if (!conferenceService.current().id.equals(session.conferenceId))
             throw new NotFoundException();
@@ -155,7 +164,7 @@ public Object editSessionPost(@PathParam("sessionId") String sessionId, SessionF
 
         // Prepare form for sending
         var session = form.asSession();
-        session.postedBy = securityIdentity.getPrincipal().getName();
+        session.postedBy = UserHelper.getEmail(securityIdentity);
         session.sessionId = sessionId;
 
         // Send form data
@@ -167,21 +176,6 @@ public Object editSessionPost(@PathParam("sessionId") String sessionId, SessionF
                 .build();
     }
 
-    @POST
-    @Path("{sessionId}/submit")
-    public Response submitTalk(@PathParam("sessionId") String sessionId, @Context SecurityIdentity securityIdentity) {
-        var session = talksService.getSession(securityIdentity.getPrincipal().getName(), sessionId);
-
-        if (session.conferenceId.equals(conferenceService.current().id)) {
-            session.status = "SUBMITTED";
-            talksService.updateSession(session.postedBy, sessionId, session);
-        }
-
-        return Response
-                .seeOther(UriBuilder.fromUri("/talk/{sessionID}").build(sessionId))
-                .build();
-    }
-
     @GET
     @Path("new/_speaker")
     public TemplateInstance addSpeaker() {

src/main/java/no/java/submit/service/TalksService.java

@@ -70,6 +70,19 @@ class Session {
         public String sessionId, conferenceId, postedBy, status, lastUpdated;
         public Map<String, DataField<Object>> data;
         public List<Speaker> speakers;
+
+        public boolean containsEmail(String email) {
+            System.out.println(email);
+            System.out.println(postedBy);
+            if (email.equals(postedBy))
+                return true;
+
+            for (Speaker speaker : speakers)
+                if (email.equals(speaker.email))
+                    return true;
+
+            return false;
+        }
     }
 
     class Speaker {

src/main/java/no/java/submit/util/UserHelper.java

@@ -9,6 +9,10 @@ static OidcJwtCallerPrincipal getPrincipal(SecurityIdentity securityIdentity) {
         return (OidcJwtCallerPrincipal) securityIdentity.getPrincipal();
     }
 
+    static String getEmail(SecurityIdentity securityIdentity) {
+        return getPrincipal(securityIdentity).getClaim("email");
+    }
+
     static boolean hasExtension(SecurityIdentity securityIdentity) {
         // TODO
         return false;