From e4d6039add957b4317d46b769e91004f3eca55dc Mon Sep 17 00:00:00 2001
From: Ilias Trichopoulos <ilias.trichopoulos@cern.ch>
Date: Tue, 26 May 2015 12:13:46 +0200
Subject: [PATCH] Add loggers

---
 indico/modules/oauth/__init__.py            | 3 +++
 indico/modules/oauth/controllers.py         | 3 +++
 indico/modules/oauth/models/applications.py | 2 ++
 indico/modules/oauth/provider.py            | 3 ++-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/indico/modules/oauth/__init__.py b/indico/modules/oauth/__init__.py
index b583bc8d6..e0874002a 100644
--- a/indico/modules/oauth/__init__.py
+++ b/indico/modules/oauth/__init__.py
@@ -21,6 +21,7 @@ import os
 from flask_oauthlib.provider import OAuth2Provider
 
 from indico.core import signals
+from indico.core.logger import Logger
 from indico.util.i18n import _
 from indico.web.flask.util import url_for
 from indico.web.menu import MenuItem
@@ -28,6 +29,8 @@ from indico.web.menu import MenuItem
 
 oauth = OAuth2Provider()
 
+logger = Logger.get('oauth')
+
 
 @signals.admin_sidemenu.connect
 def _extend_admin_menu(sender, **kwargs):
diff --git a/indico/modules/oauth/controllers.py b/indico/modules/oauth/controllers.py
index 87eb1d656..5510ab7f4 100644
--- a/indico/modules/oauth/controllers.py
+++ b/indico/modules/oauth/controllers.py
@@ -21,6 +21,7 @@ from werkzeug.exceptions import Forbidden
 
 from indico.core.db import db
 from indico.modules.users.controllers import RHUserBase
+from indico.modules.oauth import logger
 from indico.modules.oauth.provider import oauth
 from indico.modules.oauth.forms import ApplicationForm
 from indico.modules.oauth.models.applications import OAuthApplication
@@ -83,6 +84,7 @@ class RHOAuthAdminApplicationDelete(RHOAuthAdminApplicationBase):
 
     def _process(self):
         db.session.delete(self.application)
+        logger.info("Application {} was deleted.".format(self.application))
         flash(_("Application deleted successfully"), 'success')
         return redirect(url_for('.apps'))
 
@@ -139,5 +141,6 @@ class RHOAuthUserTokenRevoke(RHUserBase):
 
     def _process(self):
         db.session.delete(self.token)
+        logger.info("Token of application {} for user {} was revoked.".format(self.token.application, self.token.user))
         flash(_("Your token was revoked successfully"), 'success')
         return redirect(url_for('.user_profile'))
diff --git a/indico/modules/oauth/models/applications.py b/indico/modules/oauth/models/applications.py
index fa3faa0cf..8cbeb49a3 100644
--- a/indico/modules/oauth/models/applications.py
+++ b/indico/modules/oauth/models/applications.py
@@ -22,6 +22,7 @@ from sqlalchemy.dialects.postgresql import ARRAY
 from sqlalchemy.ext.declarative import declared_attr
 
 from indico.core.db import db
+from indico.modules.oauth import logger
 from indico.util.string import return_ascii
 
 
@@ -109,3 +110,4 @@ class OAuthApplication(db.Model):
 
     def reset_client_secret(self):
         self.client_secret = unicode(uuid4())
+        logger.info("Client secret for the application {} was reset.".format(self.name))
diff --git a/indico/modules/oauth/provider.py b/indico/modules/oauth/provider.py
index 98268f84f..86dc46d15 100644
--- a/indico/modules/oauth/provider.py
+++ b/indico/modules/oauth/provider.py
@@ -22,7 +22,7 @@ from flask import session
 
 from indico.core.db import db
 from indico.core.config import Config
-from indico.modules.oauth import oauth
+from indico.modules.oauth import oauth, logger
 from indico.modules.oauth.models.applications import OAuthApplication
 from indico.modules.oauth.models.tokens import OAuthGrant, OAuthToken
 from indico.util.date_time import now_utc
@@ -64,6 +64,7 @@ def save_token(token, request, *args, **kwargs):
     # make sure that every client has only one token connected to a user
     for t in tokens:
         db.session.delete(t)
+        logger.info("Deleted token for user {} before saving a new one.".format(request.user.id))
     application = OAuthApplication.find_one(client_id=request.client.client_id)
     scopes = token['scope'].split()
     token = OAuthToken(application_id=application.id, user_id=request.user.id,
-- 
2.11.4.GIT