Feature: Discord auth.

cardano-foundation · Sep 15, 2023 · 86d7b52 · 86d7b52
1 parent f8301f6
commit 86d7b52
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 27 deletions.
diff --git a/...cation-service/src/main/java/org/cardano/foundation/voting/domain/IsVerifiedResponse.java b/...cation-service/src/main/java/org/cardano/foundation/voting/domain/IsVerifiedResponse.java
@@ -3,9 +3,11 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.ToString;
 
 @AllArgsConstructor
 @Getter
+@ToString
 public class IsVerifiedResponse {
 
     private boolean isVerified;

diff --git a/...ce/src/main/java/org/cardano/foundation/voting/domain/entity/DiscordUserVerification.java b/...ce/src/main/java/org/cardano/foundation/voting/domain/entity/DiscordUserVerification.java
@@ -22,7 +22,7 @@
 public class DiscordUserVerification extends AbstractTimestampEntity {
 
     @Id
-    @Column(name = "discord_id_hash", nullable = false)
+    @Column(name = "id", nullable = false)
     @Getter
     @Setter
     private String discordIdHash;

diff --git a/...ervice/src/main/java/org/cardano/foundation/voting/resource/UserVerificationResource.java b/...ervice/src/main/java/org/cardano/foundation/voting/resource/UserVerificationResource.java
@@ -8,12 +8,14 @@
 import org.cardano.foundation.voting.domain.IsVerifiedResponse;
 import org.cardano.foundation.voting.service.discord.DiscordUserVerificationService;
 import org.cardano.foundation.voting.service.sms.SMSUserVerificationService;
+import org.cardano.foundation.voting.utils.CompletableFutures;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.zalando.problem.Problem;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
@@ -34,7 +36,7 @@ public class UserVerificationResource {
     @Timed(value = "resource.isVerified", histogram = true)
     public ResponseEntity<?> isVerified(@PathVariable("eventId") String eventId,
                                         @PathVariable("stakeAddress") String stakeAddress) throws ExecutionException, InterruptedException {
-        var isVerifiedRequest = new IsVerifiedRequest(stakeAddress, eventId);
+        var isVerifiedRequest = new IsVerifiedRequest(eventId, stakeAddress);
 
         log.info("Received isVerified request: {}", isVerifiedRequest);
 
@@ -46,19 +48,26 @@ public ResponseEntity<?> isVerified(@PathVariable("eventId") String eventId,
             return discordUserVerificationService.isVerified(isVerifiedRequest);
         });
 
-        var isVerified = CompletableFuture.anyOf(smsVerificationFuture, discordVerificationFuture);
+        var allFutures = CompletableFutures.anyResultsOf(List.of(smsVerificationFuture, discordVerificationFuture));
 
-        var isVerifiedResponseE = (Either<Problem, IsVerifiedResponse>) isVerified
-                .orTimeout(30, SECONDS)
-                .get();
+        List<Either<Problem, IsVerifiedResponse>> allResponses = allFutures.orTimeout(30, SECONDS)
+                .join();
 
-        return isVerifiedResponseE.fold(problem -> {
-                    return ResponseEntity.status(problem.getStatus().getStatusCode()).body(problem);
-                },
-                isVerifiedResponse -> {
-                    return ResponseEntity.ok().body(isVerifiedResponse);
-                }
-        );
+        var successCount = allResponses.stream().filter(Either::isRight).count();
+
+        if (successCount != 2) {
+            var problem = allResponses.stream().filter(Either::isLeft).findFirst().orElseThrow().getLeft();
+
+            return ResponseEntity.status(problem.getStatus().getStatusCode()).body(problem);
+        }
+
+        var successes = allResponses.stream().filter(Either::isRight).toList().stream().map(Either::get).toList();
+
+        var isVerified = successes.stream().reduce((a, b) -> {
+            return new IsVerifiedResponse(a.isVerified() || b.isVerified());
+        }).orElse(new IsVerifiedResponse(false));
+
+        return ResponseEntity.ok().body(isVerified);
     }
 
 }
diff --git a/.../org/cardano/foundation/voting/service/discord/DefaultDiscordUserVerificationService.java b/.../org/cardano/foundation/voting/service/discord/DefaultDiscordUserVerificationService.java
@@ -1,7 +1,6 @@
 package org.cardano.foundation.voting.service.discord;
 
 import io.vavr.control.Either;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.cardano.foundation.voting.client.ChainFollowerClient;
 import org.cardano.foundation.voting.domain.CardanoNetwork;
@@ -33,7 +32,6 @@
 
 @Service
 @Slf4j
-@AllArgsConstructor
 public class DefaultDiscordUserVerificationService implements DiscordUserVerificationService {
 
     @Autowired
@@ -90,7 +88,7 @@ public Either<Problem, DiscordStartVerificationResponse> startVerification(Disco
 
         var maybeEvent = eventDetails.get();
         if (maybeEvent.isEmpty()) {
-            log.warn("Active event not found:{}", discordBotEventIdBinding);
+            log.warn("Event not found:{}", discordBotEventIdBinding);
 
             return Either.left(Problem.builder()
                     .withTitle("EVENT_NOT_FOUND")
@@ -134,7 +132,7 @@ public Either<Problem, IsVerifiedResponse> checkVerification(DiscordCheckVerific
 
         var maybeEvent = eventDetails.get();
         if (maybeEvent.isEmpty()) {
-            log.warn("Active event not found:{}", discordBotEventIdBinding);
+            log.warn("Event not found:{}", discordBotEventIdBinding);
 
             return Either.left(Problem.builder()
                     .withTitle("EVENT_NOT_FOUND")
@@ -243,7 +241,7 @@ public Either<Problem, IsVerifiedResponse> checkVerification(DiscordCheckVerific
             );
         }
 
-        DiscordUserVerification pendingUserVerification = maybePendingVerification.orElseThrow();
+        var pendingUserVerification = maybePendingVerification.orElseThrow();
 
         var now = LocalDateTime.now(clock);
 

diff --git a/.../java/org/cardano/foundation/voting/service/sms/DefaultSMSSMSUserVerificationService.java b/.../java/org/cardano/foundation/voting/service/sms/DefaultSMSSMSUserVerificationService.java
@@ -92,7 +92,7 @@ public Either<Problem, SMSStartVerificationResponse> startVerification(SMSStartV
 
         var maybeEvent = eventDetails.get();
         if (maybeEvent.isEmpty()) {
-            log.warn("Active event not found:{}", eventId);
+            log.warn("Event not found:{}", eventId);
 
             return Either.left(Problem.builder()
                     .withTitle("EVENT_NOT_FOUND")
@@ -238,7 +238,7 @@ public Either<Problem, IsVerifiedResponse> checkVerification(SMSCheckVerificatio
 
         var maybeEvent = activeEventE.get();
         if (maybeEvent.isEmpty()) {
-            log.error("Active event not found:{}", eventId);
+            log.error("Event not found:{}", eventId);
 
             return Either.left(Problem.builder()
                     .withTitle("EVENT_NOT_FOUND")
@@ -345,7 +345,7 @@ public Either<Problem, IsVerifiedResponse> isVerified(IsVerifiedRequest isVerifi
 
         var maybeEvent = activeEventE.get();
         if (maybeEvent.isEmpty()) {
-            log.error("Active event not found:{}", isVerifiedRequest.getEventId());
+            log.error("Event not found:{}", isVerifiedRequest.getEventId());
 
             return Either.left(Problem.builder()
                     .withTitle("EVENT_NOT_FOUND")

diff --git a/...ication-service/src/main/java/org/cardano/foundation/voting/utils/CompletableFutures.java b/...ication-service/src/main/java/org/cardano/foundation/voting/utils/CompletableFutures.java
@@ -0,0 +1,20 @@
+package org.cardano.foundation.voting.utils;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+public final class CompletableFutures {
+
+    public static <T> CompletableFuture<List<T>> anyResultsOf(List<CompletableFuture<T>> completableFutures) {
+        var allFutures = CompletableFuture
+                .anyOf(completableFutures.toArray(new CompletableFuture[completableFutures.size()]));
+
+        return allFutures.thenApply(
+                future -> {
+                    return completableFutures.stream()
+                            .map(CompletableFuture::join)
+                            .toList();
+                });
+    }
+
+}
diff --git a/...ication-service/src/main/resources/db/migration/h2/V0__user_verification_service_init.sql b/...ication-service/src/main/resources/db/migration/h2/V0__user_verification_service_init.sql
@@ -32,7 +32,7 @@ create index idx_sms_stake_address_status_phone_hash on sms_user_verification(ev
 create index idx_sms_stake_address_status_req_id on sms_user_verification(event_id, stake_address, status, request_id);
 
 CREATE TABLE discord_user_verification (
-   discord_id_hash VARCHAR(255) NOT NULL,
+   id VARCHAR(255) NOT NULL, -- discord id hash
 
    event_id VARCHAR(255) NOT NULL,
 
@@ -47,7 +47,7 @@ CREATE TABLE discord_user_verification (
    created_at TIMESTAMP WITHOUT TIME ZONE NOT NULL,
    updated_at TIMESTAMP WITHOUT TIME ZONE NOT NULL,
 
-   CONSTRAINT pk_discord_id_hash PRIMARY KEY (discord_id_hash)
+   CONSTRAINT pk_discord_id_hash PRIMARY KEY (id)
 );
 
 create index idx_discord_stake_event_id on sms_user_verification(event_id);
@@ -56,4 +56,4 @@ create index idx_discord_event_id_status on sms_user_verification(event_id, stat
 
 create index idx_discord_stake_address_status on sms_user_verification(event_id, stake_address, status);
 
-create index idx_discord_status_event_discord_id_hash on sms_user_verification(event_id, status, discord_id_hash);
+create index idx_discord_status_event_discord_id_hash on sms_user_verification(event_id, status, id);
diff --git a/...service/src/main/resources/db/migration/postgresql/V0__user_verification_service_init.sql b/...service/src/main/resources/db/migration/postgresql/V0__user_verification_service_init.sql
@@ -32,7 +32,7 @@ create index idx_sms_stake_address_status_phone_hash on sms_user_verification(ev
 create index idx_sms_stake_address_status_req_id on sms_user_verification(event_id, stake_address, status, request_id);
 
 CREATE TABLE discord_user_verification (
-   discord_id_hash VARCHAR(255) NOT NULL,
+   id VARCHAR(255) NOT NULL, -- discord id hash
 
    event_id VARCHAR(255) NOT NULL,
 
@@ -47,7 +47,7 @@ CREATE TABLE discord_user_verification (
    created_at TIMESTAMP WITHOUT TIME ZONE NOT NULL,
    updated_at TIMESTAMP WITHOUT TIME ZONE NOT NULL,
 
-   CONSTRAINT pk_discord_id_hash PRIMARY KEY (discord_id_hash)
+   CONSTRAINT pk_discord_id_hash PRIMARY KEY (id)
 );
 
 create index idx_discord_stake_event_id on sms_user_verification(event_id);
@@ -56,4 +56,4 @@ create index idx_discord_event_id_status on sms_user_verification(event_id, stat
 
 create index idx_discord_stake_address_status on sms_user_verification(event_id, stake_address, status);
 
-create index idx_discord_status_event_discord_id_hash on sms_user_verification(event_id, status, discord_id_hash);
+create index idx_discord_status_event_discord_id_hash on sms_user_verification(event_id, status, id);