From ca376269762483b835605b8685c640b0d108b423 Mon Sep 17 00:00:00 2001 From: Per-Arne Andersen Date: Mon, 27 Jul 2020 22:18:19 +0200 Subject: [PATCH] * ADMIN_USERNAME is now used when setting initial API Key --- docker/push.sh | 5 +++-- wg_dashboard_backend/db/api_key.py | 4 ++-- wg_dashboard_backend/main.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/push.sh b/docker/push.sh index 589d2c0..91bd4e6 100644 --- a/docker/push.sh +++ b/docker/push.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash +cd .. docker login -docker build -t perara/wg-manager . -docker push perara/wg-manager +docker build -t perara/wg-manager:dev . +docker push perara/wg-manager:dev diff --git a/wg_dashboard_backend/db/api_key.py b/wg_dashboard_backend/db/api_key.py index 898a4dc..6d16105 100644 --- a/wg_dashboard_backend/db/api_key.py +++ b/wg_dashboard_backend/db/api_key.py @@ -3,10 +3,10 @@ from sqlalchemy.orm import Session import models -def add_initial_api_key_for_admin(sess: Session, api_key): +def add_initial_api_key_for_admin(sess: Session, api_key, ADMIN_USERNAME): db_user = sess.query(models.User)\ - .filter_by(username="admin")\ + .filter_by(username=ADMIN_USERNAME)\ .one() exists_api_key = sess.query(models.UserAPIKey)\ diff --git a/wg_dashboard_backend/main.py b/wg_dashboard_backend/main.py index f9d9a59..f2fe03a 100644 --- a/wg_dashboard_backend/main.py +++ b/wg_dashboard_backend/main.py @@ -89,7 +89,7 @@ if const.SERVER_INIT_INTERFACE is not None: db.wireguard.server_add_on_init(_db) if const.SERVER_STARTUP_API_KEY is not None: - db.api_key.add_initial_api_key_for_admin(_db, const.SERVER_STARTUP_API_KEY) + db.api_key.add_initial_api_key_for_admin(_db, const.SERVER_STARTUP_API_KEY, ADMIN_USERNAME=ADMIN_USERNAME) _db.close()