ISSUE #403

Author: vladyslav-fenchak

packages/plugins/minos-discovery-kong/README.md

@@ -63,6 +63,22 @@ services:
           - NODE_ENV=production
 ```
 
+## Decorators
+Decorator `@enroute` can support next params:
+ - `path` - route url path.
+ - `method` - HTTP method.
+ - `authenticated` (Optional) - True if route need authentication.
+ - `authorized_groups` (Optional) - Groups which can access to specified route (they must exist in Kong).
+ - `regex_priority` (Optional) - A number used to choose which route resolves a given request when several routes match it using regexes simultaneously. When two routes match the path and have the same regex_priority, the older one (lowest created_at) is used. Note that the priority for non-regex routes is different (longer non-regex routes are matched before shorter ones). Defaults to 0.
+
+Example:
+```python
+    @enroute.rest.command(f"/users/{{uuid:{UUID_REGEX.pattern}}}/jwt", "POST", authenticated=True, authorized_groups=["admin"], regex_priority=2)
+    @enroute.broker.command("GetUserJWT")
+    async def foo(self, request: Request) -> Response:
+       ...
+```
+
 ## Authentication
 
 Modify `config.yml` file. Add new middleware and modify discovery section:
@@ -85,6 +101,23 @@ Currently, there are 2 possible types of authentication:
 - `basic-auth`
 - `jwt`
 
+For jwt auth type you can specify default token expiration. Example:
+```yaml
+...
+middleware:
+  ...
+  - minos.plugins.kong.middleware
+
+discovery:
+  connector: minos.networks.DiscoveryConnector
+  client: minos.plugins.kong.KongDiscoveryClient
+  host: localhost
+  auth-type: jwt
+  token-exp-minutes: 60
+  port: 8001
+...
+```
+
 For the route to be authenticated with the method specified above, a parameter called `authenticated` must be passed:
 ```python
 class CategoryCommandService(CommandService):
@@ -222,6 +255,8 @@ class UserCommandService(CommandService):
 ```
 
 You can get read the official docs [here](https://pantsel.github.io/konga/).
+
+
 ## Documentation
 
 The official API Reference is publicly available at the [GitHub Pages](https://minos-framework.github.io/minos-python).

packages/plugins/minos-discovery-kong/minos/plugins/kong/discovery.py

@@ -112,7 +112,7 @@ async def subscribe(
                 self.route,
                 ["http"],
                 [endpoint["method"]],
-                [endpointClass.path_as_str],
+                [endpointClass.path_as_regex],
                 content_service["id"],
                 regex_priority,
                 False,

packages/plugins/minos-discovery-kong/minos/plugins/kong/utils.py

@@ -1,10 +1,15 @@
+import re
+
+
 class PathPart:
     def __init__(self, name: str):
         self.name = name
         self.is_generic: bool = True if self.name.startswith("{") and self.name.endswith("}") else False
 
 
 class Endpoint:
+    part_path_pattern = r"\{\S+:.+\}"
+
     def __init__(self, path: str):
         self.path: tuple[PathPart] = tuple(PathPart(path_part) for path_part in path.split("/"))
 
@@ -16,3 +21,18 @@ def path_as_str(self) -> str:
                 part.name = ".*"
             list_parts.append(str(part.name))
         return "/".join(list_parts)
+
+    @property
+    def path_as_regex(self) -> str:
+        list_parts = []
+        for part in self.path:
+            if part.is_generic:
+                if re.match(self.part_path_pattern, part.name):
+                    regex = part.name.split(":")[1]
+                    regex = regex[:-1]
+                    list_parts.append(regex)
+                else:
+                    list_parts.append(".*")
+            else:
+                list_parts.append(part.name)
+        return "/".join(list_parts)

packages/plugins/minos-discovery-kong/tests/test_kong/test_utils.py

@@ -18,3 +18,29 @@ def test_path_constructor(self) -> None:
         self.assertIsInstance(pathpart, PathPart)
         self.assertEqual(pathpart.name, "minos")
         self.assertEqual(pathpart.is_generic, False)
+
+    def test_path_as_str(self) -> None:
+        pathpart = Endpoint(r"/user/{uuid:\w{8}-\w{4}-\w{4}-\w{4}-\w{12}}")
+        self.assertEqual(pathpart.path_as_str, "/user/.*")
+
+    def test_path_as_regex(self) -> None:
+        # pylint: disable=W605
+        pathpart = Endpoint(r"/user/{uuid:\w{8}-\w{4}-\w{4}-\w{4}-\w{12}}")
+        self.assertEqual(pathpart.path_as_regex, "/user/\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}")
+
+    def test_path_as_regex_simple_parameter(self) -> None:
+        pathpart = Endpoint("/user/{uuid}")
+        self.assertEqual(pathpart.path_as_regex, "/user/.*")
+
+    def test_path_as_regex_parameter(self) -> None:
+        pathpart = Endpoint("/user/{:uuid}")
+        self.assertEqual(pathpart.path_as_regex, "/user/.*")
+
+    def test_path_as_regex_multiple_parameter(self) -> None:
+        pathpart = Endpoint("/user/{:uuid}/{:uuid}")
+        self.assertEqual(pathpart.path_as_regex, "/user/.*/.*")
+
+    def test_path_as_regex_uuid(self) -> None:
+        # pylint: disable=W605
+        pathpart = Endpoint(r"/user/{uuid:\w{8}-\w{4}-\w{4}-\w{4}-\w{12}}/test")
+        self.assertEqual(pathpart.path_as_regex, "/user/\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}/test")