DmitrMakeev commited on
Commit
429e077
·
verified ·
1 Parent(s): c673af4

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +12 -29
app.py CHANGED
@@ -1490,8 +1490,9 @@ def gc_forms():
1490
 
1491
 
1492
 
1493
- # Глобальная переменная для управления верификацией
1494
  curators = ["Anna", "Ekaterina", "Ivan", "Maria", "Sergey", "Olga", "Alex", "Natalia", "Dmitry", "Elena"]
 
1495
 
1496
  mt_avp = {
1497
  'name': 'name',
@@ -1569,11 +1570,6 @@ mapp_templates = {
1569
  }
1570
 
1571
  DATABASE_NAME3 = 'data_gc.db'
1572
- current_curator_index = 0 # Initialize current curator index
1573
-
1574
- def generate_password(length=8):
1575
- letters_and_digits = string.ascii_letters + string.digits
1576
- return ''.join(random.choice(letters_and_digits) for i in range(length))
1577
 
1578
  def add_or_update_contact(contact_data, db_name):
1579
  conn = sqlite3.connect(db_name)
@@ -1615,9 +1611,8 @@ def add_or_update_contact(contact_data, db_name):
1615
  conn.commit()
1616
  conn.close()
1617
 
1618
- def verify_phone_number(phone_number):
1619
- # Simulate phone number verification
1620
- return True
1621
 
1622
  @app.route('/ver_cur', methods=['GET'])
1623
  def add_data_ver_cur():
@@ -1653,20 +1648,14 @@ def add_data_ver_cur():
1653
  else:
1654
  user_data['ws_st'] = user_data.get('ws_st', '')
1655
 
 
1656
  if gen_pass_start == "1":
1657
- user_data['pr5'] = generate_password()
1658
- else:
1659
- conn = sqlite3.connect(db_name)
1660
- cursor = conn.cursor()
1661
- cursor.execute("SELECT pr5 FROM contacts WHERE email = ?", (user_data['email'],))
1662
- result = cursor.fetchone()
1663
- if result and result[0]:
1664
- user_data['pr5'] = result[0]
1665
- conn.close()
1666
 
1667
  try:
1668
  add_or_update_contact(user_data, db_name)
1669
- return jsonify({'status': 'success', 'message': f'User added with curator {user_data.get("curator", "not assigned")}', 'password': user_data['pr5']})
1670
  except Exception as e:
1671
  logging.error(f"Error adding user: {e}")
1672
  return jsonify({'status': 'error', 'message': str(e)}), 500
@@ -1718,20 +1707,14 @@ def add_data_ver_bonus():
1718
  user_data['pr1'] = new_pr1
1719
  conn.close()
1720
 
 
1721
  if gen_pass_start == "1":
1722
- user_data['pr5'] = generate_password()
1723
- else:
1724
- conn = sqlite3.connect(db_name)
1725
- cursor = conn.cursor()
1726
- cursor.execute("SELECT pr5 FROM contacts WHERE email = ?", (user_data['email'],))
1727
- result = cursor.fetchone()
1728
- if result and result[0]:
1729
- user_data['pr5'] = result[0]
1730
- conn.close()
1731
 
1732
  try:
1733
  add_or_update_contact(user_data, db_name)
1734
- return jsonify({'status': 'success', 'message': f'User added with curator {user_data.get("curator", "not assigned")}', 'password': user_data['pr5']})
1735
  except Exception as e:
1736
  logging.error(f"Error adding user: {e}")
1737
  return jsonify({'status': 'error', 'message': str(e)}), 500
 
1490
 
1491
 
1492
 
1493
+ # Глобальная переменная для управления верификацией
1494
  curators = ["Anna", "Ekaterina", "Ivan", "Maria", "Sergey", "Olga", "Alex", "Natalia", "Dmitry", "Elena"]
1495
+ current_curator_index = 0
1496
 
1497
  mt_avp = {
1498
  'name': 'name',
 
1570
  }
1571
 
1572
  DATABASE_NAME3 = 'data_gc.db'
 
 
 
 
 
1573
 
1574
  def add_or_update_contact(contact_data, db_name):
1575
  conn = sqlite3.connect(db_name)
 
1611
  conn.commit()
1612
  conn.close()
1613
 
1614
+ def generate_password():
1615
+ return ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(8))
 
1616
 
1617
  @app.route('/ver_cur', methods=['GET'])
1618
  def add_data_ver_cur():
 
1648
  else:
1649
  user_data['ws_st'] = user_data.get('ws_st', '')
1650
 
1651
+ password = None
1652
  if gen_pass_start == "1":
1653
+ password = generate_password()
1654
+ user_data['pr5'] = password
 
 
 
 
 
 
 
1655
 
1656
  try:
1657
  add_or_update_contact(user_data, db_name)
1658
+ return jsonify({'status': 'success', 'message': f'User added with curator {user_data.get("curator", "not assigned")}', 'password': password})
1659
  except Exception as e:
1660
  logging.error(f"Error adding user: {e}")
1661
  return jsonify({'status': 'error', 'message': str(e)}), 500
 
1707
  user_data['pr1'] = new_pr1
1708
  conn.close()
1709
 
1710
+ password = None
1711
  if gen_pass_start == "1":
1712
+ password = generate_password()
1713
+ user_data['pr5'] = password
 
 
 
 
 
 
 
1714
 
1715
  try:
1716
  add_or_update_contact(user_data, db_name)
1717
+ return jsonify({'status': 'success', 'message': f'User added with curator {user_data.get("curator", "not assigned")}', 'password': password})
1718
  except Exception as e:
1719
  logging.error(f"Error adding user: {e}")
1720
  return jsonify({'status': 'error', 'message': str(e)}), 500