okdata-cli 3.2.0__py3-none-any.whl → 4.1.0__py3-none-any.whl

okdata/cli/__main__.py

@@ -1,7 +1,7 @@
 import json
 import sys
 
-from keycloak.exceptions import KeycloakGetError
+from keycloak.exceptions import KeycloakGetError, KeycloakPostError
 from okdata.sdk.exceptions import ApiAuthenticateError
 from requests.exceptions import RequestException
 
@@ -9,7 +9,7 @@ from okdata.cli import MAINTAINER
 from okdata.cli.command import BaseCommand
 from okdata.cli.commands.datasets import DatasetsCommand
 from okdata.cli.commands.permissions import PermissionsCommand
-from okdata.cli.commands.pubreg import PubregCommand
+from okdata.cli.commands.pubs import PubsCommand
 from okdata.cli.commands.status import StatusCommand
 from okdata.cli.commands.teams.teams import TeamsCommand
 
@@ -40,11 +40,12 @@ def main():
                 "An error occurred (ApiAuthenticateError): Invalid credentials",
                 {"error": 1, "message": "Invalid credentials"},
             )
-        except KeycloakGetError as e:
+        except (KeycloakGetError, KeycloakPostError) as e:
             error = json.loads(e.error_message)
+            error_type = e.__class__.__name__
             instance.log.info(f"Keycloak reported: {e}")
             instance.print(
-                f"An error occurred (KeycloakGetError): {error['error_description']}"
+                f"An error occurred ({error_type}): {error['error_description']}"
             )
         except (EOFError, KeyboardInterrupt):
             instance.print("\nAbort.")
@@ -69,7 +70,7 @@ def get_command_class(argv):
     commands = {
         "datasets": DatasetsCommand,
         "permissions": PermissionsCommand,
-        "pubreg": PubregCommand,
+        "pubs": PubsCommand,
         "status": StatusCommand,
         "teams": TeamsCommand,
     }

okdata/cli/command.py

@@ -21,7 +21,7 @@ class BaseCommand:
 usage:
   okdata datasets [options]
   okdata permissions [options]
-  okdata pubreg [options]
+  okdata pubs [options]
   okdata status [options]
   okdata teams [options]
   okdata -h | --help
@@ -29,7 +29,7 @@ usage:
 Commands available:
   datasets
   permissions
-  pubreg
+  pubs
   status
   teams
 

okdata/cli/commands/datasets/datasets.py

@@ -292,6 +292,10 @@ Options:{BASE_COMMAND_OPTIONS}
         parts = dataset_uri.split("/")
         dataset_id, version, edition = parts + [None] * (3 - len(parts))
 
+        # First verify that the dataset exists; `get_dataset` raises an error
+        # if not.
+        self.sdk.get_dataset(dataset_id)
+
         if auto_resolve:
             if not version:
                 version = self._get_latest_version(dataset_id)["version"]

okdata/cli/commands/datasets/questions.py

@@ -1,21 +1,17 @@
-import csv
-
 from questionary import Choice
 
-from okdata.cli.commands.datasets.validators import (
+from okdata.cli.commands.validators import (
     KeywordValidator,
-    PhoneValidator,
     SimpleEmailValidator,
-    SpatialResolutionValidator,
-    SpatialValidator,
-    StandardsValidator,
     TitleValidator,
 )
-from okdata.cli.commands.wizard import required_style
+from okdata.cli.commands.wizard import filter_comma_separated, required_style
 
 pipeline_choices = {
     "file": [
         Choice("Lagre dataen slik den er", "data-copy"),
+        Choice("Konverter fra CSV til Delta", "csv-to-delta"),
+        Choice("Konverter fra JSON til Delta", "json-to-delta"),
         Choice("Konverter fra CSV til Parquet", "csv-to-parquet"),
         Choice("Konverter fra Excel til CSV", "pipeline-excel-to-csv"),
         Choice("Ingen prosessering (krever manuell konfigurasjon av pipeline)", False),
@@ -30,14 +26,7 @@ available_pipelines = [
 ]
 
 
-def filter_comma_separated(value):
-    values = next(
-        csv.reader([value], delimiter=",", escapechar="\\", skipinitialspace=True)
-    )
-    return [x.strip() for x in values if x]
-
-
-def qs_create(include_extra_metadata=True):
+def qs_create():
     return [
         {
             **required_style,
@@ -67,38 +56,6 @@ def qs_create(include_extra_metadata=True):
             "validate": KeywordValidator,
             "filter": filter_comma_separated,
         },
-        {
-            **required_style,
-            "type": "confirm",
-            "name": "contains_geodata",
-            "message": "Inneholder datasettet geodata?",
-            "default": False,
-            "when": lambda x: include_extra_metadata,
-        },
-        {
-            "type": "text",
-            "name": "spatial",
-            "message": "Romlig avgrensning (komma-separert)",
-            "validate": SpatialValidator,
-            "filter": filter_comma_separated,
-            "when": lambda x: include_extra_metadata and x["contains_geodata"],
-        },
-        {
-            "type": "text",
-            "name": "spatialResolutionInMeters",
-            "message": "Romlig oppløsning (i meter)",
-            "validate": SpatialResolutionValidator,
-            "filter": lambda v: float(v.replace(",", ".")) if v else None,
-            "when": lambda x: include_extra_metadata and x["contains_geodata"],
-        },
-        {
-            "type": "text",
-            "name": "conformsTo",
-            "message": "I samsvar med standarder (komma-separert)",
-            "validate": StandardsValidator,
-            "filter": filter_comma_separated,
-            "when": lambda x: include_extra_metadata,
-        },
         {
             **required_style,
             "type": "select",
@@ -138,7 +95,6 @@ def qs_create(include_extra_metadata=True):
                     "http://creativecommons.org/publicdomain/zero/1.0/",
                 ),
             ],
-            "when": lambda x: include_extra_metadata,
         },
         {"type": "text", "name": "name", "message": "Kontaktperson – navn"},
         {
@@ -148,13 +104,6 @@ def qs_create(include_extra_metadata=True):
             "message": "Kontaktperson – epost",
             "validate": SimpleEmailValidator,
         },
-        {
-            **required_style,
-            "type": "text",
-            "name": "phone",
-            "message": "Kontaktperson – telefon",
-            "validate": PhoneValidator,
-        },
         {"type": "text", "name": "publisher", "message": "Utgiver"},
         {
             **required_style,

okdata/cli/commands/datasets/wizards.py

@@ -29,17 +29,10 @@ class DatasetCreateWizard:
             "contactPoint": {
                 "name": choices["name"],
                 "email": choices["email"],
-                "phone": choices["phone"],
             },
             "publisher": choices["publisher"],
         }
 
-        if choices.get("spatial"):
-            config["spatial"] = choices["spatial"]
-        if choices.get("spatialResolutionInMeters"):
-            config["spatialResolutionInMeters"] = choices["spatialResolutionInMeters"]
-        if choices.get("conformsTo"):
-            config["conformsTo"] = choices["conformsTo"]
         if choices.get("license"):
             config["license"] = choices["license"]
 

okdata/cli/commands/permissions.py

@@ -12,12 +12,13 @@ class PermissionsCommand(BaseCommand):
 
 Usage:
   okdata permissions ls [<resource_name>] [options]
-  okdata permissions add <resource_name> <user> <scope> [--team | --client] [options]
+  okdata permissions add <resource_name> <user> [<scope>] [--team | --client] [options]
   okdata permissions rm <resource_name> <user> [<scope>] [--team | --client] [options]
 
 Examples:
   okdata permissions ls
   okdata permissions ls okdata:dataset:my-dataset
+  okdata permissions add okdata:dataset:my-dataset janedoe
   okdata permissions add okdata:dataset:my-dataset janedoe okdata:dataset:read
   okdata permissions rm okdata:dataset:my-dataset janedoe
   okdata permissions rm okdata:dataset:my-dataset janedoe okdata:dataset:write
@@ -57,10 +58,10 @@ Options:{BASE_COMMAND_OPTIONS}
             ]
             if self.cmd("add"):
                 self.add_user(resource_name, user_class(user), scope)
-                self.print("Granted {} on '{}' for {} '{}'".format(*fmt_args))
+                self.print("Granted {} on '{}' to {} '{}'".format(*fmt_args))
             else:
                 self.remove_user(resource_name, user_class(user), scope)
-                self.print("Revoked {} on '{}' for {} '{}'".format(*fmt_args))
+                self.print("Revoked {} on '{}' from {} '{}'".format(*fmt_args))
 
     def list_my_permissions(self):
         """Print all permissions for the current user."""
@@ -99,9 +100,14 @@ Options:{BASE_COMMAND_OPTIONS}
         out.add_rows(sorted(results, key=itemgetter("user_type", "user_name")))
         self.print(f"Permissions for '{resource_name}'", out)
 
-    def add_user(self, resource_name, user, scope):
-        """Grant `scope` on `resource_name` to `user`."""
-        self.client.update_permission(resource_name, scope, add_users=[user])
+    def add_user(self, resource_name, user, scope=None):
+        """Grant `scope` on `resource_name` to `user`.
+
+        When `scope` is unspecified, grant every permission on `resource_name`.
+        """
+        return self.client.update_permission(
+            resource_name, scope or "__all__", add_users=[user]
+        )
 
     def remove_user(self, resource_name, user, scope=None):
         """Revoke `scope` on `resource_name` for `user`.
@@ -109,11 +115,6 @@ Options:{BASE_COMMAND_OPTIONS}
         When `scope` is unspecified, revoke every permission on `resource_name`
         for `user`.
         """
-        if scope:
-            self.client.update_permission(resource_name, scope, remove_users=[user])
-        else:
-            for permission in self.client.get_permissions(resource_name):
-                if user.user_id in permission[f"{user.user_type}s"]:
-                    self.client.update_permission(
-                        resource_name, permission["scope"], remove_users=[user]
-                    )
+        return self.client.update_permission(
+            resource_name, scope or "__all__", remove_users=[user]
+        )

okdata/cli/commands/pubs/__init__.py

@@ -0,0 +1,3 @@
+from okdata.cli.commands.pubs.pubs import PubsCommand
+
+__all__ = ["PubsCommand"]

okdata/cli/commands/{pubreg → pubs}/client.py

@@ -5,23 +5,48 @@ from okdata.sdk import SDK
 log = logging.getLogger()
 
 
-class PubregClient(SDK):
+class PubsClient(SDK):
     def __init__(self, config=None, auth=None, env=None):
-        self.__name__ = "pubreg"
+        self.__name__ = "pubs"
         super().__init__(config, auth, env)
         self.api_url = "https://api.data{}.oslo.systems/maskinporten".format(
             "-dev" if self.config.config["env"] == "dev" else ""
         )
 
-    def create_client(self, team_id, provider, integration, scopes, env):
+    def create_maskinporten_client(self, team_id, provider, integration, scopes, env):
         data = {
+            "client_type": "maskinporten",
             "team_id": team_id,
             "provider": provider,
             "integration": integration,
             "scopes": scopes,
             "env": env,
         }
-        log.info(f"Creating client with payload: {data}")
+        log.info(f"Creating Maskinporten client with payload: {data}")
+        return self.post(f"{self.api_url}/clients", data=data).json()
+
+    def create_idporten_client(
+        self,
+        team_id,
+        integration,
+        client_uri,
+        frontchannel_logout_uri,
+        redirect_uris,
+        post_logout_redirect_uris,
+        env,
+    ):
+        data = {
+            "client_type": "idporten",
+            "team_id": team_id,
+            "provider": "idporten",
+            "integration": integration,
+            "client_uri": client_uri,
+            "frontchannel_logout_uri": frontchannel_logout_uri,
+            "redirect_uris": redirect_uris,
+            "post_logout_redirect_uris": post_logout_redirect_uris,
+            "env": env,
+        }
+        log.info(f"Creating ID-porten client with payload: {data}")
         return self.post(f"{self.api_url}/clients", data=data).json()
 
     def get_clients(self, env):

okdata/cli/commands/{pubreg/pubreg.py → pubs/pubs.py}

@@ -6,9 +6,14 @@ from okdata.sdk.team.client import TeamClient
 
 from okdata.cli import MAINTAINER
 from okdata.cli.command import BASE_COMMAND_OPTIONS, BaseCommand
-from okdata.cli.commands.pubreg.client import PubregClient
-from okdata.cli.commands.pubreg.questions import NoClientsError, NoKeysError
-from okdata.cli.commands.pubreg.wizards import (
+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.wizards import (
     audit_log_wizard,
     create_client_wizard,
     create_key_wizard,
@@ -21,33 +26,33 @@ from okdata.cli.commands.teams.questions import NoTeamError
 from okdata.cli.output import create_output
 
 
-class PubregCommand(BaseCommand):
-    __doc__ = f"""Oslo :: Public registers
+class PubsCommand(BaseCommand):
+    __doc__ = f"""Oslo :: Public services
 
 Usage:
-  okdata pubreg create-client [options]
-  okdata pubreg list-clients [options]
-  okdata pubreg delete-client [options]
-  okdata pubreg create-key [options]
-  okdata pubreg list-keys [options]
-  okdata pubreg delete-key [options]
-  okdata pubreg audit-log [options]
+  okdata pubs create-client [options]
+  okdata pubs list-clients [options]
+  okdata pubs delete-client [options]
+  okdata pubs create-key [options]
+  okdata pubs list-keys [options]
+  okdata pubs delete-key [options]
+  okdata pubs audit-log [options]
 
 Examples:
-  okdata pubreg create-client
-  okdata pubreg list-clients
-  okdata pubreg delete-client
-  okdata pubreg create-key
-  okdata pubreg list-keys
-  okdata pubreg delete-key
-  okdata pubreg audit-log
+  okdata pubs create-client
+  okdata pubs list-clients
+  okdata pubs delete-client
+  okdata pubs create-key
+  okdata pubs list-keys
+  okdata pubs delete-key
+  okdata pubs audit-log
 
 Options:{BASE_COMMAND_OPTIONS}
     """
 
     def __init__(self):
         super().__init__()
-        self.pubreg_client = PubregClient(env=self.opt("env"))
+        self.pubs_client = PubsClient(env=self.opt("env"))
         self.team_client = TeamClient(env=self.opt("env"))
 
     def handler(self):
@@ -77,40 +82,55 @@ Options:{BASE_COMMAND_OPTIONS}
             return
 
         team_id = config["team_id"]
+        client_type_id = config["client_type_id"]
         provider_id = config["provider_id"]
-        provider_name = config["provider_name"]
         integration = config["integration"]
         scopes = config["scopes"]
         env = config["env"]
 
         self.confirm_to_continue(
-            f"Will create a new client for {provider_name} in {env} with "
-            f"scopes {scopes}."
+            "Will create a new {} client{} in {}{}.".format(
+                client_types[client_type_id],
+                f" for {providers[provider_id]}" if provider_id else "",
+                env,
+                f" with scopes {scopes}" if scopes else "",
+            )
         )
 
         self.print("Creating client...")
-        response = self.pubreg_client.create_client(
-            team_id, provider_id, integration, scopes, env
-        )
+        if client_type_id == "maskinporten":
+            response = self.pubs_client.create_maskinporten_client(
+                team_id, provider_id, integration, scopes, env
+            )
+        else:
+            response = self.pubs_client.create_idporten_client(
+                team_id,
+                integration,
+                config["client_uri"],
+                config["frontchannel_logout_uri"],
+                config["redirect_uris"],
+                config["post_logout_redirect_uris"],
+                env,
+            )
         client_name = response["client_name"]
         self.print(
             f"""
 Done! Created a new client '{client_name}'.
 You may now go ahead and create a key for it by running:
 
-  okdata pubreg create-key"""
+  okdata pubs create-key"""
         )
 
     def list_clients(self):
         config = list_clients_wizard()
         env = config["env"]
-        clients = self.pubreg_client.get_clients(env)
-        out = create_output(self.opt("format"), "pubreg_clients_config.json")
+        clients = self.pubs_client.get_clients(env)
+        out = create_output(self.opt("format"), "pubs_clients_config.json")
         out.add_rows(sorted(clients, key=itemgetter("client_name")))
         self.print(f"Clients in {env}:", out)
 
     def delete_client(self):
-        choices = delete_client_wizard(self.pubreg_client)
+        choices = delete_client_wizard(self.pubs_client)
         env = choices["env"]
         client_id = choices["client_id"]
         client_name = choices["client_name"]
@@ -123,16 +143,18 @@ You may now go ahead and create a key for it by running:
                 client_name,
                 env,
                 (
-                    f" along with the key stored in AWS account {aws_account} "
-                    f"({aws_region})"
-                )
-                if delete_from_aws
-                else "",
+                    (
+                        f" along with the key stored in AWS account {aws_account} "
+                        f"({aws_region})"
+                    )
+                    if delete_from_aws
+                    else ""
+                ),
             ),
         )
 
         self.print(f"Deleting client '{client_name}' [{env}]...")
-        res = self.pubreg_client.delete_client(env, client_id, aws_account, aws_region)
+        res = self.pubs_client.delete_client(env, client_id, aws_account, aws_region)
         deleted_ssm_params = res["deleted_ssm_params"]
 
         self.print("\nDone! The client is deleted and will no longer work.")
@@ -203,11 +225,11 @@ You may now go ahead and create a key for it by running:
 
     def create_client_key(self):
         try:
-            config = create_key_wizard(self.pubreg_client)
+            config = create_key_wizard(self.pubs_client)
         except NoClientsError:
             self.print(
                 "No clients in the given environment yet!\n\n"
-                "  Create one with `okdata pubreg create-client`.\n"
+                "  Create one with `okdata pubs create-client`.\n"
             )
             return
 
@@ -226,22 +248,26 @@ You may now go ahead and create a key for it by running:
                         client_name,
                         env,
                         (
-                            f"send it to AWS account {aws_account} ({aws_region}), "
-                            "REPLACING any existing key for this client"
-                        )
-                        if key_destination == "aws"
-                        else "save it locally",
+                            (
+                                f"send it to AWS account {aws_account} ({aws_region}), "
+                                "REPLACING any existing key for this client"
+                            )
+                            if key_destination == "aws"
+                            else "save it locally"
+                        ),
+                    ),
+                    (
+                        "The key will be rotated automatically every night on weekdays.\n"
+                        if enable_auto_rotate
+                        else "The key will NOT be rotated automatically.\n"
                     ),
-                    "The key will be rotated automatically every night on weekdays.\n"
-                    if enable_auto_rotate
-                    else "The key will NOT be rotated automatically.\n",
                 ]
             )
         )
 
         self.print("Creating key for '{}' [{}]...".format(client_name, env))
 
-        key = self.pubreg_client.create_key(
+        key = self.pubs_client.create_key(
             env, client_id, aws_account, aws_region, enable_auto_rotate
         )
 
@@ -256,10 +282,10 @@ You may now go ahead and create a key for it by running:
             )
 
     def _list_client_keys_single(self, client_id, client_name, env):
-        keys = self.pubreg_client.get_keys(env, client_id)
+        keys = self.pubs_client.get_keys(env, client_id)
         out = create_output(
             self.opt("format"),
-            "pubreg_single_client_keys_config.json",
+            "pubs_single_client_keys_config.json",
         )
         out.add_rows(sorted(keys, key=itemgetter("expires")))
         self.print(f"Keys for client {client_name} [{env}]:", out)
@@ -269,17 +295,17 @@ You may now go ahead and create a key for it by running:
         keys = [
             {**key, "client_name": client["name"]}
             for client in clients
-            for key in self.pubreg_client.get_keys(env, client["id"])
+            for key in self.pubs_client.get_keys(env, client["id"])
         ]
         out = create_output(
             self.opt("format"),
-            "pubreg_multiple_client_keys_config.json",
+            "pubs_multiple_client_keys_config.json",
         )
         out.add_rows(sorted(keys, key=itemgetter("expires")))
         self.print(f"All client keys [{env}]:", out)
 
     def list_client_keys(self):
-        choices = list_keys_wizard(self.pubreg_client)
+        choices = list_keys_wizard(self.pubs_client)
         env = choices["env"]
 
         if "clients" in choices:
@@ -291,7 +317,7 @@ You may now go ahead and create a key for it by running:
 
     def delete_client_key(self):
         try:
-            choices = delete_key_wizard(self.pubreg_client)
+            choices = delete_key_wizard(self.pubs_client)
         except NoKeysError:
             self.print("The selected client doesn't have any keys.")
             return
@@ -306,17 +332,17 @@ You may now go ahead and create a key for it by running:
         )
 
         self.print(f"Deleting key '{key_id}' from '{client_name}' [{env}]...")
-        self.pubreg_client.delete_key(env, client_id, key_id)
+        self.pubs_client.delete_key(env, client_id, key_id)
         self.print("Done! The key is deleted and will no longer work.")
 
     def audit_log(self):
-        choices = audit_log_wizard(self.pubreg_client)
+        choices = audit_log_wizard(self.pubs_client)
         env = choices["env"]
         client_id = choices["client_id"]
         client_name = choices["client_name"]
 
-        audit_log = self.pubreg_client.get_audit_log(env, client_id)
+        audit_log = self.pubs_client.get_audit_log(env, client_id)
 
-        out = create_output(self.opt("format"), "pubreg_audit_log_config.json")
+        out = create_output(self.opt("format"), "pubs_audit_log_config.json")
         out.add_rows(sorted(audit_log, key=itemgetter("timestamp")))
         self.print(f"Audit log for client {client_name} [{env}]:", out)

okdata/cli/commands/{pubreg → pubs}/questions.py

@@ -1,11 +1,21 @@
-import re
 from operator import itemgetter
 
 from questionary import Choice
 
-from okdata.cli.commands.wizard import required_style
+from okdata.cli.commands.validators import (
+    AWSAccountValidator,
+    IntegrationValidator,
+    URIListValidator,
+    URIValidator,
+)
+from okdata.cli.commands.wizard import filter_comma_separated, required_style
+
+client_types = {
+    "idporten": "ID-porten",
+    "maskinporten": "Maskinporten",
+}
 
-_providers = {
+providers = {
     "freg": "Folkeregisteret",
     "krr": "Kontaktregisteret",
     "skatt": "Skatteetaten",
@@ -62,18 +72,29 @@ def q_env():
         **required_style,
         "type": "select",
         "name": "env",
-        "message": "Maskinporten environment",
+        "message": "Environment",
         "choices": _environments,
     }
 
 
+def q_client_type():
+    return {
+        **required_style,
+        "type": "select",
+        "name": "client_type_id",
+        "message": "Client type",
+        "choices": [Choice(pname, pid) for pid, pname in client_types.items()],
+    }
+
+
 def q_provider():
     return {
         **required_style,
         "type": "select",
         "name": "provider_id",
         "message": "Provider",
-        "choices": [Choice(pname, pid) for pid, pname in _providers.items()],
+        "choices": [Choice(pname, pid) for pid, pname in providers.items()],
+        "when": lambda x: x.get("client_type_id") == "maskinporten",
     }
 
 
@@ -83,19 +104,13 @@ def q_scopes():
         "type": "checkbox",
         "name": "scopes",
         "message": "Scopes",
-        "choices": lambda x: _scopes[x["provider_id"]],
+        "choices": lambda x: _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",
     }
 
 
 def q_integration():
-    def _validate_integration(text):
-        if len(text) > 30:
-            return "Too long!"
-        if not re.fullmatch("[0-9a-z-]+", text):
-            return 'Only lowercase letters, numbers and "-", please'
-        return True
-
     return {
         **required_style,
         "type": "text",
@@ -104,13 +119,59 @@ def q_integration():
         "instruction": (
             "(identifying in which system or case this client will be used)"
         ),
-        "validate": _validate_integration,
+        "validate": IntegrationValidator,
     }
 
 
-def q_client(pubreg_client, allow_all=False):
+def q_redirect_uris():
+    return {
+        **required_style,
+        "type": "text",
+        "name": "redirect_uris",
+        "message": "Redirect URIs (comma-separated)",
+        "filter": filter_comma_separated,
+        "when": lambda x: x.get("client_type_id") == "idporten",
+        "validate": URIListValidator,
+    }
+
+
+def q_post_logout_redirect_uris():
+    return {
+        **required_style,
+        "type": "text",
+        "name": "post_logout_redirect_uris",
+        "message": "Post logout Redirect URIs (comma-separated)",
+        "filter": filter_comma_separated,
+        "when": lambda x: x.get("client_type_id") == "idporten",
+        "validate": URIListValidator,
+    }
+
+
+def q_frontchannel_logout_uri():
+    return {
+        **required_style,
+        "type": "text",
+        "name": "frontchannel_logout_uri",
+        "message": "Frontchannel logout URI",
+        "when": lambda x: x.get("client_type_id") == "idporten",
+        "validate": URIValidator,
+    }
+
+
+def q_client_uri():
+    return {
+        **required_style,
+        "type": "text",
+        "name": "client_uri",
+        "message": "Client URI (back URI)",
+        "when": lambda x: x.get("client_type_id") == "idporten",
+        "validate": URIValidator,
+    }
+
+
+def q_client(pubs_client, allow_all=False):
     def _client_choices(env):
-        clients = pubreg_client.get_clients(env)
+        clients = pubs_client.get_clients(env)
 
         if not clients:
             raise NoClientsError
@@ -165,9 +226,7 @@ def q_aws_account():
         "name": "aws_account",
         "message": "AWS account number",
         "when": lambda x: x.get("key_destination") == "aws" or x.get("delete_from_aws"),
-        "validate": (
-            lambda t: bool(re.fullmatch("[0-9]{12}", t)) or "12 digits, please"
-        ),
+        "validate": AWSAccountValidator,
     }
 
 
@@ -198,9 +257,9 @@ def q_enable_auto_rotate():
     }
 
 
-def q_key(pubreg_client):
+def q_key(pubs_client):
     def _key_choices(env, client_id):
-        keys = pubreg_client.get_keys(env, client_id)
+        keys = pubs_client.get_keys(env, client_id)
 
         if not keys:
             raise NoKeysError

okdata/cli/commands/{pubreg → pubs}/wizards.py

@@ -1,15 +1,19 @@
-from okdata.cli.commands.pubreg.questions import (
-    _providers,
+from okdata.cli.commands.pubs.questions import (
     q_aws_account,
     q_aws_region,
     q_client,
+    q_client_type,
+    q_client_uri,
     q_delete_from_aws,
     q_enable_auto_rotate,
     q_env,
+    q_frontchannel_logout_uri,
     q_integration,
     q_key,
     q_key_destination,
+    q_post_logout_redirect_uris,
     q_provider,
+    q_redirect_uris,
     q_scopes,
 )
 from okdata.cli.commands.teams.questions import q_team
@@ -20,17 +24,26 @@ def create_client_wizard(team_client):
     choices = run_questionnaire(
         q_env(),
         q_team(team_client),
+        q_client_type(),
         q_provider(),
         q_scopes(),
         q_integration(),
+        q_redirect_uris(),
+        q_post_logout_redirect_uris(),
+        q_frontchannel_logout_uri(),
+        q_client_uri(),
     )
     return {
         "env": choices["env"],
         "team_id": choices.get("team_id"),
-        "provider_id": choices["provider_id"],
-        "provider_name": _providers[choices["provider_id"]],
+        "client_type_id": choices["client_type_id"],
+        "provider_id": choices.get("provider_id"),
         "integration": choices["integration"],
-        "scopes": choices["scopes"],
+        "scopes": choices.get("scopes"),
+        "redirect_uris": choices.get("redirect_uris"),
+        "post_logout_redirect_uris": choices.get("post_logout_redirect_uris"),
+        "frontchannel_logout_uri": choices.get("frontchannel_logout_uri"),
+        "client_uri": choices.get("client_uri"),
     }
 
 
@@ -39,10 +52,10 @@ def list_clients_wizard():
     return {"env": choices["env"]}
 
 
-def delete_client_wizard(pubreg_client):
+def delete_client_wizard(pubs_client):
     choices = run_questionnaire(
         q_env(),
-        q_client(pubreg_client),
+        q_client(pubs_client),
         q_delete_from_aws(),
         q_aws_account(),
         q_aws_region(),
@@ -57,10 +70,10 @@ def delete_client_wizard(pubreg_client):
     }
 
 
-def create_key_wizard(pubreg_client):
+def create_key_wizard(pubs_client):
     choices = run_questionnaire(
         q_env(),
-        q_client(pubreg_client),
+        q_client(pubs_client),
         q_key_destination(),
         q_aws_account(),
         q_aws_region(),
@@ -77,8 +90,8 @@ def create_key_wizard(pubreg_client):
     }
 
 
-def list_keys_wizard(pubreg_client):
-    choices = run_questionnaire(q_env(), q_client(pubreg_client, True))
+def list_keys_wizard(pubs_client):
+    choices = run_questionnaire(q_env(), q_client(pubs_client, True))
     return {
         "env": choices["env"],
         **(
@@ -94,11 +107,11 @@ def list_keys_wizard(pubreg_client):
     }
 
 
-def delete_key_wizard(pubreg_client):
+def delete_key_wizard(pubs_client):
     choices = run_questionnaire(
         q_env(),
-        q_client(pubreg_client),
-        q_key(pubreg_client),
+        q_client(pubs_client),
+        q_key(pubs_client),
     )
     return {
         "env": choices["env"],
@@ -108,8 +121,8 @@ def delete_key_wizard(pubreg_client):
     }
 
 
-def audit_log_wizard(pubreg_client):
-    choices = run_questionnaire(q_env(), q_client(pubreg_client))
+def audit_log_wizard(pubs_client):
+    choices = run_questionnaire(q_env(), q_client(pubs_client))
     return {
         "env": choices["env"],
         "client_id": choices["client"]["id"],

okdata/cli/commands/{datasets/validators.py → validators.py}

@@ -1,6 +1,8 @@
-import re
 import csv
 import datetime
+import re
+from types import SimpleNamespace
+from urllib.parse import urlparse
 
 from questionary import Validator, ValidationError
 
@@ -31,15 +33,6 @@ class SimpleEmailValidator(Validator):
             )
 
 
-class PhoneValidator(Validator):
-    def validate(self, document):
-        if not re.match(r"^[0-9]+$", document.text):
-            raise ValidationError(
-                message="Please enter a valid phone - all numbers and no space, example: 232334455",
-                cursor_position=len(document.text),
-            )
-
-
 class TitleValidator(Validator):
     def validate(self, document):
         if len(document.text) < 5:
@@ -68,55 +61,49 @@ class KeywordValidator(Validator):
             )
 
 
-class StandardsValidator(Validator):
+class IntegrationValidator(Validator):
     def validate(self, document):
-        standards = csv.reader(
-            [document.text], delimiter=",", escapechar="\\", skipinitialspace=True
-        )
-        standards = [x.strip() for x in next(standards)]
-        for standard in standards:
-            if len(standard) < 3:
-                raise ValidationError(
-                    message="Each standard reference must be at least 3 characters",
-                    cursor_position=len(document.text),
-                )
-        if len(standards) != len(set(standards)):
+        if len(document.text) > 30:
             raise ValidationError(
-                message="Each standard reference must be unique",
+                message="Too long!", cursor_position=len(document.text)
+            )
+        if not re.fullmatch("[0-9a-z-]+", document.text):
+            raise ValidationError(
+                message='Only lowercase letters, numbers and "-", please',
                 cursor_position=len(document.text),
             )
 
 
-class SpatialValidator(Validator):
+class AWSAccountValidator(Validator):
     def validate(self, document):
-        locations = csv.reader(
-            [document.text], delimiter=",", escapechar="\\", skipinitialspace=True
-        )
-        locations = [x.strip() for x in next(locations)]
-        for location in locations:
-            if len(location) < 1:
-                raise ValidationError(
-                    message="Each location must be at least 1 character",
-                    cursor_position=len(document.text),
-                )
-        if len(locations) != len(set(locations)):
+        if not re.fullmatch("[0-9]{12}", document.text):
+            raise ValidationError(
+                message="12 digits, please", cursor_position=len(document.text)
+            )
+
+
+class URIValidator(Validator):
+    def validate(self, document):
+        parsed = urlparse(document.text)
+
+        if not (parsed.scheme and parsed.netloc):
             raise ValidationError(
-                message="Each location must be unique",
+                message="Please enter a valid URI, including scheme (e.g. https://...)",
                 cursor_position=len(document.text),
             )
 
 
-class SpatialResolutionValidator(Validator):
+class URIListValidator(Validator):
     def validate(self, document):
-        if not document.text:
-            return None
+        uri_validator = URIValidator()
         try:
-            number = float(document.text.replace(",", "."))
-            if number <= 0:
-                raise ValueError
-        except ValueError:
+            for val in document.text.split(","):
+                uri_validator.validate(SimpleNamespace(text=val))
+        except ValidationError:
             raise ValidationError(
-                message="Please enter a positive (decimal) number",
+                message=(
+                    "Please enter a comma-separated list of URIs, including scheme "
+                    "(e.g. https://...)"
+                ),
                 cursor_position=len(document.text),
             )
-        return None

okdata/cli/commands/wizard.py

@@ -1,3 +1,4 @@
+import csv
 import sys
 
 from prompt_toolkit.styles import Style
@@ -17,3 +18,10 @@ def run_questionnaire(*questions):
         sys.exit()
 
     return choices
+
+
+def filter_comma_separated(value):
+    values = next(
+        csv.reader([value], delimiter=",", escapechar="\\", skipinitialspace=True)
+    )
+    return [x.strip() for x in values if x]

okdata/cli/data/output-format/datasets_dataset_config.json

@@ -16,7 +16,6 @@
     "key": "contactPoint",
     "fields": [
       "name",
-      "phone",
       "email"
     ]
   }

okdata/cli/output.py

@@ -41,12 +41,11 @@ class TableOutput(PrettyTable):
         super().__init__(column_headers)
 
     def field_values(self, row, row_key, key):
-        value = ""
+        values = []
         for field in self.config[key]["fields"]:
             if field in row[row_key]:
-                tmp = row[row_key][field]
-                value += f"{tmp}\n"
-        return value
+                values.append(str(row[row_key][field]))
+        return "\n".join(values)
 
     def get_row_value(self, row, key):
         row_key = self.config[key]["key"]

{okdata_cli-3.2.0.dist-info → okdata_cli-4.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: okdata-cli
-Version: 3.2.0
+Version: 4.1.0
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo
@@ -19,7 +19,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PrettyTable
 Requires-Dist: docopt
-Requires-Dist: okdata-sdk <4,>=3.1
+Requires-Dist: okdata-sdk <4,>=3.1.1
 Requires-Dist: questionary <2.0.0,>=1.10.0
 Requires-Dist: requests
 
@@ -29,7 +29,7 @@ Okdata CLI provides a unified interface to data services for Oslo Origo teams.
 
 * [Install](doc/install.md)
 * [Configuration](doc/configuration.md)
-* [Public registers](doc/pubreg.md)
+* [Public services](doc/pubs.md)
 * [Teams](doc/teams.md)
 * [Datasets](doc/datasets.md)
 * [Permissions](doc/permissions.md)

{okdata_cli-3.2.0.dist-info → okdata_cli-4.1.0.dist-info}/RECORD

@@ -1,23 +1,23 @@
-okdata_cli-3.2.0-nspkg.pth,sha256=4nrP4RXuGOCDLZ0px0sO63KvnhR4W_t4MWel1CEdd2U,539
+okdata_cli-4.1.0-nspkg.pth,sha256=4nrP4RXuGOCDLZ0px0sO63KvnhR4W_t4MWel1CEdd2U,539
 okdata/cli/__init__.py,sha256=72PLqW3-JGeKxQGusk3AX78ITwcn7DDawEMNLlsurz4,27
-okdata/cli/__main__.py,sha256=Q5T-QWTB9D349j1jiBtoMH0dB-jL_Qxai0J7oN_p_hM,2534
-okdata/cli/command.py,sha256=6XmpmN6VfUr5dTROeP3s5aqjOo6dCaf-WeaUfB44xs0,4285
+okdata/cli/__main__.py,sha256=HpSOoNdhNn68GB9rkJZXDPx07RWxQjBkCEVIz9N_ydo,2608
+okdata/cli/command.py,sha256=H65OJP72fRgip_vK_vJ8TDNan18OyO6WQNtj797mO3U,4281
 okdata/cli/io.py,sha256=cNm-h86fm3ez59A9rhWO0xnHBTIe-_Xj9BtcjKa34lg,730
-okdata/cli/output.py,sha256=_TC-iuKXBYgfY2BnMVcqKNZgrmXeb10mWychI1KtLzo,4802
+okdata/cli/output.py,sha256=HAQKEwTj_GJXzIUqi4U3-VAt6CClRO2f3k6ZuDRjQ5A,4793
 okdata/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-okdata/cli/commands/permissions.py,sha256=52JPEoK7r3LCwHSWkMJk9qSosuOlQ-fiIS6Bt6VhFwI,4568
+okdata/cli/commands/permissions.py,sha256=eLR9IGPi5OMZ7r46Bfl0SKS6WthmU2rSRcQh3n8mG9o,4476
 okdata/cli/commands/status.py,sha256=NkAuNEUWVumDsU-axFSOrX7AAJ-XV0fevsBbxpbl5CU,3998
-okdata/cli/commands/wizard.py,sha256=KhM-IVYzo6L0EPh9L9D9rpjyrEChImOaEjBzu7x8deA,341
+okdata/cli/commands/validators.py,sha256=lkLo4UPmwXkKzEIFs0jucPVBV4jOPTZjzefpAvP1vdU,3882
+okdata/cli/commands/wizard.py,sha256=FFNK6h50atWh0Tl7lOx1lSU0jC6QNRz0SqDuv5OcRew,541
 okdata/cli/commands/datasets/__init__.py,sha256=kS1uB6u_0VI1jm_TQjaCvTMqPFHnKSQITPUuPB_SY00,69
-okdata/cli/commands/datasets/datasets.py,sha256=Gfa_GxOJ3pIG9JtF4RhJI8W21SfJQ_BJOZLRBy1Dau4,13907
-okdata/cli/commands/datasets/questions.py,sha256=1VT76wEnVn_OFrDxfs3lbc0AUWsC1JbC5pTHXnjEm_k,5669
-okdata/cli/commands/datasets/validators.py,sha256=_PO3BcQW-mrz6BH6nkBjdvC5guSmoS7TUc_2inJKZoI,4461
-okdata/cli/commands/datasets/wizards.py,sha256=K3hRjvUD4nbrA2Fc536VsWRXmWawIozXX9mtlAHqHi4,3699
-okdata/cli/commands/pubreg/__init__.py,sha256=ag6UPDj1X2liovwazLL6hqvOZux2_syR1kce-FYw56A,89
-okdata/cli/commands/pubreg/client.py,sha256=n_vF3bhGKazDpUCu7i-KjH_8buBA_OLISDfN0SGyHK0,2392
-okdata/cli/commands/pubreg/pubreg.py,sha256=hJ5jiJGM-PWEtOA3-U4dDR6VVhS_oRuETO_4BJmFjqo,11255
-okdata/cli/commands/pubreg/questions.py,sha256=wl23CioGBl5nBLNfLIYqRjoFC1rXfhuUkHkvYrmGWi8,5459
-okdata/cli/commands/pubreg/wizards.py,sha256=_oEyJWQMaIfH0fIJs5KEggqtT1YimfwualeNGCqjzAU,3121
+okdata/cli/commands/datasets/datasets.py,sha256=vt5MnhkLOAv-TFCcz4MkapBsDYwimXPV6TkoF5KFb3A,14045
+okdata/cli/commands/datasets/questions.py,sha256=svesJS9MGwN3y2Utsy43HwWKPxe-K15neKt8A2eozqg,4004
+okdata/cli/commands/datasets/wizards.py,sha256=X2xwiZpQhum9looqYbcuGgvSO1J_wAkaRNQf7NudxqU,3335
+okdata/cli/commands/pubs/__init__.py,sha256=T105M_46YzyZ2Cici48QKNyjfJTIQJ1uyMFlo91rIZ4,81
+okdata/cli/commands/pubs/client.py,sha256=dOabTkeZKPvHFbgwZC4SX4DyvnvEezpeSiLQ1EY1hlo,3223
+okdata/cli/commands/pubs/pubs.py,sha256=WOeZvg8bUUJ7bXSvtfByF84IlH70jFF6-fe3tsvjhAY,12002
+okdata/cli/commands/pubs/questions.py,sha256=0UwZ87Zcx5eAWLO3FI4aoLGvY3lQuLqEcYa6kUT8OLo,7020
+okdata/cli/commands/pubs/wizards.py,sha256=fNhj-7G7ePEYVLrhmdXdNzRSdD-9BzVAcJxujuz7LwQ,3613
 okdata/cli/commands/teams/questions.py,sha256=UqfHK2bwl6retyYYC-IywG_39aRDC-WbKYpMIQ83gfE,2997
 okdata/cli/commands/teams/teams.py,sha256=ta4RRgRp-89CACh98nvbfbaxnE3EnloHVkNslBtgwKY,5633
 okdata/cli/commands/teams/util.py,sha256=c7U6jI7CN7MUyfsK6Z3AawL0SJJBlFar4FvXfsJQzSk,456
@@ -25,25 +25,25 @@ okdata/cli/commands/teams/wizards.py,sha256=bARELvUPdcbj5O7O1xwEL8Bcv7YNZYt2zyXq
 okdata/cli/data/output-format/datasets_config.json,sha256=rAvcNeBc0d53tWSAlWnt8IxvjNDWqm-b1sEgfk5IvF8,180
 okdata/cli/data/output-format/datasets_copy_file_config.json,sha256=wAKnX_B7d1keRGdIQBwsvF25oyD1aC2ZYLTDi_KPWzY,262
 okdata/cli/data/output-format/datasets_copy_file_config_2.json,sha256=7U0ka_IgSJv6vxQ6q7La8MPMy45Vwxb39_YSlQBMha0,206
-okdata/cli/data/output-format/datasets_dataset_config.json,sha256=inZaVE4GJK1EZm4O7DlbDuoXucuYm3bvVef4aTWVt-4,359
+okdata/cli/data/output-format/datasets_dataset_config.json,sha256=J8uVCrU5ehHs3jYrqRm5HgJHnYmkWJaoZCcZnVWilpA,344
 okdata/cli/data/output-format/datasets_dataset_version_config.json,sha256=PW1PoW7PWkJj76RyfD5xEbYoeCf1yeC94s-ua5Z1GU8,345
 okdata/cli/data/output-format/datasets_dataset_version_edition_config.json,sha256=_UECCluFSMWwyIiZ1rBCS2LOnxiN1roZVEbQ71AW5Fo,328
 okdata/cli/data/output-format/datasets_dataset_version_edition_distributions_config.json,sha256=xTuQTNfBnnJFDF5aFLY5bBT1-qzd5cbceKqqxmF0NUU,119
 okdata/cli/data/output-format/datasets_dataset_versions_config.json,sha256=rqrhf-xK_RYkbP3dCZrn6m7CDVNn_Pg0GknGj2wDtHw,209
 okdata/cli/data/output-format/my_permissions_config.json,sha256=VPx95G_e6D6OJQJmXrS8ASKwUJP0uETqWam681edBQU,146
 okdata/cli/data/output-format/permissions_config.json,sha256=uPrYKhnEZEImsFZ4CpVdeOb8NrtdlnvfT4L0pvqiBuw,204
-okdata/cli/data/output-format/pubreg_audit_log_config.json,sha256=hXZV2-OUKElGiHTVQbslZqe_IeP1eGjktzhhAAcIbzg,301
-okdata/cli/data/output-format/pubreg_clients_config.json,sha256=aFbQIQldHfsRnI39SCE0cmm-3MDFq57r0ZsIzZ9HsHA,246
-okdata/cli/data/output-format/pubreg_multiple_client_keys_config.json,sha256=_mGvDgNeLBZZwos6JXVBESyHjYNIje8zKv08MKMVaug,201
-okdata/cli/data/output-format/pubreg_single_client_keys_config.json,sha256=LO78-h-9o_tfHSNQ_4dOfsxuNvoc1TxbOPTvseEZy6w,125
+okdata/cli/data/output-format/pubs_audit_log_config.json,sha256=hXZV2-OUKElGiHTVQbslZqe_IeP1eGjktzhhAAcIbzg,301
+okdata/cli/data/output-format/pubs_clients_config.json,sha256=aFbQIQldHfsRnI39SCE0cmm-3MDFq57r0ZsIzZ9HsHA,246
+okdata/cli/data/output-format/pubs_multiple_client_keys_config.json,sha256=_mGvDgNeLBZZwos6JXVBESyHjYNIje8zKv08MKMVaug,201
+okdata/cli/data/output-format/pubs_single_client_keys_config.json,sha256=LO78-h-9o_tfHSNQ_4dOfsxuNvoc1TxbOPTvseEZy6w,125
 okdata/cli/data/output-format/status_config.json,sha256=oq9uYZbPZrM2ksWrQDd9-VWO0Ea7jMe02TDgxg6XLEA,354
 okdata/cli/data/output-format/status_history_config.json,sha256=Gh-l8w9688P0hdp_DtJ9cxMc1bdv5DuNp5QBftOnb9M,721
 okdata/cli/data/output-format/team_members_config.json,sha256=CYzlVLU3f41kpxBbovXYDYRYOvhScfYU2yxtwHFMcuQ,183
 okdata/cli/data/output-format/teams_config.json,sha256=z49y_7m3b9W02guXXcSdlX9XDAaIj0rRBDcqU68m9i0,124
-okdata_cli-3.2.0.dist-info/LICENSE,sha256=9oNBrI2Aw9TCn-T0CamN4hpU6Dzm-IkFzX0573Q211Q,1077
-okdata_cli-3.2.0.dist-info/METADATA,sha256=W8lko1x9IKLxn6yXwOEd7xRB59GfmogErr_6x9Dp7YQ,1197
-okdata_cli-3.2.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-okdata_cli-3.2.0.dist-info/entry_points.txt,sha256=OyY5saQTVah33LZ9ixM40rsMPgsOKErioZA8rtVjgKo,52
-okdata_cli-3.2.0.dist-info/namespace_packages.txt,sha256=Pdf-ZpWHLtLL295sDedsbAP3f6H189730mXrfVAVCcY,7
-okdata_cli-3.2.0.dist-info/top_level.txt,sha256=cS1IEDv6oxHgvQHrGSxFxjHTv5CNc9dLowH1vpCqF_k,11
-okdata_cli-3.2.0.dist-info/RECORD,,
+okdata_cli-4.1.0.dist-info/LICENSE,sha256=9oNBrI2Aw9TCn-T0CamN4hpU6Dzm-IkFzX0573Q211Q,1077
+okdata_cli-4.1.0.dist-info/METADATA,sha256=ymI274uuzhj-H3WCGCCxfUrzyWLpQSHYlnJxTBoVUT4,1196
+okdata_cli-4.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+okdata_cli-4.1.0.dist-info/entry_points.txt,sha256=OyY5saQTVah33LZ9ixM40rsMPgsOKErioZA8rtVjgKo,52
+okdata_cli-4.1.0.dist-info/namespace_packages.txt,sha256=Pdf-ZpWHLtLL295sDedsbAP3f6H189730mXrfVAVCcY,7
+okdata_cli-4.1.0.dist-info/top_level.txt,sha256=cS1IEDv6oxHgvQHrGSxFxjHTv5CNc9dLowH1vpCqF_k,11
+okdata_cli-4.1.0.dist-info/RECORD,,

{okdata_cli-3.2.0.dist-info → okdata_cli-4.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

okdata/cli/commands/pubreg/__init__.py

@@ -1,3 +0,0 @@
-from okdata.cli.commands.pubreg.pubreg import PubregCommand
-
-__all__ = ["PubregCommand"]