fix updating verification for account (#376)

mikewacker · Jan 19, 2025 · 6337763 · 6337763
1 parent 35e82e1
commit 6337763
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...store-demo/src/main/java/org/example/age/module/store/demo/DemoSiteVerificationStore.java b/...store-demo/src/main/java/org/example/age/module/store/demo/DemoSiteVerificationStore.java
@@ -45,9 +45,11 @@ public CompletionStage<Optional<String>> trySave(String accountId, VerifiedUser
             Optional<String> maybeConflictingAccountId = Optional.ofNullable(verifiedAccounts.get(user.getPseudonym()));
             if (maybeConflictingAccountId.isPresent()) {
                 String conflictingAccountId = maybeConflictingAccountId.get();
-                VerificationState conflictingState = loadAndUpdate(conflictingAccountId);
-                if (conflictingState.getStatus() == VerificationStatus.VERIFIED) {
-                    return CompletableFuture.completedFuture(Optional.of(conflictingAccountId));
+                if (!conflictingAccountId.equals(accountId)) {
+                    VerificationState conflictingState = loadAndUpdate(conflictingAccountId);
+                    if (conflictingState.getStatus() == VerificationStatus.VERIFIED) {
+                        return CompletableFuture.completedFuture(Optional.of(conflictingAccountId));
+                    }
                 }
             }
 

diff --git a/.../store-demo/src/test/java/org/example/age/module/store/demo/DemoSiteAccountStoreTest.java b/.../store-demo/src/test/java/org/example/age/module/store/demo/DemoSiteAccountStoreTest.java
@@ -39,6 +39,16 @@ public void saveThenLoad() {
         assertThat(state.getUser()).isEqualTo(user);
     }
 
+    @Test
+    public void saveTwiceForSameAccount() {
+        VerifiedUser user = TestModels.createVerifiedUser();
+        Optional<String> maybeConflictingAccountId1 = getCompleted(store.trySave("username", user, expiresIn(5)));
+        assertThat(maybeConflictingAccountId1).isEmpty();
+
+        Optional<String> maybeConflictingAccountId2 = getCompleted(store.trySave("username", user, expiresIn(10)));
+        assertThat(maybeConflictingAccountId2).isEmpty();
+    }
+
     @Test
     public void loadUnverified() {
         VerificationState state = getCompleted(store.load("username"));