04/10/22 - 22h

master
ChérifBALDE 2022-10-04 21:56:20 +02:00 committed by cherif
parent cfd1980371
commit 9437d9c883
5 changed files with 41 additions and 44 deletions

View File

@ -126,7 +126,6 @@ ca revient à mettre le champ "active" à -1
'''
def desable_user_objectif(diction):
try:
client = MongoClient(CONNECTION_STRING)
# Dictionnaire des champs utilisables
field_list = ['name', 'token']
@ -209,7 +208,6 @@ def desable_user_objectif(diction):
def add_update_user_objectif(diction):
try:
client = MongoClient(CONNECTION_STRING)
# Dictionnaire des champs utilisables
field_list = ['name', 'email_user', 'description','date_souhaite', 'domaine', 'niveau', 'token']
@ -323,8 +321,6 @@ def add_update_user_objectif(diction):
def add_user_account(diction):
try:
client = MongoClient(CONNECTION_STRING)
# Dictionnaire des champs utilisables
'''
# Verification que les champs reçus dans l'API sont bien dans la liste des champs autorisés
@ -373,7 +369,7 @@ def add_user_account(diction):
mycommon.myprint(" webservice : diction = "+str(myuser))
dbname = client['cherifdb']
coll_name = MYSY_GV.dbname['user_account']
coll_name_partnair_account = MYSY_GV.dbname['partnair_account']
@ -411,8 +407,7 @@ La modification ne s'effectue que si le compte n'est pas verrouillé.
'''
def valide_user_account(value):
try:
client = MongoClient(CONNECTION_STRING)
dbname = client['cherifdb']
coll_name = MYSY_GV.dbname['user_account']
tmp = coll_name.find({'_id':ObjectId(str(value))})
@ -435,8 +430,6 @@ def valide_user_account(value):
if( status is False ):
mycommon.myprint(" Impossible d'envoyer le mail de remerciement de validation le compte")
return True," Le compte a bien été validé "
else:
mycommon.myprint(" Impossible de valider le compte")
@ -625,7 +618,7 @@ def get_user_account(diction):
field_list_obligatoire = ['token']
for val in field_list_obligatoire:
if val not in diction:
mycommon.myprint(" La valeur '" + val + "' n'est pas presente dans liste ")
mycommon.myprint(str(inspect.stack()[0][3]) + " La valeur '" + val + "' n'est pas presente dans liste ")
return False, " Impossible de recuperer le user account"
# recuperation des paramettre
@ -638,14 +631,14 @@ def get_user_account(diction):
# Verification de la validité du token/mail dans le cas des user en mode connecté
if ( len(str(token_value)) <= 0):
mycommon.myprint(" Le token est vide")
mycommon.myprint(str(inspect.stack()[0][3]) +" Le token est vide")
return False, "Le token est vide "
retval = mycommon.check_token_validity("", token_value)
if retval is False:
mycommon.myprint("L'email ou le token ne sont pas valident")
return False, "L'email ou le token ne sont pas valident"
mycommon.myprint(str(inspect.stack()[0][3]) +" L'email ou le token ne sont pas valides")
return False, "L'email ou le token ne sont pas valides"
'''
# Verification si compte utilisateur à ete activé
@ -662,8 +655,6 @@ def get_user_account(diction):
return False, "Impossible de recuperer les données de l'utilisateur"
client = MongoClient(CONNECTION_STRING)
dbname = client['cherifdb']
coll_name = MYSY_GV.dbname['user_account']
RetObject = []
@ -768,8 +759,6 @@ def change_user_pwd(diction):
mydata['date_update'] = str(datetime.now())
client = MongoClient(CONNECTION_STRING)
dbname = client['cherifdb']
coll_name = MYSY_GV.dbname['user_account']
print(" le recid = "+user_recid+" mydata = "+str(mydata))
@ -875,8 +864,7 @@ def Reset_user_pwd_by_token(diction):
mydata['date_update'] = str(datetime.now())
client = MongoClient(CONNECTION_STRING)
dbname = client['cherifdb']
coll_name = MYSY_GV.dbname['user_account']
print(" le recid = "+user_recid+" mydata = "+str(mydata))
@ -937,7 +925,6 @@ def Reset_user_pwd_by_token(diction):
mydata['date_update'] = str(datetime.now())
mydata['pwd'] = new_pwd
mydata['tmp_token_pwd'] = ""
client = MongoClient(CONNECTION_STRING)
coll_name = MYSY_GV.dbname['partnair_account']

View File

@ -55,7 +55,7 @@ def send_user_account_mail(message, account_mail):
if (MYSY_GV.MYSY_ENV == "PROD"):
my_url = "https://apimysy.iexercice.com/myclass/api/valide_user_account/"+str(message)
elif (MYSY_GV.MYSY_ENV == "DEV"):
my_url = "http://localhost:5000/myclass/api/valide_user_account/"+str(message)
my_url = "http://localhost:"+str(MYSY_GV.MYSY_PORT_DEV)+"/myclass/api/valide_user_account/"+str(message)
send_smtp_email = sib_api_v3_sdk.SendSmtpEmail(template_id=15, params={"mysyurl": my_url,

View File

@ -190,7 +190,7 @@ son adresse email.
def get_user_account():
# On recupere le corps (payload) de la requete
payload = request.form.to_dict()
print(" ### payload = ", payload)
print(" ### get_user_account : payload = ", payload)
result, message = eua.get_user_account(payload)
return jsonify(status=result, message=message)
@ -973,7 +973,7 @@ Test de recuperation d'une image enregistrée
def getRecodedImage():
# On recupere le corps (payload) de la requete
payload = request.form.to_dict()
print(" ### payload = ",payload)
print(" ### getRecodedImage : payload = ",payload)
status, myimg= mycommon.getRecodedImage(payload)
return jsonify(status=status, message=myimg)

View File

@ -152,11 +152,12 @@ def check_token_validity(email="", token=""):
try :
coll_token = MYSY_GV.dbname['user_token']
print(" check_token_validity token == "+str(token))
tmp_count = coll_token.count_documents({ 'token': str(token), 'valide': '1'})
if (tmp_count <= 0):
myprint("Le token n'est pas valide")
myprint( str(inspect.stack()[0][3]) +" Le token n'est pas valide")
return False
return True
except Exception as e:
@ -227,30 +228,40 @@ def check_partner_token_validity(email="", token=""):
recuperation du recid du user
'''
def get_user_recid_from_token(token = ""):
if len(str(token)) <= 0 :
myprint(" Le token est vide")
try :
if len(str(token)) <= 0 :
myprint(" Le token est vide")
return False
coll_token = MYSY_GV.dbname['user_token']
tmp_val = coll_token.find({'token': str(token), 'valide': '1'})
user_recid = tmp_val[0]['recid']
return user_recid
except Exception as e:
exc_type, exc_obj, exc_tb = sys.exc_info()
myprint(str(inspect.stack()[0][3]) + " -" + str(e) + " - ERRORRRR AT Line : " + str(exc_tb.tb_lineno))
return False
coll_token = MYSY_GV.dbname['user_token']
tmp_val = coll_token.find({'token': str(token), 'valide': '1'})
user_recid = tmp_val[0]['recid']
return user_recid
'''
recuperation d'email du user from token
'''
def get_user_email_from_token(token = ""):
if len(str(token)) <= 0 :
myprint(" Le token est vide")
try:
if len(str(token)) <= 0 :
myprint(" Le token est vide")
return False
coll_token = MYSY_GV.dbname['user_token']
tmp_val = coll_token.find({'token': str(token), 'valide': '1'})
user_email = tmp_val[0]['email']
return user_email
except Exception as e:
exc_type, exc_obj, exc_tb = sys.exc_info()
myprint(str(inspect.stack()[0][3]) + " -" + str(e) + " - ERRORRRR AT Line : " + str(exc_tb.tb_lineno))
return False
coll_token = MYSY_GV.dbname['user_token']
tmp_val = coll_token.find({'token': str(token), 'valide': '1'})
user_email = tmp_val[0]['email']
return user_email
'''
recuperation d'email du user from recid
'''
@ -1519,7 +1530,7 @@ def getRecodedImage(diction=None):
retval = check_user_validity("", str(mytoken))
if retval is False:
myprint(str(inspect.stack()[0][3]) + " - Le token n'est pas valide")
myprint(str(inspect.stack()[0][3]) + " - Le token n'est pas valide ")
return False, "L'email ou le token ne sont pas valident"
# Recuperation du recid de la personne

View File

@ -104,8 +104,7 @@ def login(diction):
my_token = create_token_urlsafe()
# Enregistrement du token
dbname2 = MYSY_GV.dbname['cherifdb']
token_collection = dbname2['user_token']
token_collection = MYSY_GV.dbname['user_token']
tokenfield = {}
tokenfield['token'] = my_token