Move auth

.generator/src/generator/templates/base_configuration.j2

@@ -295,55 +295,6 @@ class BaseConfiguration:
             password = self.password
         return urllib3.util.make_headers(basic_auth=username + ":" + password).get("authorization")
 
-    def auth_settings(self):
-        """Gets Auth Settings dict for api client.
-
-        :return: The Auth Settings information dict.
-        """
-        auth = {}
-{%- for name, schema in openapi.components.securitySchemes.items() %}
-{%- if schema.type == "apiKey" %}
-        if "{{name}}" in self.api_key{% if "x-auth-id-alias" in schema %} or "{{ schema["x-auth-id-alias"] }}" in self.api_key{% endif %}:
-            auth["{{name}}"] = {
-                "type": "api_key",
-                "in": "{{ schema.in }}",
-                "key": "{{ schema.name }}",
-                "value": self.get_api_key_with_prefix(
-                    "{{name}}",{% if "x-auth-id-alias" in schema %}
-                    alias="{{ schema["x-auth-id-alias"] }}",{%- endif %}
-                ),
-            }
-{%- elif schema.type == "http" and schema.scheme == "basic" %}
-        if self.username is not None and self.password is not None:
-            auth["{{name}}"] = {
-                "type": "basic",
-                "in": "header",
-                "key": "Authorization",
-                "value": self.get_basic_auth_token()
-            }
-{%- elif schema.type == "http" and schema.scheme == "bearer" %}
-        if self.access_token is not None:
-            auth["{{name}}"] = {
-                "type": "bearer",
-                "in": "header",
-                {% if schema.bearerFormat %}
-                "format": "{{ schema.bearerFormat }}",
-                {% endif %}
-                "key": "Authorization",
-                "value": "Bearer " + self.access_token
-            }
-{%- elif schema.type == "oauth2" %}
-        if self.access_token is not None:
-            auth["AuthZ"] = {
-                "type": "oauth2",
-                "in": "header",
-                "key": "Authorization",
-                "value": "Bearer " + self.access_token,
-            }
-{%- endif %}
-{%- endfor %}
-        return auth
-
     def get_host_settings(self):
         """Gets an array of host settings
 
@@ -425,4 +376,3 @@ class BaseConfiguration:
         self._base_path = value
         self.server_index = None
 {# keep new line #}
-

.generator/src/generator/templates/configuration.j2

@@ -38,4 +38,53 @@ class Configuration(BaseConfiguration):
         {%- endfor %}
         {%- endfor %}
         }
+
+    def auth_settings(self):
+        """Gets Auth Settings dict for api client.
+
+        :return: The Auth Settings information dict.
+        """
+        auth = {}
+{%- for name, schema in openapi.components.securitySchemes.items() %}
+{%- if schema.type == "apiKey" %}
+        if "{{name}}" in self.api_key{% if "x-auth-id-alias" in schema %} or "{{ schema["x-auth-id-alias"] }}" in self.api_key{% endif %}:
+            auth["{{name}}"] = {
+                "type": "api_key",
+                "in": "{{ schema.in }}",
+                "key": "{{ schema.name }}",
+                "value": self.get_api_key_with_prefix(
+                    "{{name}}",{% if "x-auth-id-alias" in schema %}
+                    alias="{{ schema["x-auth-id-alias"] }}",{%- endif %}
+                ),
+            }
+{%- elif schema.type == "http" and schema.scheme == "basic" %}
+        if self.username is not None and self.password is not None:
+            auth["{{name}}"] = {
+                "type": "basic",
+                "in": "header",
+                "key": "Authorization",
+                "value": self.get_basic_auth_token()
+            }
+{%- elif schema.type == "http" and schema.scheme == "bearer" %}
+        if self.access_token is not None:
+            auth["{{name}}"] = {
+                "type": "bearer",
+                "in": "header",
+                {% if schema.bearerFormat %}
+                "format": "{{ schema.bearerFormat }}",
+                {% endif %}
+                "key": "Authorization",
+                "value": "Bearer " + self.access_token
+            }
+{%- elif schema.type == "oauth2" %}
+        if self.access_token is not None:
+            auth["AuthZ"] = {
+                "type": "oauth2",
+                "in": "header",
+                "key": "Authorization",
+                "value": "Bearer " + self.access_token,
+            }
+{%- endif %}
+{%- endfor %}
+        return auth
 {# keep new line #}

src/datadog_api_client/configuration.py

@@ -297,39 +297,6 @@ def get_basic_auth_token(self):
             password = self.password
         return urllib3.util.make_headers(basic_auth=username + ":" + password).get("authorization")
 
-    def auth_settings(self):
-        """Gets Auth Settings dict for api client.
-
-        :return: The Auth Settings information dict.
-        """
-        auth = {}
-        if self.access_token is not None:
-            auth["AuthZ"] = {
-                "type": "oauth2",
-                "in": "header",
-                "key": "Authorization",
-                "value": "Bearer " + self.access_token,
-            }
-        if "apiKeyAuth" in self.api_key:
-            auth["apiKeyAuth"] = {
-                "type": "api_key",
-                "in": "header",
-                "key": "DD-API-KEY",
-                "value": self.get_api_key_with_prefix(
-                    "apiKeyAuth",
-                ),
-            }
-        if "appKeyAuth" in self.api_key:
-            auth["appKeyAuth"] = {
-                "type": "api_key",
-                "in": "header",
-                "key": "DD-APPLICATION-KEY",
-                "value": self.get_api_key_with_prefix(
-                    "appKeyAuth",
-                ),
-            }
-        return auth
-
     def get_host_settings(self):
         """Gets an array of host settings