Project

General

Profile

« Previous | Next » 

Revision 8cb8fc5c

Added by Andreas Kohlbecker over 2 years ago

ref #9497 user account self registration: AccountCreationRequest only with email-address

  • request tokens only with email address possible
  • refactoring request tokens class hierarchy
  • ... and token stores

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/security/PasswordResetTokenStoreTest.java
36 36
    private static final String USER_NAME = "dummy";
37 37

  
38 38
    @SpringBeanByName
39
    private IAbstractRequestTokenStore<PasswordResetRequest> passwordResetTokenStore;
39
    private IAbstractRequestTokenStore<PasswordResetRequest, User> passwordResetTokenStore;
40 40

  
41 41
    private User testUser;
42 42

  
......
49 49

  
50 50
    @Test
51 51
    public void testTokenStillValid() {
52
        String token = passwordResetTokenStore.create(testUser).getToken();
52
        String token = passwordResetTokenStore.create(USER_EMAIL, testUser).getToken();
53 53
        assertTrue(passwordResetTokenStore.isEligibleToken(token));
54
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findResetRequest(token);
54
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findRequest(token);
55 55
        assertTrue(resetRequest.isPresent());
56 56
        assertEquals(USER_NAME, resetRequest.get().getUserName());
57 57
        assertEquals(USER_EMAIL, resetRequest.get().getUserEmail());
......
61 61
    @Test
62 62
    public void testTokenExpired() {
63 63
        passwordResetTokenStore.setTokenLifetimeMinutes(-10);
64
        String token = passwordResetTokenStore.create(testUser).getToken();
64
        String token = passwordResetTokenStore.create(USER_EMAIL, testUser).getToken();
65 65
        assertFalse(passwordResetTokenStore.isEligibleToken(token));
66
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findResetRequest(token);
66
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findRequest(token);
67 67
        assertTrue(!resetRequest.isPresent());
68 68
    }
69 69

  
......
71 71
    public void testTokenUnknown() {
72 72
        String unknownToken = "un-known-token";
73 73
        assertFalse(passwordResetTokenStore.isEligibleToken(unknownToken));
74
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findResetRequest(unknownToken);
74
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findRequest(unknownToken);
75 75
        assertTrue(!resetRequest.isPresent());
76 76
    }
77 77

  
......
79 79
    public void testTokenNull() {
80 80
        String nullToken = null;
81 81
        assertFalse(passwordResetTokenStore.isEligibleToken(nullToken));
82
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findResetRequest(nullToken);
82
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findRequest(nullToken);
83 83
        assertTrue(!resetRequest.isPresent());
84 84
    }
85 85

  
86 86

  
87 87
    @Test
88 88
    public void testTokenRemove() {
89
        String token = passwordResetTokenStore.create(testUser).getToken();
89
        String token = passwordResetTokenStore.create(USER_EMAIL, testUser).getToken();
90 90
        assertTrue(passwordResetTokenStore.isEligibleToken(token));
91
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findResetRequest(token);
91
        Optional<PasswordResetRequest> resetRequest = passwordResetTokenStore.findRequest(token);
92 92
        assertTrue(resetRequest.isPresent());
93 93
        passwordResetTokenStore.remove(token);
94
        resetRequest = passwordResetTokenStore.findResetRequest(token);
94
        resetRequest = passwordResetTokenStore.findRequest(token);
95 95
        assertFalse("Expecing false since the token has been removed", resetRequest.isPresent());
96 96
    }
97 97

  

Also available in: Unified diff