Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: qrcode loaded by client #98

Merged
merged 24 commits into from
Dec 19, 2023
Merged

feat: qrcode loaded by client #98

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
aafde36
new discovery and error page based on bootstrap-itali v2.6.1
MdreW Sep 1, 2023
8d77140
added id and class for errors
MdreW Sep 1, 2023
b228c15
chore: added dependency for django theme
Gartic99 Nov 13, 2023
e035a1c
Fix: remove of non existing field of user
Gartic99 Nov 13, 2023
b29f338
feat: implemented Django template for the example sp
Gartic99 Nov 13, 2023
6d88020
chore: created static folder with static files
Gartic99 Nov 14, 2023
2c732b7
fix: adding missing STATIC_ROOT
Gartic99 Nov 14, 2023
49caab0
fix: using {% static %} for static resources
Gartic99 Nov 14, 2023
9032c05
fix: removed unused code
Gartic99 Nov 14, 2023
5ca843b
Update example_sp/djangosaml2_sp/saml2_sp/views.py
Gartic99 Nov 14, 2023
d11bae2
Update example_sp/djangosaml2_sp/saml2_sp/views.py
Gartic99 Nov 14, 2023
c88f881
feat: dropdown for profile
Gartic99 Nov 18, 2023
b0016e1
Merge branch 'italia:eudi' into eudi
Gartic99 Nov 18, 2023
c6ed2c1
feat: dropdown for profile
Gartic99 Nov 18, 2023
e4f57de
Merge branch 'eudi' of github.com:Gartic99/Satosa-Saml2Spid into eudi
Gartic99 Nov 18, 2023
40b7d2a
fix: resolved merge conflicts
Gartic99 Nov 20, 2023
c97e1f5
Merge branch 'bootstrap-italia-v2' of github.com:italia/Satosa-Saml2S…
Gartic99 Nov 24, 2023
984ec83
chore: removed comments on disco.html file
Gartic99 Nov 27, 2023
7eaf526
feat: improved echo_attributes page
Gartic99 Nov 27, 2023
f4b778e
Merge branch 'eudi' of github.com:Gartic99/Satosa-Saml2Spid into eudi
Gartic99 Dec 6, 2023
38e89fb
feat: qrcode loaded by js library
Gartic99 Dec 18, 2023
3e85c91
Merge branch 'eudi' of github.com:Gartic99/Satosa-Saml2Spid into eudi
Gartic99 Dec 18, 2023
bed1573
fix: qrcode_color set by parameter
Gartic99 Dec 18, 2023
49e0898
Merge branch 'eudi' into eudi
Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Docker-compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ services:
satosa-saml2spid:
#image: ghcr.io/italia/satosa-saml2spid:latest
image: satosa-saml2spid:latest
build: ../
container_name: satosa-saml2spid
depends_on:
- satosa-mongo
Expand Down
1 change: 0 additions & 1 deletion Docker-compose/nginx/nginx.conf_uwsgi_pass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ server {
# deny iFrame
add_header X-Frame-Options "DENY";

add_header X-Frame-Options DENY;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;
Expand Down
45 changes: 13 additions & 32 deletions example/static/disco.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- ita-buyyon CSS -->
<link href="css/ita.min.css" rel="stylesheet">
<link href="css/ita-font.min.css" rel="stylesheet">
</head>
</head>
<body>
<!-- Container - Body of page-->
<div class="main-body">
Expand All @@ -37,18 +37,17 @@ <h3>IT Wallet</h3>
<br>
<div class="row">
<div class="col-lg-12 text-center button-container column-buttons">
<!-- IT Wallet IDP BUTTON SMALL "ENTRA CON WALLET ID" * begin * -->
<a href="https://localhost/Saml2/disco?entityID=wallet"
<!--IT Wallet IDP BUTTON SMALL "ENTRA CON WALLET ID" * begin *-->
<a href="https://localhost/Saml2/disco?entityID=wallet"
class="btn btn-primary btn-lg btn-me w-100"
eidas-idp-button="#eidas-idp-button-xlarge-post"
aria-haspopup="false"
aria-expanded="false"
style="font-size: 21px;"
onclick="loadIframe(this.href); return false;">
style="font-size: 21px;" >
<span><img class="icon buttonicon" src="/static/wallet-it/wallet_icon.svg" alt="Logo IT Wallet" /></span>
<span>Accedi con IT Wallet</span>
</a>
<!-- IT Wallet IDP BUTTON SMALL "ENTRA CON WALLET ID" * end * -->
<!--IT Wallet IDP BUTTON SMALL "ENTRA CON WALLET ID" * end *-->
</div>
</div>
<div class="row">
Expand Down Expand Up @@ -126,33 +125,12 @@ <h3>Altre identità digitali</h3>
</div>
</div>
</div>

<div id="iframeContainer">
<div id="innerBox">
<button id="closeButton">
<svg viewBox="0 0 24 24" width="24" height="24">
<path d="M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12z"></path>
</svg>
</button>
<div id="inneriframeContainer"></div>
<!-- iframe goes here -->
<div id="theModal" class="modal fade text-center">
<div class="modal-dialog">
<div class="modal-content">
</div>
</div>
</div>

<script>
function loadIframe(url) {
var iframe = document.createElement('iframe');
iframe.src = url;
document.getElementById('inneriframeContainer').appendChild(iframe);
document.getElementById('iframeContainer').style.display = 'block';
}

document.getElementById('closeButton').addEventListener('click', function() {
var inneriframeContainer = document.getElementById('inneriframeContainer');
inneriframeContainer.innerHTML = '';
iframeContainer.style.display = 'none';
});
</script>
<!-- Footer -->
<!-- <footer class="it-footer">
<div class="it-footer-main">
Expand Down Expand Up @@ -299,6 +277,9 @@ <h3 class="sr-only">Sezione Link Utili</h3>
<script src="js/ita.min.js"></script>
<script src="js/bootstrap-italia.bundle.min.js"></script>

<script>var spid_idps = new Ita;</script>
<script>
var spid_idps = new Ita;
</script>

</body>
</html>
Loading
Loading