ereuse
/
IdHub
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release' of gitea.pangea.org:trustchain-oc1-orchestral/IdHub into release

This commit is contained in:
Cayo Puigdefabregas 2024-03-06 19:46:34 +01:00
parent 67c804d640 e95ebebdfa
commit f5df945d32
8 changed files with 74 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/organizations__instance_autotest-pair.csv
View File

@ -1,2 +1,2 @@
"autotest idhub1";"https://idhub1-autotest.demo.pangea.org/oidc4vp/"
"autotest idhub2";"https://idhub2-autotest.demo.pangea.org/oidc4vp/"
"autotest idhub1";"https://idhub1-autotest.demo.pangea.org/oidc4vp/";"idhub1-autotest.demo.pangea.org"
"autotest idhub2";"https://idhub2-autotest.demo.pangea.org/oidc4vp/";"idhub2-autotest.demo.pangea.org"

1 autotest idhub1 https://idhub1-autotest.demo.pangea.org/oidc4vp/ idhub1-autotest.demo.pangea.org
2 autotest idhub2 https://idhub2-autotest.demo.pangea.org/oidc4vp/ idhub2-autotest.demo.pangea.org

2
examples/organizations__instance_nightly-pair.csv Normal file
View File

@ -0,0 +1,2 @@
"nightly idhub1";"https://idhub1-nightly.demo.pangea.org/oidc4vp/";"idhub1-nightly.demo.pangea.org"
"nightly idhub2";"https://idhub2-nightly.demo.pangea.org/oidc4vp/";"idhub2-nightly.demo.pangea.org"
1 nightly idhub1 https://idhub1-nightly.demo.pangea.org/oidc4vp/ idhub1-nightly.demo.pangea.org
2 nightly idhub2 https://idhub2-nightly.demo.pangea.org/oidc4vp/ idhub2-nightly.demo.pangea.org

3
idhub/mixins.py
View File

@ -75,7 +75,8 @@ class UserView(LoginRequiredMixin):
'path': resolve(self.request.path).url_name,
'user': self.request.user,
'wallet': self.wallet,
'admin_validated': True if self.admin_validated else False
'admin_validated': True if self.admin_validated else False,
'commit_id': settings.COMMIT,
})
return context

17
idhub/templates/auth/login_base.html
View File

@ -82,6 +82,16 @@
<!--/#login-content-->
</div><!-- /#login-wrapper -->
</div><!-- /.jumbotron -->
<div class="container mt-5">
<div class="row">
<div class="col-sm">
</div>
<div class="text-center col-sm">
</div>
<div class="col-sm">
</div>
</div>
</div>
<!-- Modal -->
<div class="modal fade" id="forgotPasswordModal" tabindex="-1" role="dialog" aria-labelledby="forgotPasswordModalLabel" aria-hidden="true">
@ -106,6 +116,13 @@
</div>
</div>
<!-- Footer -->
<footer class="footer text-center">
<div class="container">
<span class="text-muted">{{ commit_id }}</span>
</div>
</footer>
<script src="/static/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/feather-icons@4.28.0/dist/feather.min.js" integrity="sha384-uO3SXW5IuS1ZpFPKugNNWqTZRRglnUJK6UAZ/gxOX80nxEkN9NcGZTftn6RzhGWE" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/chart.js@2.9.4/dist/Chart.min.js" integrity="sha384-zNy6FEbO50N+Cg5wap8IKA4M/ZnLJgzc6w2NqACZaK0u0FXfOWRRJOnQtpZun8ha" crossorigin="anonymous"></script>

23
idhub/templates/idhub/base.html
View File

@ -33,6 +33,22 @@
font-size: 3.5rem;
}
}
html, body {
height: 100%;
}
body {
display: flex;
flex-direction: column;
}
.main-content {
flex-grow: 1;
}
footer {
width: 100%;
}
</style>
@ -150,6 +166,13 @@
</div>
</div>
<!-- Footer -->
<footer class="footer text-center mt-auto py-3">
<div class="container">
<span class="text-muted">{{ commit_id }}</span>
</div>
</footer>
{% block script %}
<script src="{% static "js/jquery-3.3.1.slim.min.js" %}"></script>
<script src="/static/js/bootstrap.bundle.min.js"></script>

23
idhub/templates/idhub/base_admin.html
View File

@ -33,6 +33,22 @@
font-size: 3.5rem;
}
}
html, body {
height: 100%;
}
body {
display: flex;
flex-direction: column;
}
.main-content {
flex-grow: 1;
}
footer {
width: 100%;
}
</style>
@ -180,6 +196,13 @@
</div>
</div>
<!-- Footer -->
<footer class="footer text-center mt-auto py-3">
<div class="container">
<span class="text-muted">{{ commit_id }}</span>
</div>
</footer>
{% block script %}
<script src="{% static "js/jquery-3.3.1.slim.min.js" %}"></script>
<script src="{% static "js/popper.min.js" %}"></script>

1
idhub/views.py
View File

@ -27,6 +27,7 @@ class LoginView(auth_views.LoginView):
extra_context = {
'title': _('Login'),
'success_url': reverse_lazy('idhub:user_dashboard'),
'commit_id': settings.COMMIT,
}
def get(self, request, *args, **kwargs):

5
trustchain_idhub/settings.py
View File

@ -34,6 +34,8 @@ DEBUG = config('DEBUG', default=False, cast=bool)
DOMAIN = config("DOMAIN")
assert DOMAIN not in [None, ''], "DOMAIN var is MANDATORY"
# this var is very important, we print it
print("DOMAIN: " + DOMAIN)
ALLOWED_HOSTS = config('ALLOWED_HOSTS', default=DOMAIN, cast=Csv())
assert DOMAIN in ALLOWED_HOSTS, "DOMAIN is not ALLOWED_HOST"
@ -207,7 +209,7 @@ AUTH_USER_MODEL = 'idhub_auth.User'
OIDC_REDIRECT = config('OIDC_REDIRECT', default=False, cast=bool)
ALLOW_CODE_URI = config(
'ALLOW_CODE_URI',
default=f"https://{DOMAIN}/allow_code"
default=f"https://{DOMAIN}/oidc4vp/allow_code"
)
SUPPORTED_CREDENTIALS = config(
@ -233,4 +235,5 @@ OIDC_ORGS = config('OIDC_ORGS', '')
ENABLE_EMAIL = config('ENABLE_EMAIL', default=True, cast=bool)
CREATE_TEST_USERS = config('CREATE_TEST_USERS', default=False, cast=bool)
ENABLE_2FACTOR_AUTH = config('ENABLE_2FACTOR_AUTH', default=True, cast=bool)
COMMIT = config('COMMIT', default='')