From b9e6f99a668286fc0bb7fd82445ae72996b62168 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Wed, 26 May 2021 18:42:25 +0200
Subject: [PATCH] removed no_stored_credentials flag and always use passed
 credentials from arguments if possible

---
 openpype/cli.py                                       |  4 ----
 .../modules/ftrack/ftrack_server/event_server_cli.py  | 11 +++++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/openpype/cli.py b/openpype/cli.py
index eeddd68cad..12997cc7f4 100644
--- a/openpype/cli.py
+++ b/openpype/cli.py
@@ -60,8 +60,6 @@ def tray(debug=False):
               help="Ftrack api user")
 @click.option("--ftrack-api-key", envvar="FTRACK_API_KEY",
               help="Ftrack api key")
-@click.option("--no-stored-credentials", is_flag=True,
-              help="don't use stored credentials")
 @click.option("--legacy", is_flag=True,
               help="run event server without mongo storing")
 @click.option("--clockify-api-key", envvar="CLOCKIFY_API_KEY",
@@ -72,7 +70,6 @@ def eventserver(debug,
                 ftrack_url,
                 ftrack_user,
                 ftrack_api_key,
-                no_stored_credentials,
                 legacy,
                 clockify_api_key,
                 clockify_workspace):
@@ -88,7 +85,6 @@ def eventserver(debug,
         ftrack_url,
         ftrack_user,
         ftrack_api_key,
-        no_stored_credentials,
         legacy,
         clockify_api_key,
         clockify_workspace
diff --git a/openpype/modules/ftrack/ftrack_server/event_server_cli.py b/openpype/modules/ftrack/ftrack_server/event_server_cli.py
index fee4d8eba0..8bba22b475 100644
--- a/openpype/modules/ftrack/ftrack_server/event_server_cli.py
+++ b/openpype/modules/ftrack/ftrack_server/event_server_cli.py
@@ -422,15 +422,18 @@ def run_event_server(
     ftrack_url,
     ftrack_user,
     ftrack_api_key,
-    no_stored_credentials,
     legacy,
     clockify_api_key,
     clockify_workspace
 ):
-    if not no_stored_credentials:
+    if not ftrack_user or not ftrack_api_key:
+        print((
+            "Ftrack user/api key were not passed."
+            " Trying to use credentials from user keyring."
+        ))
         cred = credentials.get_credentials(ftrack_url)
-        ftrack_user = cred.get('username')
-        ftrack_api_key = cred.get('api_key')
+        ftrack_user = cred.get("username")
+        ftrack_api_key = cred.get("api_key")
 
     if clockify_workspace and clockify_api_key:
         os.environ["CLOCKIFY_WORKSPACE"] = clockify_workspace