Revert "Feat: no basic auth (#183)"

src/main/java/de/samply/bbmri/negotiator/rest/Directory.java

@@ -100,6 +100,7 @@ public Response createQueryOptions(String queryString, @Context HttpServletReque
     public Response createQuery(String queryString, @Context HttpServletRequest request) {
         String apiCallId = UUID.randomUUID().toString();
         logger.info(apiCallId + " API call via create_query API.");
+        checkAuthentication(request);
 
         try(Config config = getConfigFromDactory()) {
 

src/test/java/de/samply/bbmri/negotiator/rest/DirectoryAPITest.java

@@ -43,8 +43,15 @@ void tearDown() {
     @Test
     @DisplayName("Create new Request with no Token")
     void testCreateQuery_withNoToken() throws SQLException {
+        // Mock config classes
+        Mockito.when(negotiatorConfig.getMolgenisUsername()).thenReturn("username");
+        Mockito.when(negotiatorConfig.getMolgenisPassword()).thenReturn("password");
+        Mockito.when(request.getHeader("Authorization")).thenReturn("Basic dXNlcm5hbWU6cGFzc3dvcmQ=");
+
+        // Mock object under test
         Directory directorySpy = Mockito.spy(directory);
         Mockito.doReturn(config).when(directorySpy).getConfigFromDactory();
+        Mockito.doReturn(negotiatorConfig).when(directorySpy).getNegotiatorConfig();
 
         JsonQueryRecord jsonQueryRecord = new JsonQueryRecord();
         jsonQueryRecord.setJsonText(queryJsonNoNToken);
@@ -60,16 +67,23 @@ void testCreateQuery_withNoToken() throws SQLException {
     @Test
     @DisplayName("Create new Request with Token")
     void testCreateQuery_withToken() throws SQLException {
-         Mockito.when(queryRecord.getJsonText()).thenReturn(recordJsonWithMultipleQueries);
+        // Mock classes
+        Mockito.when(negotiatorConfig.getMolgenisUsername()).thenReturn("username");
+        Mockito.when(negotiatorConfig.getMolgenisPassword()).thenReturn("password");
+        Mockito.when(request.getHeader("Authorization")).thenReturn("Basic dXNlcm5hbWU6cGFzc3dvcmQ=");
+        Mockito.when(queryRecord.getJsonText()).thenReturn(recordJsonWithMultipleQueries);
 
+        // Mock object under test
         Directory directorySpy = Mockito.spy(directory);
         Mockito.doReturn(config).when(directorySpy).getConfigFromDactory();
+        Mockito.doReturn(negotiatorConfig).when(directorySpy).getNegotiatorConfig();
         Mockito.doReturn(queryRecord).when(directorySpy).getQueryForNToken(Mockito.any(), Mockito.any());
         Mockito.doNothing().when(directorySpy).updateRecord(queryRecord);
 
         JsonQueryRecord jsonQueryRecord = new JsonQueryRecord();
         jsonQueryRecord.setJsonText(queryJsonNToken);
         jsonQueryRecord.setId(1);
+        //Mockito.doReturn(jsonQueryRecord).when(directorySpy).saveJsonQueryRecord(queryJsonNToken, config);
 
         // Test call
         Response response = directorySpy.createQuery(queryJsonNToken, request);