okdata-cli 4.3.0__tar.gz → 4.4.0__tar.gz

{okdata_cli-4.3.0/okdata_cli.egg-info → okdata_cli-4.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: okdata-cli
-Version: 4.3.0
+Version: 4.4.0
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo
@@ -29,6 +29,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

okdata_cli-4.3.0/okdata/cli/commands/pubs/client.py → okdata_cli-4.4.0/okdata/cli/commands/pubs/clients.py

@@ -98,3 +98,34 @@ class PubsClient(SDK):
         url = f"{self.api_url}/audit/{env}/{client_id}/log"
         log.info(f"Fetching audit log from: {url}")
         return self.get(url).json()
+
+
+class ProvidersClient(SDK):
+    def __init__(self, config=None, auth=None, env=None):
+        self.__name__ = "providers"
+        super().__init__(config, auth, env)
+        self.api_url = "https://api.data{}.oslo.systems/maskinporten/providers".format(
+            "-dev" if self.config.config["env"] == "dev" else ""
+        )
+
+    def get_providers(self):
+        log.info(f"Listing providers from: {self.api_url}")
+        providers = self.get(self.api_url).json()
+        return {p["provider_id"]: p["name"] for p in providers}
+
+
+class ScopesClient(SDK):
+    def __init__(self, config=None, auth=None, env=None):
+        self.__name__ = "scopes"
+        super().__init__(config, auth, env)
+        self.api_url = "https://api.data{}.oslo.systems/maskinporten/scopes".format(
+            "-dev" if self.config.config["env"] == "dev" else ""
+        )
+
+    def get_scopes(self):
+        log.info(f"Listing scopes from: {self.api_url}")
+        scopes = self.get(self.api_url).json()
+        scopes_dict = {}
+        for scope in scopes:
+            scopes_dict.setdefault(scope["provider_id"], []).append(scope["scope"])
+        return scopes_dict

{okdata_cli-4.3.0 → okdata_cli-4.4.0}/okdata/cli/commands/pubs/pubs.py

@@ -1,18 +1,14 @@
 import base64
 from datetime import datetime
+from functools import cached_property
 from operator import itemgetter
 
 from okdata.sdk.team.client import TeamClient
 
 from okdata.cli import MAINTAINER
 from okdata.cli.command import BASE_COMMAND_OPTIONS, BaseCommand, confirm_to_continue
-from okdata.cli.commands.pubs.client import PubsClient
-from okdata.cli.commands.pubs.questions import (
-    NoClientsError,
-    NoKeysError,
-    client_types,
-    providers,
-)
+from okdata.cli.commands.pubs.clients import ProvidersClient, PubsClient, ScopesClient
+from okdata.cli.commands.pubs.questions import NoClientsError, NoKeysError, client_types
 from okdata.cli.commands.pubs.wizards import (
     audit_log_wizard,
     create_client_wizard,
@@ -54,6 +50,16 @@ Options:{BASE_COMMAND_OPTIONS}
         super().__init__()
         self.pubs_client = PubsClient(env=self.opt("env"))
         self.team_client = TeamClient(env=self.opt("env"))
+        self.providers_client = ProvidersClient(env=self.opt("env"))
+        self.scopes_client = ScopesClient(env=self.opt("env"))
+
+    @cached_property
+    def _providers(self):
+        return self.providers_client.get_providers()
+
+    @cached_property
+    def _scopes(self):
+        return self.scopes_client.get_scopes()
 
     def handler(self):
         if self.cmd("create-client"):
@@ -73,7 +79,9 @@ Options:{BASE_COMMAND_OPTIONS}
 
     def create_client(self):
         try:
-            config = create_client_wizard(self.team_client)
+            config = create_client_wizard(
+                self.team_client, self._providers, self._scopes
+            )
         except NoTeamError:
             self.print(
                 "We haven't yet registered you as member of any Origo team. "
@@ -91,7 +99,7 @@ Options:{BASE_COMMAND_OPTIONS}
         confirm_to_continue(
             "Will create a new {} client{} in {}{}.".format(
                 client_types[client_type_id],
-                f" for {providers[provider_id]}" if provider_id else "",
+                f" for {self._providers[provider_id]}" if provider_id else "",
                 env,
                 f" with scopes {scopes}" if scopes else "",
             )

{okdata_cli-4.3.0 → okdata_cli-4.4.0}/okdata/cli/commands/pubs/questions.py

@@ -1,4 +1,4 @@
-from operator import itemgetter
+from operator import attrgetter, itemgetter
 
 from questionary import Choice
 
@@ -15,38 +15,6 @@ client_types = {
     "maskinporten": "Maskinporten",
 }
 
-providers = {
-    "freg": "Folkeregisteret",
-    "krr": "Kontaktregisteret",
-    "skatt": "Skatteetaten",
-}
-
-_scopes = {
-    "freg": [
-        "folkeregister:deling/offentligmedhjemmel",
-        "folkeregister:deling/offentligutenhjemmel",
-    ],
-    "krr": [
-        "krr:global/digitalpost.read",
-        "krr:global/kontaktinformasjon.read",
-    ],
-    "skatt": [
-        "skatteetaten:arbeidsgiveravgift",
-        "skatteetaten:avregning",
-        "skatteetaten:boligsparingforungdom",
-        "skatteetaten:inntekt",
-        "skatteetaten:inntektsmottakere",
-        "skatteetaten:mvameldingsopplysning",
-        "skatteetaten:oppdragutenlandskevirksomheter",
-        "skatteetaten:restanser",
-        "skatteetaten:skattemelding",
-        "skatteetaten:skatteplikt",
-        "skatteetaten:spesifisertsummertskattegrunnlag",
-        "skatteetaten:summertskattegrunnlag",
-        "skatteetaten:tjenestepensjonsavtale",
-    ],
-}
-
 _environments = [
     "test",
     "prod",
@@ -87,24 +55,29 @@ def q_client_type():
     }
 
 
-def q_provider():
+def q_provider(providers):
     return {
         **required_style,
         "type": "select",
         "name": "provider_id",
         "message": "Provider",
-        "choices": [Choice(pname, pid) for pid, pname in providers.items()],
+        "choices": sorted(
+            [Choice(pname, pid) for pid, pname in providers.items()],
+            key=attrgetter("title"),
+        ),
         "when": lambda x: x.get("client_type_id") == "maskinporten",
     }
 
 
-def q_scopes():
+def q_scopes(scopes):
     return {
         **required_style,
         "type": "checkbox",
         "name": "scopes",
         "message": "Scopes",
-        "choices": lambda x: _scopes[x["provider_id"]] if "provider_id" in x else [],
+        "choices": lambda x: (
+            sorted(scopes[x["provider_id"]]) if "provider_id" in x else []
+        ),
         "validate": (lambda choices: bool(choices) or "Select at least one scope"),
         "when": lambda x: x.get("client_type_id") == "maskinporten",
     }

{okdata_cli-4.3.0 → okdata_cli-4.4.0}/okdata/cli/commands/pubs/wizards.py

@@ -20,13 +20,13 @@ from okdata.cli.commands.teams.questions import q_team
 from okdata.cli.commands.wizard import run_questionnaire
 
 
-def create_client_wizard(team_client):
+def create_client_wizard(team_client, providers, scopes):
     choices = run_questionnaire(
         q_env(),
         q_team(team_client),
         q_client_type(),
-        q_provider(),
-        q_scopes(),
+        q_provider(providers),
+        q_scopes(scopes),
         q_integration(),
         q_redirect_uris(),
         q_post_logout_redirect_uris(),

{okdata_cli-4.3.0 → okdata_cli-4.4.0/okdata_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: okdata-cli
-Version: 4.3.0
+Version: 4.4.0
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo
@@ -29,6 +29,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{okdata_cli-4.3.0 → okdata_cli-4.4.0}/okdata_cli.egg-info/SOURCES.txt

@@ -18,7 +18,7 @@ okdata/cli/commands/datasets/datasets.py
 okdata/cli/commands/datasets/questions.py
 okdata/cli/commands/datasets/wizards.py
 okdata/cli/commands/pubs/__init__.py
-okdata/cli/commands/pubs/client.py
+okdata/cli/commands/pubs/clients.py
 okdata/cli/commands/pubs/pubs.py
 okdata/cli/commands/pubs/questions.py
 okdata/cli/commands/pubs/wizards.py

{okdata_cli-4.3.0 → okdata_cli-4.4.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="okdata-cli",
-    version="4.3.0",
+    version="4.4.0",
     author="Oslo Origo",
     author_email="dataspeilet@oslo.kommune.no",
     description="CLI for services provided by Oslo Origo",