Added "add_user()"

main
Lasse Server 3 years ago
parent 2fd8811954
commit 2ba1e94eb2
  1. 32
      app.py
  2. 85
      create_credentials.py

@ -3,6 +3,7 @@ import streamlit_authenticator as stauth
import yaml import yaml
from yaml.loader import SafeLoader from yaml.loader import SafeLoader
import main import main
import create_credentials
with open('credentials.yaml') as file: with open('credentials.yaml') as file:
config = yaml.load(file, Loader=SafeLoader) config = yaml.load(file, Loader=SafeLoader)
@ -15,13 +16,33 @@ authenticator = stauth.Authenticate(
config['preauthorized'] config['preauthorized']
) )
name, authentication_status, username = authenticator.login('Logga in', 'main') def add_user():
st.write(':red[Skapa ny användare]')
with st.form("new_credentials"):
new_username = st.text_input('Användarnamn')
new_name = st.text_input('Namn')
new_pwd = st.text_input('Lösenord')
submitted = st.form_submit_button("Lägg till användare", )
if submitted:
credentials, valid = create_credentials.credentials(new_username, new_name, new_pwd)
if valid:
create_credentials.update(credentials, print_out=False, update=True)
st.write('Användare tillagd.')
else:
st.write('Användare finns redan.')
def main():
name, authentication_status, username = authenticator.login('Logga in', 'main')
if authentication_status: if authentication_status:
# Say hello # Say hello
st.markdown(f':blue[**Hej {name}!**]') st.markdown(f':blue[**Hej {name}!**]')
if username == 'admin':
add_user()
# Ask for input # Ask for input
help_text = '[Du kan hitta en profils Facebook-ID här](https://lookup-id.com/)' help_text = '[Du kan hitta en profils Facebook-ID här](https://lookup-id.com/)'
user_input = str(st.text_input('Skriv in telefonnummer eller Facebook-ID', help=help_text, placeholder='Skriv här...')).strip() user_input = str(st.text_input('Skriv in telefonnummer eller Facebook-ID', help=help_text, placeholder='Skriv här...')).strip()
@ -51,11 +72,14 @@ if authentication_status:
else: else:
st.text('Not found.') st.text('Not found.')
authenticator.logout('Logout', 'main')
elif authentication_status is False: elif authentication_status is False:
st.error('Fel användarnamn/lösenord') st.error('Fel användarnamn/lösenord')
elif authentication_status is None: elif authentication_status is None:
st.warning('Skriv in användarnamn och lösenord') st.warning('Skriv in användarnamn och lösenord')
main()

@ -2,62 +2,77 @@ import streamlit_authenticator as stauth
from sys import argv from sys import argv
import yaml import yaml
def credentials(username, email, name, pwd): def load_credentials():
with open('credentials.yaml','r') as f:
return yaml.safe_load(f)
def credentials(username, name, pwd):
pwd = stauth.Hasher([pwd]).generate()[0] pwd = stauth.Hasher([pwd]).generate()[0]
if username in list(load_credentials()['credentials']['usernames'].keys()):
print('Användarnamnet finns redan.')
return 'Användarnamnet finns redan.', False
credentials = { credentials = {
'text': f''' 'text': f'''
{username}: {username}:
email: {email} email: '',
name: {name} name: {name}
password: {pwd} password: '***'
''', ''',
'data': {username: 'data': {username:
{'email': email, {'email': '',
'name': name, 'name': name,
'pwd': pwd} 'password': pwd}
} }
} }
return credentials for k, v in credentials.items():
print(k, v)
return credentials, True
def update(c): def update(c, print_out=True, update=False):
if print_out:
print(c['text']) print(c['text'])
if not update:
if input('Update credentials file? (y/n)') in ['y', 'yes']: if input('Update credentials file? (y/n)') in ['y', 'yes']:
update = True
if update:
try: try:
with open('credentials.yaml','r') as f: cur_yaml = load_credentials()
cur_yaml = yaml.safe_load(f) # Note the safe_load
cur_yaml['credentials']['usernames'].update(c['data']) cur_yaml['credentials']['usernames'].update(c['data'])
if cur_yaml: if cur_yaml:
with open('credentials.yaml','w') as f: with open('credentials.yaml','w') as f:
yaml.safe_dump(cur_yaml, f) # Also note the safe_dump yaml.safe_dump(cur_yaml, f)
except FileNotFoundError: except FileNotFoundError:
print('Found no yaml file') print('Found no yaml file')
if len(argv) == 2: return c['text'], False
if argv[1] == 'help':
print('username, email, name, pwd') # if __name__ == '__main__':
exit() # if len(argv) == 2:
pwd = argv[1] # if argv[1] == 'help':
print(stauth.Hasher([pwd]).generate()[0]) # print('username, name, pwd')
# exit()
elif len(argv) == 5: # pwd = argv[1]
username = argv[1] # print(stauth.Hasher([pwd]).generate()[0])
email = argv[2]
name = argv[3] # elif len(argv) == 4:
pwd = argv[4] # username = argv[1]
c = credentials(username, email, name, pwd) # name = argv[2]
update(c) # pwd = argv[3]
# c = credentials(username, name, pwd)
else: # update(c)
pwd = input('Password: ').strip()
username = input('Username: ') # else:
if username != '': # pwd = input('Password: ').strip()
email = input('Email: ') # username = input('Username: ')
name = input('Name: ') # if username != '':
c = credentials(username, email, name, pwd) # name = input('Name: ')
update(c) # c = credentials(username, name, pwd)
else: # update(c)
print(stauth.Hasher([pwd]).generate()[0]) # else:
# print(stauth.Hasher([pwd]).generate()[0])

Loading…
Cancel
Save