appmesh 0.5.7__py3-none-any.whl → 0.5.8__py3-none-any.whl

appmesh/appmesh_client.py

@@ -17,7 +17,7 @@ from datetime import datetime
 import requests
 
 
-DEFAULT_TOKEN_EXPIRE_SECONDS = "P1W"  # 7 days
+DEFAULT_TOKEN_EXPIRE_SECONDS = "P1W"  # default 7 day(s)
 DEFAULT_RUN_APP_TIMEOUT_SECONDS = "PT1H"  # 1 hour
 DEFAULT_RUN_APP_LIFECYCLE_SECONDS = "PT10H"  # 10 hours
 REST_TEXT_MESSAGE_JSON_KEY = "message"
@@ -274,7 +274,6 @@ class AppMeshClient(metaclass=abc.ABCMeta):
 
     def __init__(
         self,
-        auth_enable: bool = True,
         rest_url: str = "https://127.0.0.1:6060",
         rest_ssl_verify=_SSL_CA_PEM_FILE,
         rest_timeout=(60, 300),
@@ -283,14 +282,12 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         """Construct an App Mesh client object
 
         Args:
-            auth_enable (bool, optional): server enabled JWT authentication or not.
             rest_url (str, optional): server URI string.
             rest_ssl_verify (str, optional): SSL CA certification file path or False to disable SSL verification.
             rest_timeout (tuple, optional): HTTP timeout, Defaults to 60 seconds for connect timeout and 300 seconds for read timeout
             jwt_token (str, optional): JWT token, provide correct token is same with login() & authenticate().
         """
         self.server_url = rest_url
-        self.jwt_auth_enable = auth_enable
         self.__jwt_token = jwt_token
         self.ssl_verify = rest_ssl_verify
         self.rest_timeout = rest_timeout
@@ -328,22 +325,21 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             str: JWT token if verify success, otherwise return None.
         """
         self.jwt_token = None
-        if self.jwt_auth_enable:
-            resp = self._request_http(
-                AppMeshClient.Method.POST,
-                path="/appmesh/login",
-                header={
-                    "Username": base64.b64encode(user_name.encode()),
-                    "Password": base64.b64encode(user_pwd.encode()),
-                    "Expire-Seconds": self._parse_duration(timeout_seconds),
-                },
-            )
-            if resp.status_code == HTTPStatus.OK:
-                if "Access-Token" in resp.json():
-                    self.jwt_token = resp.json()["Access-Token"]
-            else:
-                print(resp.text)
-                # resp.raise_for_status()
+        resp = self._request_http(
+            AppMeshClient.Method.POST,
+            path="/appmesh/login",
+            header={
+                "Username": base64.b64encode(user_name.encode()),
+                "Password": base64.b64encode(user_pwd.encode()),
+                "Expire-Seconds": self._parse_duration(timeout_seconds),
+            },
+        )
+        if resp.status_code == HTTPStatus.OK:
+            if "Access-Token" in resp.json():
+                self.jwt_token = resp.json()["Access-Token"]
+        else:
+            print(resp.text)
+            # resp.raise_for_status()
         return self.jwt_token
 
     def authentication(self, token: str, permission=None) -> bool:
@@ -359,19 +355,17 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         Returns:
             bool: authentication success or failure.
         """
-        if self.jwt_auth_enable:
-            self.jwt_token = token
-            headers = {}
-            if permission:
-                headers["Auth-Permission"] = permission
-            resp = self._request_http(AppMeshClient.Method.POST, path="/appmesh/auth", header=headers)
-            if resp.status_code == HTTPStatus.OK:
-                return True
-            else:
-                # resp.raise_for_status()
-                print(resp.text)
-                return False
-        return True
+        self.jwt_token = token
+        headers = {}
+        if permission:
+            headers["Auth-Permission"] = permission
+        resp = self._request_http(AppMeshClient.Method.POST, path="/appmesh/auth", header=headers)
+        if resp.status_code == HTTPStatus.OK:
+            return True
+        else:
+            # resp.raise_for_status()
+            print(resp.text)
+            return False
 
     ########################################
     # Application view
@@ -1140,17 +1134,14 @@ class AppMeshClientTCP(AppMeshClient):
     def __init__(
         self,
         tcp_address=("localhost", 6059),
-        auth_enable: bool = True,
     ):
         """Construct an App Mesh client TCP object
 
         Args:
             tcp_address (tuple, optional): TCP connect address.
-            auth_enable (bool, optional): server enabled JWT authentication or not.
         """
-        super().__init__(auth_enable=auth_enable)
+        super().__init__()
         self.tcp_address = tcp_address
-        self.jwt_auth_enable = auth_enable
         self.__socket_client = None
 
     def __del__(self) -> None:

{appmesh-0.5.7.dist-info → appmesh-0.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: appmesh
-Version: 0.5.7
+Version: 0.5.8
 Summary: Client SDK for App Mesh
 Home-page: https://github.com/laoshanxi/app-mesh
 Author: laoshanxi

appmesh-0.5.8.dist-info/RECORD

@@ -0,0 +1,6 @@
+appmesh/__init__.py,sha256=xRdXeFHEieRauuJZElbEBASgXG0ZzU1a5_0isAhM7Gw,11
+appmesh/appmesh_client.py,sha256=vFObuCjScy-TOJS1qv3t7shgIo6QfFlFMgxoeJDASVA,52277
+appmesh-0.5.8.dist-info/METADATA,sha256=l93m2CjKMA1TQJ6Xlhnn0rlZh1fQklIskgmNR2OtQDc,10746
+appmesh-0.5.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+appmesh-0.5.8.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-0.5.8.dist-info/RECORD,,

appmesh-0.5.7.dist-info/RECORD

@@ -1,6 +0,0 @@
-appmesh/__init__.py,sha256=xRdXeFHEieRauuJZElbEBASgXG0ZzU1a5_0isAhM7Gw,11
-appmesh/appmesh_client.py,sha256=i9HPt3w2t0MIcBjGOXFmlPPpdOkka_IxVgJk85aF9M4,52802
-appmesh-0.5.7.dist-info/METADATA,sha256=GuKmhKxUIp0-3ZpXb1yrIOKX8VdWj8nkWXHfmSGkiwk,10746
-appmesh-0.5.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-appmesh-0.5.7.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-0.5.7.dist-info/RECORD,,