Merge branch 'main' into 1532_Do_not_allow_words_that_are_digits

Author: nya-elimu

.github/codecov.yml

@@ -1,4 +1,4 @@
 coverage:
-  range: 5..80
+  range: 15..80
   round: down
   precision: 2

INSTALL.md

@@ -39,7 +39,7 @@ To run the application in debug mode, replace `mvn` with `mvnDebug` in the comma
 
 ```
 mvn test
-open target/site/jacoco/index.html 
+open target/site/jacoco/index.html
 ```
 
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>ai.elimu</groupId>
     <artifactId>webapp</artifactId>
     <packaging>war</packaging>
-    <version>2.2.127-SNAPSHOT</version>
+    <version>2.2.128-SNAPSHOT</version>
 
     <properties>
     	<java.version>11</java.version>

src/main/java/ai/elimu/model/contributor/Contributor.java

@@ -33,6 +33,8 @@ public class Contributor extends BaseEntity {
 
     // TODO: add registrationPlatform
 
+    // TODO: add registrationProvider
+    
 //    @Column(unique=true)
     private String providerIdGoogle;
 
@@ -45,9 +47,9 @@ public class Contributor extends BaseEntity {
 //    @Column(unique=true)
     private String providerIdGitHub;
 
+//    @Column(unique=true)
     private String providerIdDiscord;
 
-//    @Column(unique=true)
     private String usernameGitHub;
 
     private String usernameDiscord;

src/main/java/ai/elimu/rest/v2/crowdsource/ContributorsRestControllerWeb3.java

@@ -69,7 +69,7 @@ public String handleGetRequest(
             logger.info("jsonResponse: " + jsonResponse);
             return jsonResponse;
         }
-        
+        providerIdWeb3 = providerIdWeb3.toLowerCase();
         String providerIdWeb3Signature = contributorJSONObject.getString("providerIdWeb3Signature");
         logger.info("providerIdWeb3Signature: " + providerIdWeb3Signature);
         if (StringUtils.isBlank(providerIdWeb3Signature)) {

src/main/java/ai/elimu/util/db/DbMigrationHelper.java

@@ -83,11 +83,15 @@ public synchronized void performDatabaseMigration(WebApplicationContext webAppli
                             logger.error(ex);
                         }
 
+                        // Update current version
+                        logger.info("Updating current version (" + scriptVersion + ")");
                         DbMigration dbMigration = new DbMigration();
                         dbMigration.setVersion(scriptVersion);
                         dbMigration.setScript(script);
                         dbMigration.setCalendar(Calendar.getInstance());
                         dbMigrationDao.create(dbMigration);
+                        
+                        logger.info("Database migration complete!");
                     }
                 }
             }

src/main/java/ai/elimu/web/SignOnControllerWeb3.java

@@ -33,7 +33,7 @@ public class SignOnControllerWeb3 {
     @Autowired
     private ContributorDao contributorDao;
 
-    @RequestMapping("/sign-on/web3")
+    @RequestMapping(value="/sign-on/web3", method=RequestMethod.GET)
     public String handleGetRequest(HttpServletRequest request) throws IOException {
         logger.info("handleGetRequest");
 
@@ -52,12 +52,12 @@ public String handleAuthorization(
             @RequestParam String signature
     ) throws IOException {
         logger.info("handleAuthorization");
-        
         logger.info("address: " + address);
         if (StringUtils.isBlank(address)) {
             return "redirect:/sign-on/web3?error=Missing address";
         }
-        
+        address = address.toLowerCase();
+
         logger.info("signature: " + signature);
         if (StringUtils.isBlank(signature)) {
             return "redirect:/sign-on/web3?error=Missing signature";

src/main/resources/db/migration/2002127.sql

@@ -0,0 +1,4 @@
+# 2.2.127
+
+# Convert existing Ethereum addresses to lower-case
+UPDATE Contributor SET providerIdWeb3 = LOWER(providerIdWeb3);

src/main/webapp/static/js/web3provider.js

@@ -85,7 +85,7 @@ async function disconnect() {
   console.log("Killing the wallet connection", provider);
 
   // TODO: Which providers have close method?
-  if (provider.close) {
+  if (provider && provider.close) {
     await provider.close();
 
     // If the cached provider is not cleared,
@@ -94,7 +94,9 @@ async function disconnect() {
     // Depending on your use case you may want or want not his behavir.
     provider = null;
   }
-  await web3Modal.clearCachedProvider();
+  if (web3Modal) {
+    await web3Modal.clearCachedProvider();
+  }
 }
 
 /**

src/test/java/ai/elimu/web/SignOnControllerWeb3Test.java

@@ -0,0 +1,89 @@
+package ai.elimu.web;
+
+import static org.junit.Assert.*;
+import org.junit.Before;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations={
+    "file:src/main/webapp/WEB-INF/spring/applicationContext.xml",
+    "file:src/main/webapp/WEB-INF/spring/applicationContext-jpa.xml"
+})
+public class SignOnControllerWeb3Test {
+    
+    @Autowired
+    private SignOnControllerWeb3 signOnControllerWeb3;
+    
+    private MockMvc mockMvc;
+    
+    @Before
+    public void setup() {
+        assertNotNull(signOnControllerWeb3);
+        mockMvc = MockMvcBuilders.standaloneSetup(signOnControllerWeb3).build();
+        assertNotNull(mockMvc);
+    }
+    
+    @Test
+    public void testHandleGetRequest() throws Exception {
+        RequestBuilder requestBuilder = MockMvcRequestBuilders
+                .get("/sign-on/web3");
+        MvcResult mvcResult = mockMvc.perform(requestBuilder).andReturn();
+        assertEquals(HttpStatus.OK.value(), mvcResult.getResponse().getStatus());
+        assertEquals("sign-on-web3", mvcResult.getModelAndView().getViewName());
+    }
+    
+    @Test
+    public void testHandleAuthorization_missingParameters() throws Exception {
+        RequestBuilder requestBuilder = MockMvcRequestBuilders
+                .post("/sign-on/web3")
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        MvcResult mvcResult = mockMvc.perform(requestBuilder).andReturn();
+        assertEquals(HttpStatus.BAD_REQUEST.value(), mvcResult.getResponse().getStatus());
+        assertNull(mvcResult.getModelAndView());
+    }
+    
+    @Test
+    public void testHandleAuthorization_emptyParameters() throws Exception {
+        RequestBuilder requestBuilder = MockMvcRequestBuilders
+                .post("/sign-on/web3")
+                .param("address", "")
+                .param("signature", "0x30755ed65396facf86c53e6217c52b4daebe72aa4941d89635409de4c9c7f9466d4e9aaec7977f05e923889b33c0d0dd27d7226b6e6f56ce737465c5cfd04be400")
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        MvcResult mvcResult = mockMvc.perform(requestBuilder).andReturn();
+        assertEquals(HttpStatus.MOVED_TEMPORARILY.value(), mvcResult.getResponse().getStatus());
+        assertEquals("redirect:/sign-on/web3?error=Missing address", mvcResult.getModelAndView().getViewName());
+        
+        requestBuilder = MockMvcRequestBuilders
+                .post("/sign-on/web3")
+                .param("address", "0x11f4d0A3c12e86B4b5F39B213F7E19D048276DAe")
+                .param("signature", "")
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        mvcResult = mockMvc.perform(requestBuilder).andReturn();
+        assertEquals(HttpStatus.MOVED_TEMPORARILY.value(), mvcResult.getResponse().getStatus());
+        assertEquals("redirect:/sign-on/web3?error=Missing signature", mvcResult.getModelAndView().getViewName());
+    }
+    
+    @Test
+    public void testHandleAuthorization_invalidSignature() throws Exception {
+        RequestBuilder requestBuilder = MockMvcRequestBuilders
+                .post("/sign-on/web3")
+                .param("address", "0x11f4d0A3c12e86B4b5F39B213F7E19D048276DAe")
+                .param("signature", "0x30755ed65396facf86c53e6217c52b4daebe72aa4941d89635409de4c9c7f9466d4e9aaec7977f05e923889b33c0d0dd27d7226b6e6f56ce737465c5cfd04be400")
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        MvcResult mvcResult = mockMvc.perform(requestBuilder).andReturn();
+        assertEquals(HttpStatus.MOVED_TEMPORARILY.value(), mvcResult.getResponse().getStatus());
+        assertEquals("redirect:/sign-on/web3?error=Invalid signature", mvcResult.getModelAndView().getViewName());
+    }
+}