blocked duplicate emsil
This commit is contained in:
@@ -20,6 +20,7 @@ DATABASE_HOST=10.20.30.60
|
||||
DATABASE_PORT=5432
|
||||
DATABASE_NAME=merms_panel
|
||||
|
||||
ALLOWED_SIGNUP_EMAIL_RESUSE=0
|
||||
KAFKA_BROKER = '10.10.10.120:9092'
|
||||
|
||||
SIMBRELLA_BASE_URL00="http://10.10.11.17:6337"
|
||||
|
||||
@@ -20,6 +20,7 @@ DATABASE_HOST=10.13.3.60
|
||||
DATABASE_PORT=5432
|
||||
DATABASE_NAME=merms_panel
|
||||
|
||||
ALLOWED_SIGNUP_EMAIL_RESUSE=0
|
||||
KAFKA_BROKER = '10.10.10.120:9092'
|
||||
|
||||
SIMBRELLA_BASE_URL00="http://10.10.11.17:6337"
|
||||
|
||||
@@ -31,6 +31,7 @@ SIMBRELLA_BASE_URL="https://bank-emulator.dev.simbrellang.net"
|
||||
VALID_APP_ID=app1
|
||||
VALID_API_KEY=test-api-key-12345
|
||||
|
||||
ALLOWED_SIGNUP_EMAIL_RESUSE=0
|
||||
START_URL_PATTERN =".devprov.mermsemr.com"
|
||||
|
||||
# Event Bus Broker Configuration
|
||||
|
||||
@@ -86,7 +86,7 @@ def merms_login():
|
||||
@jwt_required()
|
||||
def merms_register():
|
||||
data = request.get_json()
|
||||
response = RegisterService.process_request(data)
|
||||
response = RegisterService.start_account_register(data)
|
||||
return response
|
||||
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ class RegisterService(BaseService):
|
||||
SEND_EMAIL_FROM = Config.SEND_EMAIL_FROM
|
||||
SEND_EMAIL_PASS = Config.SEND_EMAIL_PASS
|
||||
THIS_SITE_URL = Config.THIS_SITE_URL
|
||||
ALLOWED_SIGNUP_EMAIL_RESUSE = Config.ALLOWED_SIGNUP_EMAIL_RESUSE
|
||||
|
||||
@staticmethod
|
||||
def encrypt_password(self, password):
|
||||
@@ -156,7 +157,7 @@ class RegisterService(BaseService):
|
||||
|
||||
|
||||
@staticmethod
|
||||
def process_request(data):
|
||||
def start_account_register(data):
|
||||
try:
|
||||
with db.session.begin():
|
||||
|
||||
@@ -164,7 +165,17 @@ class RegisterService(BaseService):
|
||||
# Simulate processing
|
||||
firstname = validated_data.get('firstname')
|
||||
lastname = validated_data.get('lastname')
|
||||
email = validated_data.get('email')
|
||||
email = str(validated_data.get('email')).lower()
|
||||
|
||||
if RegisterService.ALLOWED_SIGNUP_EMAIL_RESUSE== '0':
|
||||
logger.info(f"RegisterService.ALLOWED_SIGNUP_EMAIL_RESUSE=0")
|
||||
if Members.get_member_by_email(email) != None:
|
||||
return {
|
||||
"message": "Please use another email",
|
||||
"error_message": "Please use another email or reset password",
|
||||
"data": None,
|
||||
"error": f"Please use another email."
|
||||
}, 400
|
||||
|
||||
regData = MembersPending.add_members_pending( firstname, lastname, email)
|
||||
BaseService.send_verify_signup_mail(regData.email, regData.uid, regData.id, firstname, lastname)
|
||||
|
||||
@@ -39,6 +39,8 @@ class Config:
|
||||
"JWT_REFRESH_TOKEN_EXPIRES", timedelta(days=30)
|
||||
)
|
||||
|
||||
ALLOWED_SIGNUP_EMAIL_RESUSE = os.getenv("ALLOWED_SIGNUP_EMAIL_RESUSE", '0')
|
||||
|
||||
# KAFKA_BROKER = 'dev-events.simbrellang.net:9085'
|
||||
KAFKA_BROKER = os.getenv("KAFKA_BROKER", "10.10.10.120:9092")
|
||||
|
||||
|
||||
@@ -52,6 +52,13 @@ class Members(db.Model):
|
||||
def __repr__(self):
|
||||
return f'<Members {self.id} - {self.uid}>'
|
||||
|
||||
@classmethod
|
||||
def get_member_by_email(cls, email):
|
||||
member = cls.query.filter_by(email=str(email)).first()
|
||||
if not member:
|
||||
return None
|
||||
return member
|
||||
|
||||
@classmethod
|
||||
def get_member_by_username(cls, username):
|
||||
member = cls.query.filter_by(username=str(username)).first()
|
||||
|
||||
Reference in New Issue
Block a user