add predefined_token
as an alternative to the randomly generated, which is also possible when no predefined_token is defined also update .env.example vars
This commit is contained in:
parent
11f4b647c2
commit
71f68e2d4b
19
.env.example
19
.env.example
|
@ -1,2 +1,21 @@
|
||||||
DOMAIN=localhost
|
DOMAIN=localhost
|
||||||
DEMO=false
|
DEMO=false
|
||||||
|
|
||||||
|
STATIC_ROOT=/tmp/static/
|
||||||
|
MEDIA_ROOT=/tmp/media/
|
||||||
|
ALLOWED_HOSTS=localhost,localhost:8000,127.0.0.1,
|
||||||
|
DOMAIN=localhost
|
||||||
|
DEBUG=True
|
||||||
|
EMAIL_HOST="mail.example.org"
|
||||||
|
EMAIL_HOST_USER="fillme_noreply"
|
||||||
|
EMAIL_HOST_PASSWORD="fillme_passwd"
|
||||||
|
EMAIL_PORT=587
|
||||||
|
EMAIL_USE_TLS=True
|
||||||
|
EMAIL_BACKEND="django.core.mail.backends.smtp.EmailBackend"
|
||||||
|
EMAIL_FILE_PATH="/tmp/app-messages"
|
||||||
|
ENABLE_EMAIL=false
|
||||||
|
COMMIT=$(git log --format="%H %ad" --date=iso -n 1)
|
||||||
|
PREDEFINED_TOKEN='5018dd65-9abd-4a62-8896-80f34ac66150'
|
||||||
|
# TODO review these vars
|
||||||
|
#SNAPSHOTS_DIR=/path/to/TODO
|
||||||
|
#EVIDENCES_DIR=/path/to/TODO
|
||||||
|
|
|
@ -7,6 +7,7 @@ services:
|
||||||
- DEBUG=true
|
- DEBUG=true
|
||||||
- DOMAIN=${DOMAIN:-localhost}
|
- DOMAIN=${DOMAIN:-localhost}
|
||||||
- DEMO=${DEMO:-n}
|
- DEMO=${DEMO:-n}
|
||||||
|
- PREDEFINED_TOKEN=${PREDEFINED_TOKEN:-}
|
||||||
volumes:
|
volumes:
|
||||||
- .:/opt/devicehub-django
|
- .:/opt/devicehub-django
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -25,9 +25,10 @@ deploy() {
|
||||||
INIT_USER="${INIT_USER:-user@example.org}"
|
INIT_USER="${INIT_USER:-user@example.org}"
|
||||||
INIT_PASSWD="${INIT_PASSWD:-1234}"
|
INIT_PASSWD="${INIT_PASSWD:-1234}"
|
||||||
ADMIN='True'
|
ADMIN='True'
|
||||||
|
PREDEFINED_TOKEN="${PREDEFINED_TOKEN:-}"
|
||||||
./manage.py add_institution "${INIT_ORG}"
|
./manage.py add_institution "${INIT_ORG}"
|
||||||
# TODO: one error on add_user, and you don't add user anymore
|
# TODO: one error on add_user, and you don't add user anymore
|
||||||
./manage.py add_user "${INIT_ORG}" "${INIT_USER}" "${INIT_PASSWD}" "${ADMIN}"
|
./manage.py add_user "${INIT_ORG}" "${INIT_USER}" "${INIT_PASSWD}" "${ADMIN}" "${PREDEFINED_TOKEN}"
|
||||||
|
|
||||||
if [ "${DEMO:-}" ]; then
|
if [ "${DEMO:-}" ]; then
|
||||||
./manage.py up_snapshots example/snapshots/ "${INIT_USER}"
|
./manage.py up_snapshots example/snapshots/ "${INIT_USER}"
|
||||||
|
|
|
@ -17,15 +17,17 @@ class Command(BaseCommand):
|
||||||
parser.add_argument('email', type=str, help='email')
|
parser.add_argument('email', type=str, help='email')
|
||||||
parser.add_argument('password', type=str, help='password')
|
parser.add_argument('password', type=str, help='password')
|
||||||
parser.add_argument('is_admin', nargs='?', default=False, type=str, help='is admin')
|
parser.add_argument('is_admin', nargs='?', default=False, type=str, help='is admin')
|
||||||
|
parser.add_argument('predefined_token', nargs='?', default='', type=str, help='predefined token')
|
||||||
|
|
||||||
def handle(self, *args, **kwargs):
|
def handle(self, *args, **kwargs):
|
||||||
email = kwargs['email']
|
email = kwargs['email']
|
||||||
password = kwargs['password']
|
password = kwargs['password']
|
||||||
is_admin = kwargs['is_admin']
|
is_admin = kwargs['is_admin']
|
||||||
|
predefined_token = kwargs['predefined_token']
|
||||||
institution = Institution.objects.get(name=kwargs['institution'])
|
institution = Institution.objects.get(name=kwargs['institution'])
|
||||||
self.create_user(institution, email, password, is_admin)
|
self.create_user(institution, email, password, is_admin, predefined_token)
|
||||||
|
|
||||||
def create_user(self, institution, email, password, is_admin):
|
def create_user(self, institution, email, password, is_admin, predefined_token):
|
||||||
self.u = User.objects.create(
|
self.u = User.objects.create(
|
||||||
institution=institution,
|
institution=institution,
|
||||||
email=email,
|
email=email,
|
||||||
|
@ -34,6 +36,10 @@ class Command(BaseCommand):
|
||||||
)
|
)
|
||||||
self.u.set_password(password)
|
self.u.set_password(password)
|
||||||
self.u.save()
|
self.u.save()
|
||||||
|
if predefined_token:
|
||||||
|
token = predefined_token
|
||||||
|
else:
|
||||||
token = uuid4()
|
token = uuid4()
|
||||||
|
|
||||||
Token.objects.create(token=token, owner=self.u)
|
Token.objects.create(token=token, owner=self.u)
|
||||||
print(f"TOKEN: {token}")
|
print(f"TOKEN: {token}")
|
||||||
|
|
Loading…
Reference in New Issue