|
38 | 38 | def _raise_error(res, op): |
39 | 39 | if res["code"] not in succ_code: |
40 | 40 | if "error" in res: |
41 | | - raise RuntimeError("%s failed: %s" % (op, res["error"]["msg"])) |
| 41 | + if isinstance(res["error"], str): |
| 42 | + raise RuntimeError("%s failed: %s" % (op, res["error"])) |
| 43 | + else: |
| 44 | + raise RuntimeError("%s failed: %s" % (op, res["error"]["msg"])) |
42 | 45 | elif "message" in res: |
43 | 46 | raise RuntimeError("%s failed: %s" % (op, res["message"])) |
44 | 47 | else: |
@@ -311,10 +314,17 @@ def get_token(self, retry=1): |
311 | 314 | "projectId": self.project_id, |
312 | 315 | } |
313 | 316 | if self.access_key is not None: |
314 | | - url = self.openapi_url + "/openapi/v1/storage/token" |
315 | | - headers = {"x-app-key": self.app_key} |
316 | | - params["accessKey"] = self.access_key |
317 | | - elif self.ticket is not None: |
| 317 | + rsp = requests.get( |
| 318 | + self.openapi_url + "/openapi/v1/ticket/get", |
| 319 | + headers={"x-app-key": self.app_key}, |
| 320 | + params={"accessKey": self.access_key} |
| 321 | + ) |
| 322 | + res = json.loads(rsp.text) |
| 323 | + _raise_error(res, "get ticket") |
| 324 | + self.ticket = res["data"]["ticket"] |
| 325 | + config["ticket"] = res["data"]["ticket"] |
| 326 | + |
| 327 | + if self.ticket is not None: |
318 | 328 | headers["Brm-Ticket"] = config["ticket"] |
319 | 329 | update_headers() |
320 | 330 | else: |
|
0 commit comments