diff --git a/.gitignore b/.gitignore index b4d5ca9..03d7d49 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ click/ swagger_client/ tmp/ .idea/ -.idea/ \ No newline at end of file +.idea/ +.mypy_cache/ \ No newline at end of file diff --git a/Makefile b/Makefile index b4e4ffd..824e6f1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -GITEA_URL=https://git.vakabus.cz/swagger.v1.json +GITEA_URL=https://try.gitea.io/swagger.v1.json BUILDDIR=tmp build: swagger_client clean_builddir pipenv_sync diff --git a/Pipfile b/Pipfile index 49df204..2a0a5d4 100644 --- a/Pipfile +++ b/Pipfile @@ -15,4 +15,4 @@ secrets = "*" python2-secrets = "*" [requires] -python_version = "3.5" +python_version = "3" diff --git a/README.md b/README.md index 1f31008..5cd7614 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Spustí se prostým zavoláním `make` ## Spousteni -Vyzaduje nejmene Pythonu 3.5 +Vyzaduje presne Python 3.5 ```sh pipenv run python register.py --help diff --git a/config.py b/config.py index 1752544..070b55d 100644 --- a/config.py +++ b/config.py @@ -1,2 +1,3 @@ -# Odkomentovanim radku nize je mozne nastavit vychozi server Gitei -# HOST = 'https://gitea.url/api/v1' +# Zde je mozne nastavit vychozi hodnoty +HOST = 'https://gitea.url/api/v1' +ADMIN_TOKEN = '' diff --git a/register.py b/register.py index 5018a65..b098e2f 100644 --- a/register.py +++ b/register.py @@ -119,15 +119,9 @@ def reset_password(email: str): raise ApiException(status=resp.status_code, reason=resp.reason, http_resp='Form submission failed.') -if __name__ == '__main__': - # default configuration - HOST = "https://git.vakabus.cz/api/v1" - try: - with open('config.py') as f: - conf = f.read() - exec(conf) - except Exception: - print(text_orange('Nepodarilo se nacist konfiguraci ze souboru \'config.py\'')) +import config +HOST = config.HOST +ADMIN_TOKEN = config.ADMIN_TOKEN @click.command() @@ -144,12 +138,14 @@ def register(username: str, seminar: str, fullname: str, email: str, host, admin Prvni probehne kontrola stavu systemu, zda je mozne uzivatele bezpecne zalozit. Pote se provede pokus o zalozeni nasledovan pridanim uzivatele do skupiny 'org' v pozadovane organizaci (jmeno dle seminare). - Vytvoreny uzivatel ma nastavene nahodne heslo. Zadny email o vytvoreni uctu neni zaslan. + Vytvoreny uzivatel ma nastavene nahodne heslo. To je automaticky resetovano a o tom je odeslan email. + + V souboru config.py je mozne nastavit token a URL perzistentne. """ api_client = ApiClient() - api_client.configuration.host = HOST - api_client.configuration.api_key = {'token': admin_token} + api_client.configuration.host = host if host is not None else HOST + api_client.configuration.api_key = {'token': admin_token if admin_token is not None else ADMIN_TOKEN} admin_api = AdminApi(api_client) user_api = UserApi(api_client)