Merge branch 'issue72' into authenticator-tests

Author: kevinpricethesecond

.gitignore

@@ -103,3 +103,6 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# defualt config
+config-local.json

config-local.json

@@ -1,6 +1,6 @@
 {
   "service_name": "authenticator",
-  "service_password": "Oh8zasCoRgV9C9BMt60dQIzA",
+  "service_password": "<TODO_get_from_SK>",
   "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": "https://dev.develop.tapis.io/v3/tokens",
+  "token_url": "<token_url>",
   "impers_oauth_client_id": "<impers_oauth_client_id>",
   "impers_oauth_client_secret": "<impers_oauth_client_secret>",
   "impersadmin_username": "<impersadmin_username>",

service/controllers.py

@@ -1490,6 +1490,7 @@ def post(self):
             raise errors.ResourceError("Failure to generate an access token; please try again later.")
         try:
             result = {'access_token': {'access_token': tokens.access_token.access_token,
+                                       'id_token': tokens.access_token.access_token,
                                        'expires_at': tokens.access_token.expires_at,
                                        'expires_in': tokens.access_token.expires_in,
                                        'jti': tokens.access_token.jti

service/resources/openapi_v3.yml

@@ -707,6 +707,9 @@ components:
             access_token:
               type: string
               description: The actual access token as a JWT
+            id_token:
+              type: string
+              description: The actual access token as a JWT
             expires_at:
               type: string
               description: The time, as a string in UTC, when the token expires.