email token duplication check
This commit is contained in:
parent
d4940105ff
commit
e47e0cdf65
2
pom.xml
2
pom.xml
|
@ -50,7 +50,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.loafle.overflow</groupId>
|
<groupId>com.loafle.overflow</groupId>
|
||||||
<artifactId>commons-java</artifactId>
|
<artifactId>commons-java</artifactId>
|
||||||
<version>1.0.13-SNAPSHOT</version>
|
<version>1.0.14-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -15,6 +15,7 @@ import com.loafle.overflow.model.email.EmailAuth;
|
||||||
import com.loafle.overflow.model.member.Member;
|
import com.loafle.overflow.model.member.Member;
|
||||||
import com.loafle.overflow.model.meta.MetaEmailStatus;
|
import com.loafle.overflow.model.meta.MetaEmailStatus;
|
||||||
import com.loafle.overflow.model.meta.MetaMemberStatus;
|
import com.loafle.overflow.model.meta.MetaMemberStatus;
|
||||||
|
import com.loafle.overflow.service.central.email.EmailAuthService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
@ -26,7 +27,7 @@ import java.util.*;
|
||||||
* Created by geek on 17. 6. 28.
|
* Created by geek on 17. 6. 28.
|
||||||
*/
|
*/
|
||||||
@Service("EmailAuthService")
|
@Service("EmailAuthService")
|
||||||
public class EmailAuthService {
|
public class CentralEmailAuthService implements EmailAuthService {
|
||||||
private static final String WEB_GO_MEMBER_ADDR = "http://127.0.0.1:4200/#/auth/";
|
private static final String WEB_GO_MEMBER_ADDR = "http://127.0.0.1:4200/#/auth/";
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
|
@ -1,14 +1,11 @@
|
||||||
package com.loafle.overflow.central.module.member.service;
|
package com.loafle.overflow.central.module.member.service;
|
||||||
|
|
||||||
import com.loafle.overflow.core.annotation.WebappAPI;
|
import com.loafle.overflow.core.annotation.WebappAPI;
|
||||||
import com.loafle.overflow.central.commons.utils.EmailSender;
|
|
||||||
import com.loafle.overflow.central.commons.utils.SessionMetadata;
|
import com.loafle.overflow.central.commons.utils.SessionMetadata;
|
||||||
import com.loafle.overflow.central.module.email.service.EmailAuthService;
|
|
||||||
import com.loafle.overflow.central.module.member.dao.MemberDAO;
|
import com.loafle.overflow.central.module.member.dao.MemberDAO;
|
||||||
|
|
||||||
import com.loafle.overflow.core.exception.OverflowException;
|
import com.loafle.overflow.core.exception.OverflowException;
|
||||||
import com.loafle.overflow.model.apikey.ApiKey;
|
import com.loafle.overflow.model.apikey.ApiKey;
|
||||||
import com.loafle.overflow.model.domain.Domain;
|
|
||||||
import com.loafle.overflow.model.domain.DomainMember;
|
import com.loafle.overflow.model.domain.DomainMember;
|
||||||
import com.loafle.overflow.model.email.EmailAuth;
|
import com.loafle.overflow.model.email.EmailAuth;
|
||||||
import com.loafle.overflow.model.member.Member;
|
import com.loafle.overflow.model.member.Member;
|
||||||
|
@ -17,6 +14,7 @@ import com.loafle.overflow.model.meta.MetaMemberStatus;
|
||||||
|
|
||||||
import com.loafle.overflow.service.central.apikey.ApiKeyService;
|
import com.loafle.overflow.service.central.apikey.ApiKeyService;
|
||||||
import com.loafle.overflow.service.central.domain.DomainMemberService;
|
import com.loafle.overflow.service.central.domain.DomainMemberService;
|
||||||
|
import com.loafle.overflow.service.central.email.EmailAuthService;
|
||||||
import com.loafle.overflow.service.central.member.MemberService;
|
import com.loafle.overflow.service.central.member.MemberService;
|
||||||
import com.loafle.overflow.service.central.probe.ProbeService;
|
import com.loafle.overflow.service.central.probe.ProbeService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
@ -40,9 +38,6 @@ public class CentralMemberService implements MemberService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private EmailAuthService emailAuthService;
|
private EmailAuthService emailAuthService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private EmailSender emailSender;
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ApiKeyService apiKeyService;
|
private ApiKeyService apiKeyService;
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ import com.loafle.overflow.central.module.infra.service.CentralInfraServiceServi
|
||||||
import com.loafle.overflow.central.module.probe.service.CentralProbeService;
|
import com.loafle.overflow.central.module.probe.service.CentralProbeService;
|
||||||
import com.loafle.overflow.central.module.target.dao.TargetDAO;
|
import com.loafle.overflow.central.module.target.dao.TargetDAO;
|
||||||
import com.loafle.overflow.core.exception.OverflowException;
|
import com.loafle.overflow.core.exception.OverflowException;
|
||||||
|
import com.loafle.overflow.core.model.PageParams;
|
||||||
import com.loafle.overflow.core.type.CryptoType;
|
import com.loafle.overflow.core.type.CryptoType;
|
||||||
import com.loafle.overflow.model.discovery.Host;
|
import com.loafle.overflow.model.discovery.Host;
|
||||||
import com.loafle.overflow.model.discovery.Service;
|
import com.loafle.overflow.model.discovery.Service;
|
||||||
|
@ -20,6 +21,7 @@ import com.loafle.overflow.model.target.Target;
|
||||||
import com.loafle.overflow.service.central.target.TargetService;
|
import com.loafle.overflow.service.central.target.TargetService;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -97,6 +99,9 @@ public class CentralTargetService implements TargetService {
|
||||||
return this.targetDAO.findByInfraId(infraService.getId());
|
return this.targetDAO.findByInfraId(infraService.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Page<Target> readAllByProbeID(Long probeID, PageParams pageParams) throws OverflowException {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
@Transactional
|
@Transactional
|
||||||
public List<Target> registDiscoveredTargets(Long probeId, List<Host> hosts, List<Service> services)
|
public List<Target> registDiscoveredTargets(Long probeId, List<Host> hosts, List<Service> services)
|
||||||
throws OverflowException {
|
throws OverflowException {
|
||||||
|
|
|
@ -4,6 +4,7 @@ package com.loafle.overflow.central.module.email.service;
|
||||||
import com.loafle.overflow.central.spring.AppConfigTest;
|
import com.loafle.overflow.central.spring.AppConfigTest;
|
||||||
import com.loafle.overflow.model.email.EmailAuth;
|
import com.loafle.overflow.model.email.EmailAuth;
|
||||||
import com.loafle.overflow.model.member.Member;
|
import com.loafle.overflow.model.member.Member;
|
||||||
|
import com.loafle.overflow.service.central.email.EmailAuthService;
|
||||||
import org.junit.Ignore;
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user