Ошибка с новыми пользователями

This commit is contained in:
Vyacheslav Anzhiganov 2016-06-26 13:11:11 +03:00
parent a86603409c
commit 57cb36d786
3 changed files with 11 additions and 26 deletions

View file

@ -203,33 +203,19 @@ class ControllerAPI:
return True return True
def get(self, user_id): def get(self, user_id):
secret = models.UsersSecrets.select().where( return models.UsersSecrets.select().where(models.UsersSecrets.user == user_id).first()
models.UsersSecrets.user == user_id
)
return secret
def check(self, user_id): def check(self, user_id):
if models.UsersSecrets.select().where( if models.UsersSecrets.select().where(models.UsersSecrets.user == user_id).count() == 0:
models.UsersSecrets.user == user_id
).count() == 0:
return False return False
return True return True
def set(self, user_id, secret, acl, status): def set(self, user_id, secret, acl, status):
if self.check(user_id): if self.check(user_id):
x = models.UsersSecrets.update( x = models.UsersSecrets.update(secret=secret, acl=acl, status=status).where(
secret=secret,
acl=acl,
status=status
).where(
models.UsersSecrets.user == user_id models.UsersSecrets.user == user_id
) )
x.execute() x.execute()
else: else:
models.UsersSecrets.create( models.UsersSecrets.create(user=user_id, secret=secret, acl=acl, status=status)
user=user_id,
secret=secret,
acl=acl,
status=status
)
return True return True

View file

@ -397,22 +397,21 @@ def sshkey_delete():
return redirect(url_for('account.sshkey')) return redirect(url_for('account.sshkey'))
@viewAccount.route('/api', methods=['GET', 'POST']) @viewAccount.route('/api.html')
def api(): def api_index():
# check session # check session
if not ControllerUsers().check_session(): if not ControllerUsers().check_session():
return redirect(url_for("account.logout")) return redirect(url_for("account.logout"))
# auth user # auth user
if not ControllerUsers().auth(session['email'], session['password']): if not ControllerUsers().auth(session.get('email'), session.get('password')):
return redirect(url_for("account.logout")) return redirect(url_for("account.logout"))
# #
if not ControllerAPI().check(session['user_id']): if not ControllerAPI().check(session.get('user_id')):
ControllerAPI().set(session['user_id'], '', '', 0) ControllerAPI().set(user_id=session.get('user_id'), secret='', acl='', status=0)
# #
user_secret = ControllerAPI().get(session['user_id'])[0]
return render_template( return render_template(
'default/id/api.html', 'default/id/api.html',
user_secret=user_secret user_secret=ControllerAPI().get(user_id=session.get('user_id'))
) )

View file

@ -4,7 +4,7 @@ from setuptools import setup
setup( setup(
name='SWSCloudCore', name='SWSCloudCore',
version='2.5.12', version='2.5.13',
author='Vyacheslav Anzhiganov', author='Vyacheslav Anzhiganov',
author_email='hello@anzhiganov.com', author_email='hello@anzhiganov.com',
packages=[ packages=[