diff --git a/requirements.txt b/requirements.txt index cb5bdef..0862f0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ aiohttp PyNaCl~=1.4.0 -v6d0auth[full] @ git+https://gitea.parrrate.ru/PTV/v6d0auth.git@324236f435c92756aefe22877a97a906c462ef2c +v6d0auth[full] @ git+https://gitea.parrrate.ru/PTV/v6d0auth.git@c718d4d1422945a756213d22d9e26aa24babe0f6 diff --git a/setup.py b/setup.py index 5f93aeb..df8650a 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( ], extras_require={ 'full': [ - 'v6d0auth[full] @ git+https://gitea.parrrate.ru/PTV/v6d0auth.git@324236f435c92756aefe22877a97a906c462ef2c', + 'v6d0auth[full] @ git+https://gitea.parrrate.ru/PTV/v6d0auth.git@c718d4d1422945a756213d22d9e26aa24babe0f6', ], }, ) diff --git a/v6d1tokens/app.py b/v6d1tokens/app.py index 2e7a032..b8de974 100644 --- a/v6d1tokens/app.py +++ b/v6d1tokens/app.py @@ -5,11 +5,11 @@ from nacl.exceptions import BadSignatureError from nacl.public import PublicKey from nacl.signing import VerifyKey from nacl.utils import random -from v6d0auth import certs -from v6d0auth.appfactory import AppFactory -from v6d0auth.client import has_role -from v6d1tokens.tdb import TDB +from v6d0auth import certs +from v6d0auth.appfactory import * +from v6d0auth.client import * +from v6d1tokens.tdb import * __all__ = ('V6D1TokensAppFactory',) diff --git a/v6d1tokens/client.py b/v6d1tokens/client.py index cc6b186..ddd52e0 100644 --- a/v6d1tokens/client.py +++ b/v6d1tokens/client.py @@ -2,9 +2,9 @@ import json from typing import Optional import aiohttp -from v6d0auth import certs -from v6d0auth.client import mycert, with_role +from v6d0auth import certs +from v6d0auth.client import * from v6d1tokens.config import taurl __all__ = ('request_token',) diff --git a/v6d1tokens/config.py b/v6d1tokens/config.py index 99b5a57..771a262 100644 --- a/v6d1tokens/config.py +++ b/v6d1tokens/config.py @@ -1,6 +1,6 @@ import os -from v6d0auth.config import root, port +from v6d0auth.config import port, root __all__ = ('myroot', 'taurl',) diff --git a/v6d1tokens/reg-token.py b/v6d1tokens/reg-token.py index 8ca75f3..18fbbad 100644 --- a/v6d1tokens/reg-token.py +++ b/v6d1tokens/reg-token.py @@ -2,13 +2,13 @@ import asyncio import json import aiohttp + from v6d0auth import certs from v6d0auth.config import host, port async def main(): async with aiohttp.ClientSession() as session: - # noinspection HttpUrlsUsage async with session.ws_connect(f'http://{host}:{port}/reg') as ws: nonce = await ws.receive_bytes() await ws.send_bytes(certs.sign(json.dumps([[input('token_id:'), input('token:')], nonce.hex()]).encode())) diff --git a/v6d1tokens/run-server.py b/v6d1tokens/run-server.py index 7447921..35307cb 100644 --- a/v6d1tokens/run-server.py +++ b/v6d1tokens/run-server.py @@ -1,9 +1,8 @@ import asyncio -from v6d0auth.run_app import run_app - -from v6d1tokens.app import V6D1TokensAppFactory -from v6d1tokens.tdb import TDB +from v6d0auth.run_app import * +from v6d1tokens.app import * +from v6d1tokens.tdb import * async def main(): diff --git a/v6d1tokens/tdb.py b/v6d1tokens/tdb.py index 5812c1f..1919e9f 100644 --- a/v6d1tokens/tdb.py +++ b/v6d1tokens/tdb.py @@ -1,8 +1,8 @@ from typing import Optional from nacl.public import PublicKey, SealedBox -from ptvp35 import Db, KVJson +from ptvp35 import * from v6d1tokens.config import myroot __all__ = ('TDB',) diff --git a/v6d1tokens/test-request.py b/v6d1tokens/test-request.py index d944742..649e9fd 100644 --- a/v6d1tokens/test-request.py +++ b/v6d1tokens/test-request.py @@ -1,6 +1,6 @@ import asyncio -from v6d1tokens.client import request_token +from v6d1tokens.client import * async def main():