Merge branch 'dev' into authenticator-tests

Author: kevinpricethesecond

config-local.json

@@ -1,6 +1,6 @@
 {
   "service_name": "authenticator",
-  "service_password": "<TODO_get_from_SK>",
+  "service_password": "Oh8zasCoRgV9C9BMt60dQIzA",
   "primary_site_admin_tenant_base_url": "https://admin.develop.tapis.io",
   "service_tenant_id": "admin",
   "service_site_id": "tacc",
@@ -9,7 +9,7 @@
   "log_level": "DEBUG",
   "populate_dev_ldap": true,
   "dev_ldap_tenant_id": "dev",
-  "token_url": "<token_url>",
+  "token_url": "https://dev.develop.tapis.io/v3/tokens",
   "impers_oauth_client_id": "<impers_oauth_client_id>",
   "impers_oauth_client_secret": "<impers_oauth_client_secret>",
   "impersadmin_username": "<impersadmin_username>",

service/controllers.py

@@ -1310,8 +1310,9 @@ def post(self):
         # client id and client key are optional on the password grant type to allow new users to generate tokens
         # right away before they create a client
         if not auth:
-            client_id = None
-            client_key = None
+            # kprice 1/27/2025 optionally can include client credentials in post body
+            client_id = data.get('client_id')
+            client_key = data.get('client_key')
         else:
             try:
                 client_id = auth.username

service/models.py

@@ -904,6 +904,7 @@ def get_derived_values(cls, data):
         result['code'] = getattr(data, 'code', None)
         # device code grant:
         result['client_id'] = getattr(data, 'client_id', None)
+        result['client_key'] = getattr(data, 'client_key', None)
         result['device_code'] = getattr(data, 'device_code', None)
         # refresh token:
         result['refresh_token'] = getattr(data, 'refresh_token', None)

service/resources/openapi_v3.yml

@@ -619,6 +619,9 @@ components:
         client_id:
           type: string
           description: The client_id being authenticated (for device_code grant).
+        client_key:
+          type: string
+          description: The client_key being authenticated (optional for authorization_code grant).
         grant_type:
           type: string
           description: The OAuth2 grant type being used; either password, authorization_code or refresh_token.