From 57cb36d786c1b07a8f5c75c63bd0444fab8155a6 Mon Sep 17 00:00:00 2001
From: vanzhiganov <vanzhiganov@ya.ru>
Date: Sun, 26 Jun 2016 13:11:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20=D1=81?=
 =?UTF-8?q?=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=BC=D0=B8=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=D0=BC?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SWSCloudCore/controllers/users/__init__.py | 22 ++++------------------
 SWSCloudWeb/views/account/__init__.py      | 13 ++++++-------
 setup.py                                   |  2 +-
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/SWSCloudCore/controllers/users/__init__.py b/SWSCloudCore/controllers/users/__init__.py
index afcde30..4effd6b 100644
--- a/SWSCloudCore/controllers/users/__init__.py
+++ b/SWSCloudCore/controllers/users/__init__.py
@@ -203,33 +203,19 @@ class ControllerAPI:
         return True
 
     def get(self, user_id):
-        secret = models.UsersSecrets.select().where(
-            models.UsersSecrets.user == user_id
-        )
-        return secret
+        return models.UsersSecrets.select().where(models.UsersSecrets.user == user_id).first()
 
     def check(self, user_id):
-        if models.UsersSecrets.select().where(
-            models.UsersSecrets.user == user_id
-        ).count() == 0:
+        if models.UsersSecrets.select().where(models.UsersSecrets.user == user_id).count() == 0:
             return False
         return True
 
     def set(self, user_id, secret, acl, status):
         if self.check(user_id):
-            x = models.UsersSecrets.update(
-                secret=secret,
-                acl=acl,
-                status=status
-            ).where(
+            x = models.UsersSecrets.update(secret=secret, acl=acl, status=status).where(
                 models.UsersSecrets.user == user_id
             )
             x.execute()
         else:
-            models.UsersSecrets.create(
-                user=user_id,
-                secret=secret,
-                acl=acl,
-                status=status
-            )
+            models.UsersSecrets.create(user=user_id, secret=secret, acl=acl, status=status)
         return True
diff --git a/SWSCloudWeb/views/account/__init__.py b/SWSCloudWeb/views/account/__init__.py
index 69e75b9..302bc2a 100644
--- a/SWSCloudWeb/views/account/__init__.py
+++ b/SWSCloudWeb/views/account/__init__.py
@@ -397,22 +397,21 @@ def sshkey_delete():
     return redirect(url_for('account.sshkey'))
 
 
-@viewAccount.route('/api', methods=['GET', 'POST'])
-def api():
+@viewAccount.route('/api.html')
+def api_index():
     # check session
     if not ControllerUsers().check_session():
         return redirect(url_for("account.logout"))
     # 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"))
     #
-    if not ControllerAPI().check(session['user_id']):
-        ControllerAPI().set(session['user_id'], '', '', 0)
+    if not ControllerAPI().check(session.get('user_id')):
+        ControllerAPI().set(user_id=session.get('user_id'), secret='', acl='', status=0)
     #
-    user_secret = ControllerAPI().get(session['user_id'])[0]
     return render_template(
         'default/id/api.html',
-        user_secret=user_secret
+        user_secret=ControllerAPI().get(user_id=session.get('user_id'))
     )
 
 
diff --git a/setup.py b/setup.py
index 776c43e..8626516 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='SWSCloudCore',
-    version='2.5.12',
+    version='2.5.13',
     author='Vyacheslav Anzhiganov',
     author_email='hello@anzhiganov.com',
     packages=[