Some modifications on remarks

Author: kadhikari

source/jormungandr/jormungandr/api.py

@@ -90,19 +90,21 @@ def add_info_newrelic(response, *args, **kwargs):
         record_custom_parameter('navitia-request-id', request.id)
 
         token = get_token()
+        # No log will be added in newrelic if token is absent in the request
         if token:
             user = get_user(token=token, abort_if_no_token=False)
             if user:
                 record_custom_parameter('user_id', str(user.id))
-            # This method verifies database connection and gets object Key only once when cache expires.
-            app_name = get_app_name(token)
-            if app_name:
-                record_custom_parameter('token_name', app_name)
-
-        record_custom_parameter('version', __version__)
-        coverages = get_used_coverages()
-        if coverages:
-            record_custom_parameter('coverage', coverages[0])
+                # This method verifies database connection and gets object Key only once when cache expires.
+                app_name = get_app_name(token)
+                if app_name:
+                    record_custom_parameter('token_name', app_name)
+
+            record_custom_parameter('version', __version__)
+            # No access to database required
+            coverages = get_used_coverages()
+            if coverages:
+                record_custom_parameter('coverage', coverages[0])
     except:
         logger = logging.getLogger(__name__)
         logger.exception('error while reporting to newrelic:')

source/jormungandr/jormungandr/authentication.py

@@ -200,6 +200,7 @@ def uncached_get_user(token):
         # if user doesn't exist for a token, get default token with user_type = no_access
         if not user:
             user = User.get_without_access()
+            logging.getLogger(__name__).warning('Invalid token : {}'.format(token[0:10]))
     except Exception as e:
         logging.getLogger(__name__).error('No access to table User (error: {})'.format(e))
         g.can_connect_to_database = False

source/navitiacommon/navitiacommon/models/__init__.py

@@ -196,7 +196,7 @@ def get_from_key(cls, token, valid_until):
 
     @classmethod
     def get_without_access(cls):
-        query = cls.query.filter(cls.type == 'no_access')
+        query = cls.query.filter(cls.type == 'no_access' and cls.login == 'user_without_access')
         return query.first()
 
     def has_access(self, instance_id, api_name):

source/tyr/migrations/versions/04f9b89e3ef5_add_no_access_in_user_type.py

@@ -20,15 +20,8 @@
 
 
 def upgrade():
-    tmp_type.create(op.get_bind(), checkfirst=False)
-    op.execute('ALTER TABLE "user" ALTER COLUMN type DROP DEFAULT')
-    op.execute('ALTER TABLE "user" ALTER COLUMN type TYPE _user_type USING type::text::_user_type')
-    old_type.drop(op.get_bind(), checkfirst=False)
-
-    new_type.create(op.get_bind(), checkfirst=False)
-    op.execute('ALTER TABLE "user" ALTER COLUMN type TYPE user_type USING type::text::user_type')
-    op.execute('ALTER TABLE "user" ALTER COLUMN type SET DEFAULT \'with_free_instances\'')
-    tmp_type.drop(op.get_bind(), checkfirst=False)
+    op.execute("COMMIT")
+    op.execute("ALTER TYPE user_type ADD VALUE 'no_access'")
     op.execute(
         'INSERT INTO "user"(login, email, type) values(\'user_without_access\', \'[email protected]\', \'no_access\')'
     )