ShaYmez/hbnet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean radioid.net requests

Browse Source
This commit is contained in:
KF7EEL 2021-05-18 12:05:57 -07:00
parent b6f1a92a60
commit 6ac2ffe091
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
user_managment/app.py
View File

@ -41,7 +41,7 @@ def get_ids(callsign):
url = "https://www.radioid.net" url = "https://www.radioid.net"
response = requests.get(url+"/api/dmr/user/?callsign=" + callsign) response = requests.get(url+"/api/dmr/user/?callsign=" + callsign)
result = response.json() result = response.json()
print(result) ## print(result)
# id_list = [] # id_list = []
id_list = {} id_list = {}
f_name = result['results'][0]['fname'] f_name = result['results'][0]['fname']
@ -180,10 +180,11 @@ def create_app():
@user_registered.connect_via(app) @user_registered.connect_via(app)
def _after_user_registered_hook(sender, user, **extra): def _after_user_registered_hook(sender, user, **extra):
edit_user = User.query.filter(User.username == user.username).first() edit_user = User.query.filter(User.username == user.username).first()
edit_user.dmr_ids = str(ast.literal_eval(get_ids(user.username))[0]) radioid_data = ast.literal_eval(get_ids(user.username))
edit_user.first_name = str(ast.literal_eval(get_ids(user.username))[1]) edit_user.dmr_ids = str(radioid_data[0])
edit_user.last_name = str(ast.literal_eval(get_ids(user.username))[2]) edit_user.first_name = str(radioid_data[1])
edit_user.city = str(ast.literal_eval(get_ids(user.username))[3]) edit_user.last_name = str(radioid_data[2])
edit_user.city = str(radioid_data[3])
user_role = UserRoles( user_role = UserRoles(
user_id=edit_user.id, user_id=edit_user.id,
role_id=2, role_id=2,
@ -412,8 +413,8 @@ def create_app():
<td style="width: 522.317px; text-align: center;"><strong>DMR ID:Authentication Mechanism</strong></td> <td style="width: 522.317px; text-align: center;"><strong>DMR ID:Authentication Mechanism</strong></td>
</tr>''' </tr>'''
for i in u: for i in u:
print(i.username) ## print(i.username)
print(i.initial_admin_approved) ## print(i.initial_admin_approved)
if i.initial_admin_approved == False: if i.initial_admin_approved == False:
wait_list = wait_list+ ''' wait_list = wait_list+ '''
<tr> <tr>
@ -808,12 +809,18 @@ def create_app():
''' '''
elif request.method == 'POST' and request.form.get('username'): elif request.method == 'POST' and request.form.get('username'):
if not User.query.filter(User.username == request.form.get('username')).first(): if not User.query.filter(User.username == request.form.get('username')).first():
radioid_data = ast.literal_eval(get_ids(request.form.get('username')))
user = User( user = User(
username=request.form.get('username'), username=request.form.get('username'),
email=request.form.get('email'), email=request.form.get('email'),
email_confirmed_at=datetime.datetime.utcnow(), email_confirmed_at=datetime.datetime.utcnow(),
password=user_manager.hash_password(request.form.get('password')), password=user_manager.hash_password(request.form.get('password')),
dmr_ids = get_ids(request.form.get('username')) dmr_ids = str(radioid_data[0]),
initial_admin_approved = True,
first_name = str(radioid_data[1]),
last_name = str(radioid_data[2]),
city = str(radioid_data[3])
) )
db.session.add(user) db.session.add(user)