Revert 8 feature/ivyxjc

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/AuthController.java

@@ -4,13 +4,12 @@
 import com.auth0.jwt.interfaces.DecodedJWT;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.clevercastle.authforge.exception.CastleException;
+import org.clevercastle.authforge.entity.User;
+import org.clevercastle.authforge.entity.UserLoginItem;
 import org.clevercastle.authforge.UserRegisterRequest;
 import org.clevercastle.authforge.UserService;
 import org.clevercastle.authforge.UserWithToken;
-import org.clevercastle.authforge.dto.OneTimePasswordDto;
-import org.clevercastle.authforge.exception.CastleException;
-import org.clevercastle.authforge.model.User;
-import org.clevercastle.authforge.model.UserLoginItem;
 import org.clevercastle.authforge.oauth2.Oauth2ClientConfig;
 import org.clevercastle.authforge.oauth2.github.GithubOauth2ExchangeService;
 import org.clevercastle.authforge.oauth2.oidc.OidcExchangeService;
@@ -85,10 +84,9 @@ public User register(@RequestBody RegisterRequest request) throws CastleExceptio
         return userService.register(userRegisterRequest);
     }
 
-
     @GetMapping("auth/verify")
-    public UserWithToken verify(@RequestParam String email, @RequestParam String verificationCode) throws CastleException {
-        userService.verify("email#" + email, verificationCode);
+    public UserWithToken verify(@RequestParam String loginIdentifier, @RequestParam String verificationCode) throws CastleException {
+        userService.verify("email#" + loginIdentifier, verificationCode);
         return null;
     }
 
@@ -142,14 +140,4 @@ public UserWithToken exchange(@RequestParam SsoType ssoType, @RequestParam Strin
         }
         return null;
     }
-
-    @GetMapping("auth/one-time-password")
-    public OneTimePasswordDto requestOneTimePassword(@RequestParam String email) throws CastleException {
-        return userService.requestOneTimePassword("email#" + email);
-    }
-
-    @PostMapping("auth/one-time-password")
-    public UserWithToken verifyOneTimePassword(@RequestBody VerifyOneTimeRequest request) throws CastleException {
-        return userService.verifyOneTimePassword("email#" + request.getEmail(), request.getOneTimePassword());
-    }
 }

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/Beans.java

@@ -1,22 +1,19 @@
 package org.clevercastle.authforge.examples.springboot.springbootexample;
 
 import com.auth0.jwt.algorithms.Algorithm;
-import org.clevercastle.authforge.DummyCacheServiceImpl;
 import org.clevercastle.authforge.Config;
 import org.clevercastle.authforge.UserService;
 import org.clevercastle.authforge.UserServiceImpl;
 import org.clevercastle.authforge.repository.UserRepository;
+import org.clevercastle.authforge.repository.dynamodb.DynamodbUser;
 import org.clevercastle.authforge.repository.dynamodb.DynamodbUserRepositoryImpl;
-import org.clevercastle.authforge.repository.rdsjpa.RdsJpaChallengeSessionRepository;
-import org.clevercastle.authforge.repository.rdsjpa.RdsJpaOneTimePasswordRepository;
-import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserHmacSecretRepository;
 import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserLoginItemRepository;
 import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserModelRepository;
 import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserRefreshTokenMappingRepository;
 import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserRepositoryImpl;
 import org.clevercastle.authforge.token.TokenService;
 import org.clevercastle.authforge.token.jwt.JwtTokenService;
-import org.clevercastle.authforge.code.DummyCodeSender;
+import org.clevercastle.authforge.verification.DummyVerificationService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
@@ -40,12 +37,8 @@ public class Beans {
     @Bean
     public UserRepository userRepository(RdsJpaUserModelRepository userModelRepository,
                                          RdsJpaUserLoginItemRepository userLoginItemRepository,
-                                         RdsJpaUserRefreshTokenMappingRepository userRefreshTokenMappingRepository,
-                                         RdsJpaOneTimePasswordRepository oneTimePasswordRepository,
-                                         RdsJpaChallengeSessionRepository challengeSessionRepository,
-                                         RdsJpaUserHmacSecretRepository userHmacSecretRepository) {
-        return new RdsJpaUserRepositoryImpl(userModelRepository, userLoginItemRepository,
-                userRefreshTokenMappingRepository, oneTimePasswordRepository, challengeSessionRepository, userHmacSecretRepository);
+                                         RdsJpaUserRefreshTokenMappingRepository userRefreshTokenMappingRepository) {
+        return new RdsJpaUserRepositoryImpl(userModelRepository, userLoginItemRepository, userRefreshTokenMappingRepository);
     }
 
 
@@ -84,8 +77,8 @@ public TokenService tokenService() throws NoSuchAlgorithmException, InvalidKeySp
     }
 
     @Bean
-    public UserService userService(UserRepository userRepository, TokenService tokenService) {
-        return new UserServiceImpl(Config.builder().build(), userRepository, tokenService, new DummyCodeSender(), new DummyCacheServiceImpl());
+    public UserService userService(UserRepository dynamodbUserRepository, TokenService tokenService) {
+        return new UserServiceImpl(Config.builder().build(), dynamodbUserRepository, tokenService, new DummyVerificationService(dynamodbUserRepository));
     }
 
 

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/SpringBootExampleApplication.java

@@ -1,6 +1,6 @@
 package org.clevercastle.authforge.examples.springboot.springbootexample;
 
-import org.clevercastle.authforge.model.User;
+import org.clevercastle.authforge.entity.User;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/UserLoginItemRepositoryAdapter.java

@@ -1,6 +1,6 @@
 package org.clevercastle.authforge.examples.springboot.springbootexample;
 
-import org.clevercastle.authforge.model.UserLoginItem;
+import org.clevercastle.authforge.entity.UserLoginItem;
 import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserLoginItemRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/UserModelRepositoryAdapter.java

@@ -1,6 +1,6 @@
 package org.clevercastle.authforge.examples.springboot.springbootexample;
 
-import org.clevercastle.authforge.model.User;
+import org.clevercastle.authforge.entity.User;
 import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserModelRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/UserRefreshTokenMappingRepositoryAdapter.java

@@ -1,6 +1,6 @@
 package org.clevercastle.authforge.examples.springboot.springbootexample;
 
-import org.clevercastle.authforge.model.UserRefreshTokenMapping;
+import org.clevercastle.authforge.entity.UserRefreshTokenMapping;
 import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserRefreshTokenMappingRepository;
 import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserRefreshTokenMappingId;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/org/clevercastle/authforge/Config.java

@@ -1,12 +1,10 @@
 package org.clevercastle.authforge;
 
 public class Config {
-    // in second
+    // in seconds
     private int verificationCodeExpireTime;
-    // in second
+    // in seconds
     private int tokenExpireTime;
-    // in second
-    private int oneTimePasswordExpireTime;
 
     public int getVerificationCodeExpireTime() {
         return verificationCodeExpireTime;
@@ -16,22 +14,22 @@ public int getTokenExpireTime() {
         return tokenExpireTime;
     }
 
-    public int getOneTimePasswordExpireTime() {
-        return oneTimePasswordExpireTime;
-    }
 
     public static ConfigBuilder builder() {
         return new ConfigBuilder();
     }
 
     public static final class ConfigBuilder {
-        private int verificationCodeExpireTime;
-        private int tokenExpireTime;
-        private int oneTimePasswordExpireTime;
+        private int verificationCodeExpireTime = 300;
+        private int tokenExpireTime = 28400;
 
         private ConfigBuilder() {
         }
 
+        public static ConfigBuilder aConfig() {
+            return new ConfigBuilder();
+        }
+
         public ConfigBuilder verificationCodeExpireTime(int verificationCodeExpireTime) {
             this.verificationCodeExpireTime = verificationCodeExpireTime;
             return this;
@@ -42,16 +40,10 @@ public ConfigBuilder tokenExpireTime(int tokenExpireTime) {
             return this;
         }
 
-        public ConfigBuilder oneTimePasswordExpireTime(int oneTimePasswordExpireTime) {
-            this.oneTimePasswordExpireTime = oneTimePasswordExpireTime;
-            return this;
-        }
-
         public Config build() {
             Config config = new Config();
-            config.tokenExpireTime = this.tokenExpireTime;
-            config.oneTimePasswordExpireTime = this.oneTimePasswordExpireTime;
             config.verificationCodeExpireTime = this.verificationCodeExpireTime;
+            config.tokenExpireTime = this.tokenExpireTime;
             return config;
         }
     }

src/main/java/org/clevercastle/authforge/UserService.java

@@ -1,14 +1,10 @@
 package org.clevercastle.authforge;
 
 import org.apache.commons.lang3.tuple.Pair;
-import org.clevercastle.authforge.dto.OneTimePasswordDto;
+import org.clevercastle.authforge.entity.User;
+import org.clevercastle.authforge.entity.UserLoginItem;
 import org.clevercastle.authforge.exception.CastleException;
-import org.clevercastle.authforge.model.ChallengeSession;
-import org.clevercastle.authforge.model.User;
-import org.clevercastle.authforge.model.UserLoginItem;
 import org.clevercastle.authforge.oauth2.Oauth2ClientConfig;
-import org.clevercastle.authforge.totp.RequestTotpResponse;
-import org.clevercastle.authforge.totp.SetupTotpRequest;
 
 public interface UserService {
     // used for username/password, email/password, mobile/password
@@ -28,17 +24,4 @@ public interface UserService {
 
     // used for sso login
     UserWithToken exchange(Oauth2ClientConfig clientConfig, String authorizationCode, String state, String redirectUrl) throws CastleException;
-
-    // one time password login
-    OneTimePasswordDto requestOneTimePassword(String loginIdentifier) throws CastleException;
-
-    UserWithToken verifyOneTimePassword(String loginIdentifier, String oneTimePassword) throws CastleException;
-
-    // mfa challenge
-    ChallengeSession createChallenge(String userId, ChallengeSession.Type type);
-
-    RequestTotpResponse requestTotp(User user) throws CastleException;
-
-    // setup mfa
-    void setupTotp(User user, SetupTotpRequest request) throws CastleException;
 }