Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use OpenPypeSecureRegistry

Browse source
This commit is contained in:
iLLiCiTiT 2021-04-09 10:36:20 +02:00
parent 91faeb5492
commit 065b64d1e0
2 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
openpype/modules/clockify/clockify_api.py
View file

@ -9,8 +9,7 @@ from .constants import (
ADMIN_PERMISSION_NAMES ADMIN_PERMISSION_NAMES
) )
# from openpype.lib import OpenPypeSettingsRegistry from openpype.lib.local_settings import OpenPypeSecureRegistry
from openpype.lib.local_settings import OpenPypeSecureRegistry as OpenPypeSettingsRegistry
def time_check(obj): def time_check(obj):
@ -35,7 +34,7 @@ class ClockifyAPI:
self.request_counter = 0 self.request_counter = 0
self.request_time = time.time() self.request_time = time.time()
self.secure_registry = OpenPypeSettingsRegistry("clockify") self.secure_registry = OpenPypeSecureRegistry("clockify")
@property @property
def headers(self): def headers(self):
@ -135,10 +134,10 @@ class ClockifyAPI:
return False return False
def get_api_key(self): def get_api_key(self):
return self.secure_registry.get_secure_item("api_key", None) return self.secure_registry.get_item("api_key", None)
def save_api_key(self, api_key): def save_api_key(self, api_key):
self.secure_registry.set_secure_item("api_key", api_key) self.secure_registry.set_item("api_key", api_key)
def get_workspaces(self): def get_workspaces(self):
action_url = 'workspaces/' action_url = 'workspaces/'

48
openpype/modules/ftrack/lib/credentials.py
View file

@ -7,7 +7,7 @@ except ImportError:
from urlparse import urlparse from urlparse import urlparse
from openpype.lib import OpenPypeSettingsRegistry from openpype.lib import OpenPypeSecureRegistry
USERNAME_KEY = "username" USERNAME_KEY = "username"
API_KEY_KEY = "api_key" API_KEY_KEY = "api_key"
@ -23,38 +23,56 @@ def get_ftrack_hostname(ftrack_server=None):
return urlparse(ftrack_server).hostname return urlparse(ftrack_server).hostname
def _get_ftrack_secure_key(hostname): def _get_ftrack_secure_key(hostname, key):
"""Secure item key for entered hostname.""" """Secure item key for entered hostname."""
return "/".join(("ftrack", hostname)) return "/".join(("ftrack", hostname, key))
def get_credentials(ftrack_server=None): def get_credentials(ftrack_server=None):
hostname = get_ftrack_hostname(ftrack_server) hostname = get_ftrack_hostname(ftrack_server)
secure_key = _get_ftrack_secure_key(hostname) username_name = _get_ftrack_secure_key(hostname, USERNAME_KEY)
api_key_name = _get_ftrack_secure_key(hostname, API_KEY_KEY)
username_registry = OpenPypeSecureRegistry(username_name)
api_key_registry = OpenPypeSecureRegistry(api_key_name)
registry = OpenPypeSettingsRegistry(secure_key)
return { return {
USERNAME_KEY: registry.get_secure_item(USERNAME_KEY, None), USERNAME_KEY: username_registry.get_item(USERNAME_KEY, None),
API_KEY_KEY: registry.get_secure_item(API_KEY_KEY, None) API_KEY_KEY: api_key_registry.get_item(API_KEY_KEY, None)
} }
def save_credentials(username, api_key, ftrack_server=None): def save_credentials(username, api_key, ftrack_server=None):
hostname = get_ftrack_hostname(ftrack_server) hostname = get_ftrack_hostname(ftrack_server)
secure_key = _get_ftrack_secure_key(hostname) username_name = _get_ftrack_secure_key(hostname, USERNAME_KEY)
api_key_name = _get_ftrack_secure_key(hostname, API_KEY_KEY)
registry = OpenPypeSettingsRegistry(secure_key) # Clear credentials
registry.set_secure_item(USERNAME_KEY, username) clear_credentials(ftrack_server)
registry.set_secure_item(API_KEY_KEY, api_key)
username_registry = OpenPypeSecureRegistry(username_name)
api_key_registry = OpenPypeSecureRegistry(api_key_name)
username_registry.set_item(USERNAME_KEY, username)
api_key_registry.set_item(API_KEY_KEY, api_key)
def clear_credentials(ftrack_server=None): def clear_credentials(ftrack_server=None):
hostname = get_ftrack_hostname(ftrack_server) hostname = get_ftrack_hostname(ftrack_server)
secure_key = _get_ftrack_secure_key(hostname) username_name = _get_ftrack_secure_key(hostname, USERNAME_KEY)
api_key_name = _get_ftrack_secure_key(hostname, API_KEY_KEY)
registry = OpenPypeSettingsRegistry(secure_key) username_registry = OpenPypeSecureRegistry(username_name)
registry.delete_secure_item(USERNAME_KEY) api_key_registry = OpenPypeSecureRegistry(api_key_name)
registry.delete_secure_item(API_KEY_KEY)
current_username = username_registry.get_item(USERNAME_KEY, None)
current_api_key = api_key_registry.get_item(API_KEY_KEY, None)
if current_username is not None:
username_registry.delete_item(USERNAME_KEY)
if current_api_key is not None:
api_key_registry.delete_item(API_KEY_KEY)
def check_credentials(username, api_key, ftrack_server=None): def check_credentials(username, api_key, ftrack_server=None):