appmesh 1.4.3__py3-none-any.whl → 1.4.5__py3-none-any.whl

appmesh/http_client.py

@@ -349,7 +349,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             timeout_seconds (int | str, optional): token expire timeout of seconds. support ISO 8601 durations (e.g., 'P1Y2M3DT4H5M6S' 'P1W').
 
         Returns:
-            str: The new JWT token if renew success, otherwise return None.
+            str: The new JWT token if renew success, the old token will be blocked.
         """
         assert self.jwt_token
         resp = self._request_http(
@@ -377,23 +377,26 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             return self._parse_totp_uri(totp_uri).get("secret")
         raise Exception(resp.text)
 
-    def setup_totp(self, totp_code: str) -> bool:
+    def setup_totp(self, totp_code: str) -> str:
         """Set up 2FA for the current user.
 
         Args:
             totp_code (str): TOTP code
 
         Returns:
-            bool: success or failure.
+            str: The new JWT token if setup success, the old token will be blocked.
         """
         resp = self._request_http(
             method=AppMeshClient.Method.POST,
             path="/appmesh/totp/setup",
             header={"Totp": totp_code},
         )
-        if resp.status_code != HTTPStatus.OK:
+        if resp.status_code == HTTPStatus.OK:
+            if "Access-Token" in resp.json():
+                self.jwt_token = resp.json()["Access-Token"]
+                return self.jwt_token
+        else:
             raise Exception(resp.text)
-        return resp.status_code == HTTPStatus.OK
 
     def disable_totp(self, user: str = "self") -> bool:
         """Disable 2FA for the specified user.

{appmesh-1.4.3.dist-info → appmesh-1.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: appmesh
-Version: 1.4.3
+Version: 1.4.5
 Summary: Client SDK for App Mesh
 Home-page: https://github.com/laoshanxi/app-mesh
 Author: laoshanxi
@@ -122,6 +122,7 @@ Refer to the [Installation doc](https://app-mesh.readthedocs.io/en/latest/Instal
 - [Remote execute](https://app-mesh.readthedocs.io/en/latest/success/remote_run_cli_and_python.html)
 - [Python parallel run](https://app-mesh.readthedocs.io/en/latest/success/python_parallel_run.html)
 - [Secure consul cluster](https://app-mesh.readthedocs.io/en/latest/success/secure_consul_cluster.html)
+- [JWT service with REST and UI](https://github.com/laoshanxi/app-mesh/blob/main/script/docker-compose-auth-service.yaml)
 
 ---
 

{appmesh-1.4.3.dist-info → appmesh-1.4.5.dist-info}/RECORD

@@ -3,11 +3,11 @@ appmesh/app.py,sha256=9Q-SOOej-MH13BU5Dv2iTa-p-sECCJQp6ZX9DjWWmwE,10526
 appmesh/app_output.py,sha256=JK_TMKgjvaw4n_ys_vmN5S4MyWVZpmD7NlKz_UyMIM8,1015
 appmesh/app_run.py,sha256=9ISKGZ3k3kkbQvSsPfRfkOLqD9xhbqNOM7ork9F4w9c,1712
 appmesh/appmesh_client.py,sha256=0ltkqHZUq094gKneYmC0bEZCP0X9kHTp9fccKdWFWP0,339
-appmesh/http_client.py,sha256=XW3BOa1g6FVWDhiX9A8HrdkVRzEv5WBK-Z5i6HoRwow,44200
+appmesh/http_client.py,sha256=dsQfcjC3U429yDJHhP5SFsoySTDbyRM3rToxi7ooGJA,44363
 appmesh/tcp_client.py,sha256=RkHl5s8jE333BJOgxJqJ_fvjbdRQza7ciV49vLT6YO4,10923
 appmesh/tcp_messages.py,sha256=w1Kehz_aX4X2CYAUsy9mFVJRhxnLQwwc6L58W4YkQqs,969
 appmesh/tcp_transport.py,sha256=UMGby2oKV4k7lyXZUMSOe2Je34fb1w7nTkxEpatKLKg,7256
-appmesh-1.4.3.dist-info/METADATA,sha256=VN33Xn9UWnONmOt7ypWvJ0195RZnDmphydF37VQAQeQ,11379
-appmesh-1.4.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-appmesh-1.4.3.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.4.3.dist-info/RECORD,,
+appmesh-1.4.5.dist-info/METADATA,sha256=ozlyIACS7JpSX1Va_RS6tE1WY3h1AR0xqAen1R1Bu08,11501
+appmesh-1.4.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+appmesh-1.4.5.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.4.5.dist-info/RECORD,,