Let client_type ('oauth2' or 'oidc') govern.

Author: rohe

src/idpyoidc/client/entity.py

@@ -12,6 +12,7 @@
 from idpyoidc.client.configure import Configuration
 from idpyoidc.client.configure import get_configuration
 from idpyoidc.client.defaults import DEFAULT_OAUTH2_SERVICES
+from idpyoidc.client.defaults import DEFAULT_OIDC_SERVICES
 from idpyoidc.client.service import init_services
 from idpyoidc.client.service_context import ServiceContext
 
@@ -109,7 +110,12 @@ def __init__(
             _srvs = None
 
         if not _srvs:
-            _srvs = services or DEFAULT_OAUTH2_SERVICES
+            if services:
+                _srvs = services
+            elif client_type == "oauth2":
+                _srvs = DEFAULT_OAUTH2_SERVICES
+            else:
+                _srvs = DEFAULT_OIDC_SERVICES
 
         self._service = init_services(service_definitions=_srvs, client_get=self.client_get,
                                       metadata=config.conf.get("metadata", {}),

src/idpyoidc/client/oauth2/__init__.py

@@ -41,9 +41,12 @@ def __init__(
         services=None,
         jwks_uri="",
         httpc_params=None,
+        client_type: Optional[str] = ""
     ):
         """
 
+        :type client_type: str
+        :param client_type: What kind of client this is. Presently 'oauth2' or 'oidc'
         :param keyjar: A py:class:`idpyoidc.key_jar.KeyJar` instance
         :param config: Configuration information passed on to the
             :py:class:`idpyoidc.client.service_context.ServiceContext`
@@ -55,13 +58,17 @@ def __init__(
         :return: Client instance
         """
 
+        if not client_type:
+            client_type = "oauth2"
+
         Entity.__init__(
             self,
             keyjar=keyjar,
             config=config,
             services=services,
             jwks_uri=jwks_uri,
             httpc_params=httpc_params,
+            client_type=client_type
         )
 
         self.http = httplib or HTTPLib(httpc_params)

src/idpyoidc/client/oidc/__init__.py

@@ -95,6 +95,7 @@ def __init__(
             httplib=httplib,
             services=_srvs,
             httpc_params=httpc_params,
+            client_type="oidc"
         )
 
         _context = self.get_service_context()

src/idpyoidc/client/specification/__init__.py

@@ -179,4 +179,7 @@ def get(self, key, default=None):
             return default
 
     def set(self, key, val):
-        self._local[key] = val
+        self._local[key] = val
+
+    def construct_uris(self, *args):
+        pass

src/idpyoidc/client/specification/oauth2.py

@@ -8,6 +8,7 @@ class Specification(sp.Specification):
         "redirect_uris": None,
         "grant_types": ["authorization_code", "implicit", "refresh_token"],
         "response_types": ["code"],
+        "client_id": None,
         "client_name": None,
         "client_uri": None,
         "logo_uri": None,