update api and site config to use username/password API authentication

nmdc_automation/api/nmdcapi.py

@@ -55,8 +55,8 @@ def __init__(self, site_configuration: Union[str, Path, SiteConfig]):
             site_configuration = SiteConfig(site_configuration)
         self.config = site_configuration
         self._base_url = self.config.api_url
-        self.client_id = self.config.client_id
-        self.client_secret = self.config.client_secret
+        self.username = self.config.username
+        self.password = self.config.password
         if self._base_url[-1] != "/":
             self._base_url += "/"
 
@@ -71,16 +71,16 @@ def _get_token(self, *args, **kwargs):
 
     def get_token(self):
         """
-        Get a token using a client id/secret.
+        Get a token using username/password
         """
         h = {
             "accept": "application/json",
             "Content-Type": "application/x-www-form-urlencoded",
         }
         data = {
-            "grant_type": "client_credentials",
-            "client_id": self.client_id,
-            "client_secret": self.client_secret,
+            "grant_type": "password",
+            "client_id": self.username,
+            "client_secret": self.password,
         }
         url = self._base_url + "token"
         resp = requests.post(url, headers=h, data=data).json()

nmdc_automation/config/siteconfig.py

@@ -90,12 +90,12 @@ def workflows_config(self):
         return self.config_data["workflows"]["workflows_config"]
 
     @property
-    def client_id(self):
-        return self.config_data["credentials"]["client_id"]
+    def username(self):
+        return self.config_data["credentials"]["username"]
 
     @property
-    def client_secret(self):
-        return self.config_data["credentials"]["client_secret"]
+    def password(self):
+        return self.config_data["credentials"]["password"]
 
     @property
     def allowed_workflows(self):

tests/site_configuration_test.toml

@@ -25,5 +25,5 @@ activity_id_state = "/Path/to/activity_id_state"
 workflows_config = "workflows.yaml"
 
 [credentials]
-client_id = "sys0wm66"
-client_secret = "O8Q!64t,^xy:"
+username = "nmdc_automation"
+password = "xxxxxxx"

tests/test_config.py

@@ -20,8 +20,8 @@ def test_config(monkeypatch, test_data_dir, base_test_dir):
     assert conf.agent_state is None # not in test config
     assert conf.activity_id_state
     assert conf.workflows_config
-    assert conf.client_id
-    assert conf.client_secret
+    assert conf.username
+    assert conf.password
     assert conf.allowed_workflows