From 9efbd585e4f524f79a331dd9245a283209281f52 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 09 2018 13:09:39 +0000
Subject: Pass along the user object not the fas_user and fix unit-tests accordingly


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index b667069..8b03049 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -47,6 +47,7 @@ import pagure.lib.tasks
 import pagure.forms
 import pagure.ui.plugins
 from pagure.config import config as pagure_config
+from pagure.flask_app import _get_user
 from pagure.lib import encoding_utils
 from pagure.ui import UI_NS
 from pagure.utils import (
@@ -1859,11 +1860,12 @@ def add_deploykey(repo, username=None, namespace=None):
     form = pagure.forms.AddDeployKeyForm()
 
     if form.validate_on_submit():
+        user = _get_user(username=flask.g.fas_user.username)
         try:
             msg = pagure.lib.add_sshkey_to_project_or_user(
                 flask.g.session,
                 ssh_key=form.ssh_key.data,
-                creator=flask.g.fas_user,
+                creator=user,
                 project=repo,
                 pushaccess=form.pushaccess.data,
             )
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index ae79058..e8d957d 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -616,12 +616,13 @@ class PagureFlaskRepotests(tests.Modeltests):
 
         # Add a deploy key to a project
         repo = pagure.lib.get_authorized_project(self.session, 'test')
+        pingou = pagure.lib.get_user(self.session, 'pingou')
         msg = pagure.lib.add_sshkey_to_project_or_user(
             session=self.session,
             project=repo,
             ssh_key='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAzBMSIlvPRaEiLOTVInErkRIw9CzQQcnslDekAn1jFnGf+SNa1acvbTiATbCX71AA03giKrPxPH79dxcC7aDXerc6zRcKjJs6MAL9PrCjnbyxCKXRNNZU5U9X/DLaaL1b3caB+WD6OoorhS3LTEtKPX8xyjOzhf3OQSzNjhJp5Q==',
             pushaccess=True,
-            creator=user,
+            creator=pingou,
         )
         self.session.commit()
         self.assertEqual(msg, 'SSH key added')