Browse Source

* ADMIN_USERNAME is now used when setting initial API Key

pull/32/head
Per-Arne Andersen 4 years ago
parent
commit
ca37626976
  1. 5
      docker/push.sh
  2. 4
      wg_dashboard_backend/db/api_key.py
  3. 2
      wg_dashboard_backend/main.py

5
docker/push.sh

@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
cd ..
docker login docker login
docker build -t perara/wg-manager . docker build -t perara/wg-manager:dev .
docker push perara/wg-manager docker push perara/wg-manager:dev

4
wg_dashboard_backend/db/api_key.py

@ -3,10 +3,10 @@ from sqlalchemy.orm import Session
import models 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)\ db_user = sess.query(models.User)\
.filter_by(username="admin")\ .filter_by(username=ADMIN_USERNAME)\
.one() .one()
exists_api_key = sess.query(models.UserAPIKey)\ exists_api_key = sess.query(models.UserAPIKey)\

2
wg_dashboard_backend/main.py

@ -89,7 +89,7 @@ if const.SERVER_INIT_INTERFACE is not None:
db.wireguard.server_add_on_init(_db) db.wireguard.server_add_on_init(_db)
if const.SERVER_STARTUP_API_KEY is not None: 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() _db.close()

Loading…
Cancel
Save