Skip to content

added auth token argument #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craig8 merged 1 commit into from
Feb 5, 2025
Merged

added auth token argument #166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions gridappsd-python-lib/gridappsd/goss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ def __init__(self,
attempt_connection=True,
override_threading=None,
stomp_log_level=logging.WARNING,
goss_log_level=logging.INFO):
goss_log_level=logging.INFO,
use_auth_token=True):

logging.getLogger('stomp.py').setLevel(stomp_log_level)
logging.getLogger('goss').setLevel(goss_log_level)
Expand All @@ -97,6 +98,7 @@ def __init__(self,
self.__pass__ = password
self.stomp_address = stomp_address
self.stomp_port = stomp_port
self.use_auth_token = use_auth_token

# Environmental variables should overrule the passed arguments.
if os.environ.get(GRIDAPPSD_ENV_ENUM.GRIDAPPSD_USER.value):
Expand Down Expand Up @@ -289,7 +291,7 @@ def unsubscribe(self, conn_id):
def _make_connection(self):
if self._conn is None or not self._conn.is_connected():
_log.debug("Creating connection")
if not self.__token:
if self.use_auth_token is True and not self.__token:

# get token
# get initial connection
Expand Down Expand Up @@ -351,7 +353,10 @@ def on_disconnect(self, header, message):
if self._override_thread_fc is not None:
self._conn.transport.override_threading(self._override_thread_fc)
try:
self._conn.connect(self.__token, "", wait=True)
if self.use_auth_token and self.__token is not None:
self._conn.connect(self.__token, "", wait=True)
else:
self._conn.connect(self.__user__,self.__pass__, wait=True)
except TypeError as e:
_log.error("TypeError: {e}".format(e=e))
except NotConnectedException as e:
Expand Down
Loading