[copr] master: change api token expiration to 120 days and make it configurable (171dd27)

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master commit 171dd27b1dd78072766f3828975f78226de20049 Author: Miroslav Suchý <msuchy(a)redhat.com&gt; Date: Tue Jun 25 13:50:59 2013 +0200 change api token expiration to 120 days and make it configurable coprs_frontend/coprs/templates/api.html | 4 ++-- coprs_frontend/coprs/views/api_ns/api_general.py | 2 +- coprs_frontend/coprs/views/misc.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coprs_frontend/coprs/templates/api.html b/coprs_frontend/coprs/templates/api.html index 0ea30b2..c57e49f 100644 --- a/coprs_frontend/coprs/templates/api.html +++ b/coprs_frontend/coprs/templates/api.html @@ -13,8 +13,8 @@ should not be shared!</span>. </p> - <p>The API token is valid for 30 days after you generated it, this - in order to ensure you are you every 30 days. + <p>The API token is valid for {{ config['API_TOKEN_EXPIRATION'] }} days after you generated it, this + in order to ensure you are you every {{ config['API_TOKEN_EXPIRATION'] }} days. </p> {% if g.user %} diff --git a/coprs_frontend/coprs/views/api_ns/api_general.py b/coprs_frontend/coprs/views/api_ns/api_general.py index 6d90033..7130509 100644 --- a/coprs_frontend/coprs/views/api_ns/api_general.py +++ b/coprs_frontend/coprs/views/api_ns/api_general.py @@ -38,7 +38,7 @@ def api_new_token(): user.api_token = helpers.generate_api_token( flask.current_app.config['API_TOKEN_LENGTH']) user.api_token_expiration = datetime.date.today() \ - + datetime.timedelta(days=30) + + datetime.timedelta(days=flask.current_app.config['API_TOKEN_EXPIRATION']) db.session.add(user) db.session.commit() return flask.redirect(flask.url_for('api_ns.api_home')) diff --git a/coprs_frontend/coprs/views/misc.py b/coprs_frontend/coprs/views/misc.py index 7ffad6b..ea79640 100644 --- a/coprs_frontend/coprs/views/misc.py +++ b/coprs_frontend/coprs/views/misc.py @@ -56,7 +56,7 @@ def create_or_login(resp): models.User.openid_name == resp.identity_url).first() if not user: # create if not created already expiration_date_token = datetime.date.today() \ - + datetime.timedelta(days=30) + + datetime.timedelta(days=flask.current_app.config['API_TOKEN_EXPIRATION']) copr64 = base64.b64encode('copr') + '##' user = models.User(openid_name = resp.identity_url, mail = resp.email, api_login = copr64 + helpers.generate_api_token(