Deploy release comrun

Author: cayhorstmann

app/com/horstmann/codecheck/Util.java

@@ -616,7 +616,7 @@ public static String toJsonString(Object obj) {
 		}
 	}
 
-	public static ObjectNode fromJsonString(String jsonString) throws JsonProcessingException {
+	public static ObjectNode fromJsonString(String jsonString) throws JsonProcessingException, IOException {
 		return (ObjectNode) mapper.readTree(jsonString);
 	}
 

app/controllers/Config.java

@@ -0,0 +1,41 @@
+package controllers;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.horstmann.codecheck.ResourceLoader;
+
+import play.db.Database;
+import play.db.Databases;
+
+@Singleton public class Config implements ResourceLoader {
+    @Inject private com.typesafe.config.Config config;
+    @Inject private play.api.Environment playEnv;
+    private Database db;
+
+    public InputStream loadResource(String path) throws IOException {
+        return playEnv.classLoader().getResourceAsStream("public/resources/" + path);
+    }
+    public String getProperty(String key) {
+        return config.hasPath(key) ? config.getString(key) : null;
+    }
+    public String getString(String key) { // TODO Why do we need both getString and getProperty?
+        return getProperty(key);
+    }
+    public boolean hasPath(String key) {
+        return getProperty(key) != null;
+    }
+    
+    // TODO: Thread safety
+    public Connection getDatabaseConnection() {
+    	if (db == null) {
+    		String driver = config.getString("com.horstmann.corejava.sql.driver");
+    		String url = config.getString("com.horstmann.corejava.sql.url");
+    		db = Databases.createFrom(driver, url);
+    	}
+    	return db.getConnection();
+    }
+}

app/controllers/Util.java

@@ -0,0 +1,38 @@
+package controllers;
+
+import play.mvc.Http;
+
+import java.time.Duration;
+
+public class Util {
+    public static String prefix(Http.Request request) {
+        boolean secure = request.secure() || request.getHeaders().getAll("X-Forwarded-Proto").contains("https");
+        /*
+           One shouldn't have to do this, but with Google Cloud, X-Forwarded-For has two entries (e.g. [95.90.234.41, 130.211.33.19])
+           and X-Forwarded-Proto has one ([https]). From 
+           https://github.com/playframework/playframework/blob/814f0c73f86eb0e85bcae7f2167c73a08fed9fd7/transport/server/play-server/src/main/scala/play/core/server/common/ForwardedHeaderHandler.scala
+           line 204, Play doesn't conclude that the connection was secure. 
+         */   
+        String prefix;
+        if (request.host().equals("localhost")) {
+            prefix = "../";
+            long countSlash = request.uri().chars().filter(ch -> ch == '/').count() - 1;
+            for (long i = 0; i < countSlash; ++i) {
+                prefix += "../";
+            }
+            prefix = prefix.substring(0, prefix.length() - 1);
+        }
+        else {
+            prefix = (secure ? "https://" : "http://") + request.host();
+        }  
+        return prefix;
+    }
+    
+    public static Http.Cookie buildCookie(String name, String value) {
+        return Http.Cookie.builder(name, value)
+                .withPath("/")
+                .withMaxAge(Duration.ofDays(180))
+                .withSameSite(Http.Cookie.SameSite.STRICT)
+                .build();
+    }
+}

public/editProblem.js

@@ -0,0 +1,46 @@
+window.addEventListener('DOMContentLoaded', () => {
+
+let i = 1
+let done = false	
+while (!done) { 
+  const deleteButton = document.getElementById('delete' + i)
+  if (deleteButton == null) 
+	done = true
+  else {
+    deleteButton.addEventListener('click',
+	    function() {
+	      document.getElementById('filename' + i).setAttribute('value', '')
+	      document.getElementById('contents' + i).innerHTML = ''
+	      document.getElementById('item' + i).style.display = 'none'
+	    })
+	  i++
+	}
+}
+let fileIndex = i
+document.getElementById('addfile').addEventListener('click',
+  function() {
+    let fileDiv = document.createElement('div')
+    fileDiv.setAttribute('id', 'item' + fileIndex)
+    fileDiv.innerHTML = '<p>File name: <input id="filename' + fileIndex + '" name="filename' + fileIndex 
+            + '" size="25" type="text"/> <button id="delete' + fileIndex 
+            +'" type="button">Delete</button></p><p><textarea id="contents' + fileIndex + '" name="contents' + fileIndex 
+            + '" rows="24" cols="80"/></textarea></p>'
+    let addFile = document.getElementById('addfilecontainer')
+    addFile.parentNode.insertBefore(fileDiv, addFile)
+    
+    document.getElementById('delete' + fileIndex).addEventListener('click',
+      function() {
+        document.getElementById('filename' + fileIndex).setAttribute('value', '')
+        document.getElementById('contents' + fileIndex).innerHTML = ''
+        document.getElementById('item' + fileIndex).style.display = 'none'
+    })
+	fileIndex++
+})
+
+document.getElementById('upload').disabled = document.getElementById('file').files.length === 0 
+
+document.getElementById('file').addEventListener('change', function() {
+    document.getElementById('upload').disabled = document.getElementById('file').files.length === 0
+})
+
+})