From 02b9974a17e0e8c928f296533590b108ef17ce59 Mon Sep 17 00:00:00 2001 From: vanzhiganov Date: Sun, 26 Jun 2016 13:48:50 +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/models.py | 2 +- SWSCloudWeb/views/account/__init__.py | 7 ++++--- setup.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SWSCloudCore/models.py b/SWSCloudCore/models.py index f8d21e2..19eac7c 100644 --- a/SWSCloudCore/models.py +++ b/SWSCloudCore/models.py @@ -111,7 +111,7 @@ class UsersRecoveryCodes(PgSQLModel): class UsersSecrets(PgSQLModel): user = ForeignKeyField(Users) # 4f235008-a9bd-11e5-a24e-28d244e159e9 - secret = CharField(unique=True, null=False) + secret = CharField(unique=False, null=False) # 1.1.1.1,1.2.3.4 acl = TextField() # 0 - inactive diff --git a/SWSCloudWeb/views/account/__init__.py b/SWSCloudWeb/views/account/__init__.py index 302bc2a..7883801 100644 --- a/SWSCloudWeb/views/account/__init__.py +++ b/SWSCloudWeb/views/account/__init__.py @@ -155,6 +155,7 @@ def registration(): ControllerUsersDetails(user_id).details_create() ControllerBilling().create(user_id, g.settings['bonus']) + ControllerAPI().set(user_id=user_id, secret=user_id, acl='', status=0) # ControllerU # send mail message with recovery code message = u""" @@ -406,8 +407,8 @@ def api_index(): if not ControllerUsers().auth(session.get('email'), session.get('password')): return redirect(url_for("account.logout")) # - if not ControllerAPI().check(session.get('user_id')): - ControllerAPI().set(user_id=session.get('user_id'), secret='', acl='', status=0) + if not ControllerAPI().check(user_id=session.get('user_id')): + ControllerAPI().set(user_id=session.get('user_id'), secret=session.get('user_id'), acl='', status=0) # return render_template( 'default/id/api.html', @@ -431,4 +432,4 @@ def api_update(): request.form['status'] ) # - return redirect(url_for('account.api')) + return redirect(url_for('account.api_index')) diff --git a/setup.py b/setup.py index aa090d9..cbcc8eb 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup setup( name='SWSCloudCore', - version='2.5.14', + version='2.5.15', author='Vyacheslav Anzhiganov', author_email='hello@anzhiganov.com', packages=[