Merge branch 'develop' into translate-with-ai

~ Conflicts:
~	src/main/java/org/wise/portal/presentation/web/controllers/author/project/AuthorAPIController.java
~	src/test/java/org/wise/portal/presentation/web/controllers/author/project/AuthorAPIControllerTest.java

Author: hirokiterashima

src/main/java/org/wise/portal/domain/user/User.java

@@ -55,4 +55,6 @@ public interface User extends Persistable, Comparable<User> {
   boolean isTrustedAuthor();
 
   List<String> getRoles();
+
+  boolean isEnabled();
 }

src/main/java/org/wise/portal/domain/user/impl/UserImpl.java

@@ -158,4 +158,9 @@ public boolean equals(Object obj) {
   public int compareTo(User o) {
     return getId().compareTo(o.getId());
   }
+
+  @Override
+  public boolean isEnabled() {
+    return this.getUserDetails().isEnabled();
+  }
 }

…n/web/controllers/ChatGptcontroller.java …n/web/controllers/ChatGptController.javasrc/main/java/org/wise/portal/presentation/web/controllers/ChatGptcontroller.java renamed to src/main/java/org/wise/portal/presentation/web/controllers/ChatGptController.java src/main/java/org/wise/portal/presentation/web/controllers/ChatGptcontroller.java renamed to src/main/java/org/wise/portal/presentation/web/controllers/ChatGptController.java

@@ -6,8 +6,7 @@
 import java.io.OutputStreamWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,33 +15,36 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api")
-public class ChatGptcontroller {
+@RequestMapping("/api/chat-gpt")
+public class ChatGptController {
 
-  @Autowired
-  Environment appProperties;
+  @Value("${openai.api.key:}")
+  private String openAiApiKey;
+
+  @Value("${openai.chat.api.url:https://api.openai.com/v1/chat/completions}")
+  private String openAiChatApiUrl;
 
   @ResponseBody
   @Secured("ROLE_USER")
-  @PostMapping("/chat-gpt")
+  @PostMapping
   protected String sendChatMessage(@RequestBody String body) {
-    String openaiApiKey = appProperties.getProperty("OPENAI_API_KEY");
-    if (openaiApiKey == null || openaiApiKey.isEmpty()) {
-      throw new RuntimeException("OPENAI_API_KEY is not set");
+    if (openAiApiKey == null || openAiApiKey.isEmpty()) {
+      throw new RuntimeException("openai.api.key is not set");
     }
     try {
-      URL url = new URL("https://api.openai.com/v1/chat/completions");
+      URL url = new URL(openAiChatApiUrl);
       HttpURLConnection connection = (HttpURLConnection) url.openConnection();
       connection.setRequestMethod("POST");
-      connection.setRequestProperty("Authorization", "Bearer " + openaiApiKey);
+      connection.setRequestProperty("Authorization", "Bearer " + openAiApiKey);
       connection.setRequestProperty("Content-Type", "application/json; charset=utf-8");
       connection.setRequestProperty("Accept-Charset", "UTF-8");
       connection.setDoOutput(true);
       OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
       writer.write(body);
       writer.flush();
       writer.close();
-      BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream(),"ISO-8859-1"));
+      BufferedReader br = new BufferedReader(
+          new InputStreamReader(connection.getInputStream(), "UTF-8"));
       String line;
       StringBuffer response = new StringBuffer();
       while ((line = br.readLine()) != null) {

src/main/java/org/wise/portal/presentation/web/controllers/InformationController.java

@@ -194,6 +194,10 @@ public void handleGetConfigWISE5Preview(HttpServletRequest request, HttpServletR
         addCommonConfigParameters(request, config, project, rawProjectUrl);
       } else {
         Project project = projectService.getById(Long.parseLong(projectIdStr));
+        if (!project.getOwner().isEnabled()) {
+          response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+          return;
+        }
         addCommonConfigParameters(request, config, project);
       }
 

src/main/java/org/wise/portal/presentation/web/controllers/author/project/AuthorAPIController.java

@@ -399,7 +399,7 @@ protected HashMap<String, Object> getAuthorProjectConfig(Authentication auth,
     config.put("projectAssetURL", contextPath + "/api/author/project/asset/" + project.getId());
     config.put("projectBaseURL", projectBaseURL);
     config.put("previewProjectURL", contextPath + "/preview/unit/" + project.getId());
-    config.put("chatGptEnabled", !StringUtils.isEmpty(appProperties.getProperty("OPENAI_API_KEY")));
+    config.put("chatGptEnabled", !StringUtils.isEmpty(appProperties.getProperty("openai.api.key")));
     config.put("translationServiceEnabled", this.awsPropertiesConfigured());
     config.put("cRaterRequestURL", contextPath + "/api/c-rater");
     config.put("importStepsURL",
@@ -426,9 +426,9 @@ protected HashMap<String, Object> getAuthorProjectConfig(Authentication auth,
   }
 
   private boolean awsPropertiesConfigured() {
-    return !(StringUtils.isEmpty(appProperties.getProperty("aws.accessKeyId")) 
-          || StringUtils.isEmpty(appProperties.getProperty("aws.secretAccessKey")) 
-          || StringUtils.isEmpty(appProperties.getProperty("aws.region")));
+    return !(StringUtils.isEmpty(appProperties.getProperty("aws.accessKeyId"))
+        || StringUtils.isEmpty(appProperties.getProperty("aws.secretAccessKey"))
+        || StringUtils.isEmpty(appProperties.getProperty("aws.region")));
   }
 
   /**

src/main/resources/application-dockerdev-sample.properties

@@ -224,7 +224,8 @@ aws.secretAccessKey=
 aws.region=
 
 # OpenAI and AWS Bedrock Chat endpoints (optional)
-#OPENAI_API_KEY=
+#openai.api.key=
+#openai.chat.api.url=
 #aws.bedrock.api.key=
 #aws.bedrock.runtime.endpoint=
 

src/main/resources/application_sample.properties

@@ -224,6 +224,7 @@ aws.secretAccessKey=
 aws.region=
 
 # OpenAI and AWS Bedrock Chat endpoints (optional)
-#OPENAI_API_KEY=
+#openai.api.key=
+#openai.chat.api.url=
 #aws.bedrock.api.key=
 #aws.bedrock.runtime.endpoint=

src/test/java/org/wise/portal/presentation/web/controllers/author/project/AuthorAPIControllerTest.java

@@ -80,7 +80,7 @@ public void getAuthorProjectConfig_HasProjectRun_ReturnCanGradeStudentWork() thr
     replay(request);
     expect(appProperties.getProperty("curriculum_base_www"))
         .andReturn("http://localhost:8080/curriculum");
-    expect(appProperties.getProperty("OPENAI_API_KEY")).andReturn("OPENAPIKEY");
+    expect(appProperties.getProperty("openai.api.key")).andReturn("OPENAPIKEY");
     expect(appProperties.getProperty("aws.accessKeyId")).andReturn("ACCESSKEY");
     expect(appProperties.getProperty("aws.secretAccessKey")).andReturn("SECRETKEY");
     expect(appProperties.getProperty("aws.region")).andReturn("us-west-1");