From 738ce4a17131d766b37cf6718458c7af4e24c857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Thu, 3 Oct 2024 21:25:42 +0200 Subject: [PATCH 01/20] Ajout du bouton ProConnect officiel --- src/app.postcss | 26 +++++++++++++++++ .../components/specialized/pc-button.svelte | 28 +++++++++++++++++++ src/routes/auth/connexion/+page.svelte | 2 ++ 3 files changed, 56 insertions(+) create mode 100644 src/lib/components/specialized/pc-button.svelte diff --git a/src/app.postcss b/src/app.postcss index 04ab6d82b..782387a9e 100644 --- a/src/app.postcss +++ b/src/app.postcss @@ -172,4 +172,30 @@ @page { size: 26.25cm 37.125cm; /* A4 * 1.25, afin de réduire la taille de l'impression */ } + + proconnect-sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border-width: 0; + } + + .proconnect-button { + background-color: transparent !important; + background-image: url("data:image/svg+xml;base64,<svg xmlns='http://www.w3.org/2000/svg' width='211' height='58' fill='none'><path fill='#000091' d='M0 0h211v58H0z'/><path fill='#fff' d='m69.986 26.368 1.156-1.071c.833 1.054 1.819 1.598 2.941 1.598 1.292 0 2.04-.816 2.04-1.904 0-2.55-5.627-2.244-5.627-6.035 0-1.734 1.428-3.196 3.451-3.196 1.683 0 2.907.765 3.791 1.938l-1.19 1.037c-.697-1.003-1.547-1.547-2.584-1.547-1.105 0-1.836.748-1.836 1.734 0 2.567 5.627 2.244 5.627 6.052 0 2.023-1.581 3.349-3.655 3.349-1.768 0-3.077-.663-4.114-1.955Zm10.817-5.712H79.46l1.445-4.556h1.649l-1.751 4.556Zm4.818-3.451c-.56 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM84.891 28v-8.568h1.444V28H84.89Zm3.767-4.284c0-2.499 1.717-4.624 4.403-4.624 1.241 0 2.261.459 3.043 1.292V15.25h1.445V28h-1.445v-.952c-.782.833-1.802 1.292-3.043 1.292-2.686 0-4.403-2.125-4.403-4.624Zm1.53 0c0 1.819 1.224 3.264 3.043 3.264 1.19 0 2.21-.578 2.873-1.598V22.05c-.68-1.037-1.7-1.598-2.873-1.598-1.819 0-3.043 1.445-3.043 3.264Zm18.023 2.873c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM110.473 28v-8.568h1.445v.969c.697-.765 1.581-1.309 2.856-1.309 1.921 0 3.349 1.292 3.349 3.723V28h-1.462v-5.134c0-1.53-.85-2.414-2.176-2.414-1.241 0-2.023.714-2.567 1.615V28h-1.445Zm11.052-2.873v-4.369h-1.615v-1.326h1.615V17.29h1.462v2.142h2.975v1.326h-2.975v4.369c0 1.343.68 1.717 1.717 1.717.561 0 .952-.068 1.275-.204v1.292c-.408.17-.867.238-1.479.238-1.904 0-2.975-.952-2.975-3.043Zm7.377-7.922c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM128.171 28v-8.568h1.445V28h-1.445Zm3.377-8.568h1.615v-1.054c0-1.836 1.207-3.128 3.043-3.128.952 0 1.7.34 2.21.833l-.901 1.054a1.633 1.633 0 0 0-1.292-.578c-.935 0-1.598.68-1.598 1.785v1.088h2.975v1.326h-2.975V28h-1.462v-7.242h-1.615v-1.326Zm8.543-2.227c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM139.36 28v-8.568h1.445V28h-1.445Zm12.115-1.411c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM153.737 28v-8.568h1.445v1.071c.629-.748 1.411-1.241 2.499-1.241.272 0 .527.034.731.102v1.496a3.105 3.105 0 0 0-.85-.119c-1.122 0-1.853.578-2.38 1.445V28h-1.445Zm13.685.34c-1.683 0-2.822-.952-2.822-2.448 0-1.326.986-2.278 2.822-2.567l2.873-.476v-.595c0-1.19-.85-1.87-2.057-1.87-1.003 0-1.836.442-2.329 1.19l-1.088-.833c.748-1.02 1.955-1.649 3.451-1.649 2.176 0 3.468 1.275 3.468 3.162V28h-1.445v-1.088c-.646.901-1.717 1.428-2.873 1.428Zm-1.377-2.499c0 .731.629 1.292 1.615 1.292 1.139 0 2.04-.595 2.635-1.581V23.92l-2.533.442c-1.19.187-1.717.731-1.717 1.479Zm7.252-6.409h1.564l2.737 7.055 2.737-7.055h1.564L178.55 28h-1.904l-3.349-8.568Zm17.856 7.157c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261Zm10.185 6.647c1.054 0 1.904-.51 2.431-1.275l1.156.884c-.799 1.071-2.04 1.751-3.604 1.751-2.839 0-4.658-2.125-4.658-4.624 0-2.499 1.819-4.624 4.658-4.624 1.547 0 2.805.697 3.604 1.751l-1.156.884a2.925 2.925 0 0 0-2.448-1.275c-1.836 0-3.145 1.445-3.145 3.264 0 1.836 1.309 3.264 3.162 3.264ZM70.854 45V32.4h4.158c2.772 0 4.464 1.422 4.464 3.762 0 2.322-1.692 3.744-4.464 3.744H73.41V45h-2.556Zm4.266-10.422h-1.71v3.15h1.71c1.08 0 1.728-.576 1.728-1.602 0-.954-.648-1.548-1.728-1.548ZM81.249 45v-9.072h2.286v.9c.594-.612 1.368-1.08 2.394-1.08.306 0 .576.054.792.126v2.394a3.938 3.938 0 0 0-1.008-.126c-1.116 0-1.836.612-2.178 1.17V45h-2.286Zm11.386-9.432c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm13.172-.234c1.44 0 2.574-.702 3.294-1.728l2.016 1.548c-1.152 1.566-3.024 2.574-5.31 2.574-3.978 0-6.696-3.06-6.696-6.66s2.718-6.66 6.696-6.66c2.286 0 4.158 1.026 5.31 2.556l-2.016 1.566c-.72-1.026-1.854-1.728-3.294-1.728-2.376 0-4.068 1.854-4.068 4.266s1.692 4.266 4.068 4.266Zm11.366-7.398c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm7.018 1.8v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm11.091 0v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm19.444-1.476c-.846 1.134-2.25 1.836-3.96 1.836-3.222 0-5.04-2.25-5.04-4.896 0-2.682 1.692-4.896 4.662-4.896 2.52 0 4.176 1.692 4.176 4.068 0 .504-.072.99-.144 1.296h-6.354c.144 1.494 1.188 2.376 2.736 2.376.99 0 1.8-.432 2.286-1.08l1.638 1.296Zm-4.338-6.048c-1.116 0-1.872.54-2.178 1.728h4.086c-.036-.9-.702-1.728-1.908-1.728Zm10.696 5.724c.882 0 1.584-.432 2.016-1.062l1.818 1.386c-.846 1.116-2.178 1.836-3.834 1.836-3.132 0-5.004-2.25-5.004-4.896s1.872-4.896 5.004-4.896c1.656 0 2.988.72 3.834 1.836l-1.818 1.386c-.432-.63-1.116-1.062-2.052-1.062-1.494 0-2.592 1.152-2.592 2.736 0 1.602 1.098 2.736 2.628 2.736Zm6.204-1.512v-3.672h-1.692v-2.088h1.692V33.66h2.304v2.268h2.772v2.088h-2.772v3.672c0 1.008.54 1.404 1.44 1.404.63 0 1.044-.072 1.35-.198v1.998c-.45.198-.99.288-1.746.288-2.268 0-3.348-1.278-3.348-3.492Z'/><path fill='#000091' d='M46.992 19.098 31.998 10.42l-14.994 8.76a.606.606 0 0 0-.306.525v16.948a.666.666 0 0 0 .306.524l14.992 8.6 14.994-8.706a.666.666 0 0 0 .306-.524V19.626a.604.604 0 0 0-.304-.528Z'/><path fill='#FCC63A' d='m26.641 19.598-5.029 8.628-4.557-9.175 5.39-3.113 4.489 3.16-.293.5Zm20.656 16.98V19.62a.6.6 0 0 0-.306-.523L31.998 10.42'/><path fill='#0063CB' d='M16.7 36.578 32 10.42v35.362l-14.996-8.605a.665.665 0 0 1-.306-.524V19.706l.002 16.872Zm24.669-20.735 5.458 3.155-4.489 9.15-5.387-9.236 4.418-3.07Z'/><path fill='#fff' d='m51.606 16.303-19.19-11.02a.933.933 0 0 0-.832 0l-19.19 11.02a.887.887 0 0 0-.394.695v22a.885.885 0 0 0 .394.7l19.189 11.02a.932.932 0 0 0 .832 0l19.191-11.02a.886.886 0 0 0 .394-.7v-22a.887.887 0 0 0-.394-.695ZM22.789 34.059h.079c-.042 0-.079.007-.079.05 0 .1.151 0 .2.1a.912.912 0 0 0-.629.276c0 .05.1.05.151.05-.075.1-.226.05-.277.152a.176.176 0 0 0 .1.05c-.05 0-.1 0-.1.05v.152c-.126 0-.176.1-.277.15.2.152.327 0 .528 0-.528.2-.956.479-1.484.63-.1 0 0 .15-.1.15.151.1.227-.05.377-.05-.654.378-1.333.7-2.037 1.133a.351.351 0 0 0-.1.2h-.2c-.1.05-.05.176-.151.277.226.15.5-.2.654 0 .05 0-.1.05-.2.05-.05 0-.05.1-.1.1h-.154c-.1.075-.2.126-.2.276a.22.22 0 0 0-.226.1 9.031 9.031 0 0 0 3.144-.578 7.683 7.683 0 0 0 2.088-1.56.176.176 0 0 1 .05.1c-.147.437-.43.816-.806 1.08-.277.152-.478.378-.7.479a4.057 4.057 0 0 0-.428.276c-.632.197-1.281.335-1.939.412l-.305.044c-.225.033-.449.069-.671.108l-1.993-1.138a.647.647 0 0 1-.288-.411.57.57 0 0 0 .094-.063.266.266 0 0 0-.113-.071v-.65a12.782 12.782 0 0 0 3.038-.942 8.746 8.746 0 0 0-3.037-1.343v-1.515a11.67 11.67 0 0 1 1.639.392 6.42 6.42 0 0 1 1.182.578c.147.14.307.267.478.377a.91.91 0 0 0 .8.05h.33a3.961 3.961 0 0 0 1.937-.905c0 .05.05.05.1.05a3.629 3.629 0 0 1-.428 1.132c.003.05-.048.152.053.202Zm2.817 3.57c.251-.1.4-.276.629-.376-.05.05-.05.15-.1.2a3.699 3.699 0 0 0-.528.4 15.965 15.965 0 0 0-1.585 1.61c-.252.3-.528.578-.8.855-.096.09-.2.172-.31.245l-2.527-1.45c.36.03.721.013 1.076-.053.294-.083.58-.192.855-.327v.1c.7-.277 1.232-.906 1.937-1.132.025 0 .126.1.226.05a1.883 1.883 0 0 1 1.509-.7c0 .05 0 .1.05.1h.025c-.151.126-.327.25-.5.377-.057.052-.007.102.043.102Zm-8.908-6.163v-.186a5.817 5.817 0 0 1 1.588-.188 1.52 1.52 0 0 1 .478 0 5.86 5.86 0 0 0-2.066.374Zm30.6 5.088a.665.665 0 0 1-.306.524l-10.079 5.85a32.296 32.296 0 0 1-3.408-1.184 2.826 2.826 0 0 1-.05-2.245c.08-.308.198-.605.352-.883.025-.025.05-.05.05-.076a.025.025 0 0 0 .025-.025 4.32 4.32 0 0 1 .377-.555l.015-.015.02-.021.015-.015c0-.025.025-.05.05-.076.025-.051.075-.076.1-.126.176-.186.37-.354.579-.5.213-.077.431-.136.654-.177.811.06 1.617.17 2.415.328a.752.752 0 0 1 .277.1c.301.059.612.041.905-.05a1.137 1.137 0 0 0 .855-.706 1.212 1.212 0 0 0 .05-1.06c-.178-.275-.013-.436.181-.59l.068-.054c.086-.061.164-.134.231-.216.126-.252-.1-.4-.151-.63-.05-.1-.226-.05-.327-.2.352-.151.855-.43.629-.857-.151-.227-.377-.63-.1-.857.352-.2.855-.151 1.006-.48a1.137 1.137 0 0 0-.292-1.084l-.075-.108a4.754 4.754 0 0 1-.211-.32 6.905 6.905 0 0 0-.528-.757 4.297 4.297 0 0 1-.528-1.01c-.151-.377.05-.705.05-1.083a6.347 6.347 0 0 0-.327-2.144c-.126-.353-.176-.731-.327-1.06a1.12 1.12 0 0 0-.226-.58.374.374 0 0 1 0-.327c.205-.145.399-.305.579-.48a.567.567 0 0 0-.2-.705c-.327-.151-.3.328-.528.429h-.151c-.05-.126.05-.177.151-.277 0-.05 0-.151-.05-.151-.2 0-.377-.051-.428-.151a3.957 3.957 0 0 0-1.861-1.286c.188.058.382.091.579.1.338.071.69.036 1.006-.1.227-.076.277-.48.377-.706a.8.8 0 0 0-.151-.631 2.19 2.19 0 0 0-.906-.756 9.13 9.13 0 0 1-.679-.353.956.956 0 0 0-.251-.126c-2.965-1.485-9.069-.2-9.534 0h-.009a8.254 8.254 0 0 0-1.249.475 3.922 3.922 0 0 0-2.365 2.465 3.83 3.83 0 0 0-1.333 1.509c-.428.8-1.056 1.509-.956 2.414.1.78.277 1.484.428 2.289.043.272.11.54.2.8.1.276 0 .629.151.855.075.15.025.327.227.428v.2c.05.05.05.1.151.1v.2c.435.423.807.906 1.107 1.434.1.276-.478.15-.7.05a5.977 5.977 0 0 1-1.132-.956.176.176 0 0 0-.051.1c.2.352.906.78.528 1.006-.2.1-.428-.151-.629.05-.05.076 0 .177 0 .277-.277-.2-.578-.1-.855-.2-.2-.05-.252-.427-.478-.427a15.191 15.191 0 0 0-1.811-.327 15.144 15.144 0 0 0-1.739-.16V19.707a.606.606 0 0 1 .306-.524l14.987-8.761 14.994 8.677a.605.605 0 0 1 .306.524v16.932Zm-7.954-8.261a.325.325 0 0 1-.282.149 2.84 2.84 0 0 0-.282.273c.1 0 0 .149.1.149-.205.223.077.694-.205.793-.37.099-.758.099-1.127 0a.727.727 0 0 1 .167-.016h.085a.382.382 0 0 0 .337-.132v-.2c0-.05-.051-.05-.1-.05a.16.16 0 0 1-.1.05.223.223 0 0 0-.154-.2.806.806 0 0 1-.718-.273.67.67 0 0 1 .436-.05c.128 0 .077-.223.231-.322h.154c.307-.372.871-.471.974-.843 0-.1-.282-.1-.487-.15a2.26 2.26 0 0 0-.82.05c-.36.05-.712.142-1.051.274.28-.206.592-.365.923-.471.232-.09.473-.157.718-.2l.132-.026.133-.027a.97.97 0 0 1 .556 0c.231.1.615.1.666.248.1.273-.154.545-.435.744-.057.08.149.135.149.23Z'/><rect width='29.56' height='13.302' x='37' y='5' fill='#FCC63A' rx='2'/><path fill='#161616' d='M39.562 16.168V7.316h2.921c.97 0 1.732.236 2.289.708.565.472.847 1.117.847 1.935 0 .81-.282 1.45-.847 1.922-.557.472-1.32.708-2.289.708h-1.125v3.579h-1.796Zm2.997-7.322h-1.201v2.213h1.2c.38 0 .675-.097.886-.29.22-.195.329-.473.329-.836 0-.337-.11-.602-.329-.796-.21-.194-.506-.291-.885-.291ZM47.23 16.168V7.316h2.707c.97 0 1.736.236 2.301.708.565.472.847 1.117.847 1.935 0 .53-.126.995-.379 1.39-.244.389-.59.688-1.037.899l2.782 3.92h-2.15l-2.352-3.579h-.923v3.579h-1.795Zm2.808-7.322h-1.012v2.213h1.012c.38 0 .674-.097.885-.29.21-.195.316-.473.316-.836 0-.337-.105-.602-.316-.796-.21-.194-.506-.291-.885-.291ZM59.549 7.063c.69 0 1.323.126 1.896.38.582.252 1.08.59 1.492 1.011.414.421.734.919.962 1.492.227.565.341 1.164.341 1.796 0 .632-.114 1.235-.341 1.808a4.485 4.485 0 0 1-.962 1.48c-.413.421-.91.758-1.492 1.011a4.648 4.648 0 0 1-1.896.38 4.738 4.738 0 0 1-3.402-1.391 4.484 4.484 0 0 1-.961-1.48 4.855 4.855 0 0 1-.342-1.808c0-.633.114-1.231.342-1.796.227-.573.548-1.07.961-1.492.413-.422.91-.759 1.492-1.012a4.737 4.737 0 0 1 1.91-.379Zm0 7.676a2.8 2.8 0 0 0 1.138-.228c.354-.16.653-.37.898-.632.252-.27.45-.586.594-.949a3.27 3.27 0 0 0 .215-1.188 3.17 3.17 0 0 0-.215-1.176 2.791 2.791 0 0 0-.595-.949 2.548 2.548 0 0 0-.897-.632 2.673 2.673 0 0 0-1.138-.24c-.413 0-.797.08-1.151.24a2.678 2.678 0 0 0-.91.632 2.899 2.899 0 0 0-.582.949 3.17 3.17 0 0 0-.215 1.176c0 .421.071.817.215 1.188.143.363.337.679.581.949.253.261.557.472.91.632.355.152.739.228 1.152.228Z'/></svg>"); + background-position: 50% 50%; + background-repeat: no-repeat; + width: 214px; + height: 56px; + border: none; + } + + .proconnect-button:hover { + background-image: url("data:image/svg+xml;base64,<svg xmlns='http://www.w3.org/2000/svg' width='211' height='58' fill='none'><g clip-path='url(#a)'><path fill='#1212FF' d='M211 0H0v58h211V0Z'/><path fill='#fff' d='m69.986 26.368 1.156-1.071c.833 1.054 1.819 1.598 2.941 1.598 1.292 0 2.04-.816 2.04-1.904 0-2.55-5.627-2.244-5.627-6.035 0-1.734 1.428-3.196 3.451-3.196 1.683 0 2.907.765 3.791 1.938l-1.19 1.037c-.697-1.003-1.547-1.547-2.584-1.547-1.105 0-1.836.748-1.836 1.734 0 2.567 5.627 2.244 5.627 6.052 0 2.023-1.581 3.349-3.655 3.349-1.768 0-3.077-.663-4.114-1.955Zm10.817-5.712H79.46l1.445-4.556h1.649l-1.751 4.556Zm4.818-3.451c-.56 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM84.891 28v-8.568h1.444V28H84.89Zm3.767-4.284c0-2.499 1.717-4.624 4.403-4.624 1.241 0 2.261.459 3.043 1.292V15.25h1.445V28h-1.445v-.952c-.782.833-1.802 1.292-3.043 1.292-2.686 0-4.403-2.125-4.403-4.624Zm1.53 0c0 1.819 1.224 3.264 3.043 3.264 1.19 0 2.21-.578 2.873-1.598V22.05c-.68-1.037-1.7-1.598-2.873-1.598-1.819 0-3.043 1.445-3.043 3.264Zm18.023 2.873c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM110.473 28v-8.568h1.445v.969c.697-.765 1.581-1.309 2.856-1.309 1.921 0 3.349 1.292 3.349 3.723V28h-1.462v-5.134c0-1.53-.85-2.414-2.176-2.414-1.241 0-2.023.714-2.567 1.615V28h-1.445Zm11.052-2.873v-4.369h-1.615v-1.326h1.615V17.29h1.462v2.142h2.975v1.326h-2.975v4.369c0 1.343.68 1.717 1.717 1.717.561 0 .952-.068 1.275-.204v1.292c-.408.17-.867.238-1.479.238-1.904 0-2.975-.952-2.975-3.043Zm7.377-7.922c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM128.171 28v-8.568h1.445V28h-1.445Zm3.377-8.568h1.615v-1.054c0-1.836 1.207-3.128 3.043-3.128.952 0 1.7.34 2.21.833l-.901 1.054a1.633 1.633 0 0 0-1.292-.578c-.935 0-1.598.68-1.598 1.785v1.088h2.975v1.326h-2.975V28h-1.462v-7.242h-1.615v-1.326Zm8.543-2.227c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM139.36 28v-8.568h1.445V28h-1.445Zm12.115-1.411c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM153.737 28v-8.568h1.445v1.071c.629-.748 1.411-1.241 2.499-1.241.272 0 .527.034.731.102v1.496a3.105 3.105 0 0 0-.85-.119c-1.122 0-1.853.578-2.38 1.445V28h-1.445Zm13.685.34c-1.683 0-2.822-.952-2.822-2.448 0-1.326.986-2.278 2.822-2.567l2.873-.476v-.595c0-1.19-.85-1.87-2.057-1.87-1.003 0-1.836.442-2.329 1.19l-1.088-.833c.748-1.02 1.955-1.649 3.451-1.649 2.176 0 3.468 1.275 3.468 3.162V28h-1.445v-1.088c-.646.901-1.717 1.428-2.873 1.428Zm-1.377-2.499c0 .731.629 1.292 1.615 1.292 1.139 0 2.04-.595 2.635-1.581V23.92l-2.533.442c-1.19.187-1.717.731-1.717 1.479Zm7.252-6.409h1.564l2.737 7.055 2.737-7.055h1.564L178.55 28h-1.904l-3.349-8.568Zm17.856 7.157c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261Zm10.185 6.647c1.054 0 1.904-.51 2.431-1.275l1.156.884c-.799 1.071-2.04 1.751-3.604 1.751-2.839 0-4.658-2.125-4.658-4.624 0-2.499 1.819-4.624 4.658-4.624 1.547 0 2.805.697 3.604 1.751l-1.156.884a2.925 2.925 0 0 0-2.448-1.275c-1.836 0-3.145 1.445-3.145 3.264 0 1.836 1.309 3.264 3.162 3.264ZM70.854 45V32.4h4.158c2.772 0 4.464 1.422 4.464 3.762 0 2.322-1.692 3.744-4.464 3.744H73.41V45h-2.556Zm4.266-10.422h-1.71v3.15h1.71c1.08 0 1.728-.576 1.728-1.602 0-.954-.648-1.548-1.728-1.548ZM81.249 45v-9.072h2.286v.9c.594-.612 1.368-1.08 2.394-1.08.306 0 .576.054.792.126v2.394a3.938 3.938 0 0 0-1.008-.126c-1.116 0-1.836.612-2.178 1.17V45h-2.286Zm11.386-9.432c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm13.172-.234c1.44 0 2.574-.702 3.294-1.728l2.016 1.548c-1.152 1.566-3.024 2.574-5.31 2.574-3.978 0-6.696-3.06-6.696-6.66s2.718-6.66 6.696-6.66c2.286 0 4.158 1.026 5.31 2.556l-2.016 1.566c-.72-1.026-1.854-1.728-3.294-1.728-2.376 0-4.068 1.854-4.068 4.266s1.692 4.266 4.068 4.266Zm11.366-7.398c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm7.018 1.8v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm11.091 0v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm19.444-1.476c-.846 1.134-2.25 1.836-3.96 1.836-3.222 0-5.04-2.25-5.04-4.896 0-2.682 1.692-4.896 4.662-4.896 2.52 0 4.176 1.692 4.176 4.068 0 .504-.072.99-.144 1.296h-6.354c.144 1.494 1.188 2.376 2.736 2.376.99 0 1.8-.432 2.286-1.08l1.638 1.296Zm-4.338-6.048c-1.116 0-1.872.54-2.178 1.728h4.086c-.036-.9-.702-1.728-1.908-1.728Zm10.696 5.724c.882 0 1.584-.432 2.016-1.062l1.818 1.386c-.846 1.116-2.178 1.836-3.834 1.836-3.132 0-5.004-2.25-5.004-4.896s1.872-4.896 5.004-4.896c1.656 0 2.988.72 3.834 1.836l-1.818 1.386c-.432-.63-1.116-1.062-2.052-1.062-1.494 0-2.592 1.152-2.592 2.736 0 1.602 1.098 2.736 2.628 2.736Zm6.204-1.512v-3.672h-1.692v-2.088h1.692V33.66h2.304v2.268h2.772v2.088h-2.772v3.672c0 1.008.54 1.404 1.44 1.404.63 0 1.044-.072 1.35-.198v1.998c-.45.198-.99.288-1.746.288-2.268 0-3.348-1.278-3.348-3.492Z'/><path fill='#000091' d='M46.992 19.098 31.998 10.42l-14.994 8.76a.606.606 0 0 0-.306.525v16.948a.666.666 0 0 0 .306.524l14.992 8.6 14.994-8.706a.666.666 0 0 0 .306-.524V19.626a.604.604 0 0 0-.304-.528Z'/><path fill='#FCC63A' d='m26.641 19.598-5.029 8.628-4.557-9.175 5.39-3.113 4.489 3.16-.293.5Zm20.656 16.98V19.62a.6.6 0 0 0-.306-.523L31.998 10.42'/><path fill='#0063CB' d='M16.7 36.578 32 10.42v35.362l-14.996-8.605a.665.665 0 0 1-.306-.524V19.706l.002 16.872Zm24.669-20.735 5.458 3.155-4.489 9.15-5.387-9.236 4.418-3.07Z'/><path fill='#fff' d='m51.606 16.303-19.19-11.02a.933.933 0 0 0-.832 0l-19.19 11.02a.887.887 0 0 0-.394.695v22a.885.885 0 0 0 .394.7l19.189 11.02a.932.932 0 0 0 .832 0l19.191-11.02a.886.886 0 0 0 .394-.7v-22a.887.887 0 0 0-.394-.695ZM22.789 34.059h.079c-.042 0-.079.007-.079.05 0 .1.151 0 .2.1a.912.912 0 0 0-.629.276c0 .05.1.05.151.05-.075.1-.226.05-.277.152a.176.176 0 0 0 .1.05c-.05 0-.1 0-.1.05v.152c-.126 0-.176.1-.277.15.2.152.327 0 .528 0-.528.2-.956.479-1.484.63-.1 0 0 .15-.1.15.151.1.227-.05.377-.05-.654.378-1.333.7-2.037 1.133a.351.351 0 0 0-.1.2h-.2c-.1.05-.05.176-.151.277.226.15.5-.2.654 0 .05 0-.1.05-.2.05-.05 0-.05.1-.1.1h-.154c-.1.075-.2.126-.2.276a.22.22 0 0 0-.226.1 9.031 9.031 0 0 0 3.144-.578 7.683 7.683 0 0 0 2.088-1.56.176.176 0 0 1 .05.1c-.147.437-.43.816-.806 1.08-.277.152-.478.378-.7.479a4.057 4.057 0 0 0-.428.276c-.632.197-1.281.335-1.939.412l-.305.044c-.225.033-.449.069-.671.108l-1.993-1.138a.647.647 0 0 1-.288-.411.57.57 0 0 0 .094-.063.266.266 0 0 0-.113-.071v-.65a12.782 12.782 0 0 0 3.038-.942 8.746 8.746 0 0 0-3.037-1.343v-1.515a11.67 11.67 0 0 1 1.639.392 6.42 6.42 0 0 1 1.182.578c.147.14.307.267.478.377a.91.91 0 0 0 .8.05h.33a3.961 3.961 0 0 0 1.937-.905c0 .05.05.05.1.05a3.629 3.629 0 0 1-.428 1.132c.003.05-.048.152.053.202Zm2.817 3.57c.251-.1.4-.276.629-.376-.05.05-.05.15-.1.2a3.699 3.699 0 0 0-.528.4 15.965 15.965 0 0 0-1.585 1.61c-.252.3-.528.578-.8.855-.096.09-.2.172-.31.245l-2.527-1.45c.36.03.721.013 1.076-.053.294-.083.58-.192.855-.327v.1c.7-.277 1.232-.906 1.937-1.132.025 0 .126.1.226.05a1.883 1.883 0 0 1 1.509-.7c0 .05 0 .1.05.1h.025c-.151.126-.327.25-.5.377-.057.052-.007.102.043.102Zm-8.908-6.163v-.186a5.817 5.817 0 0 1 1.588-.188 1.52 1.52 0 0 1 .478 0 5.86 5.86 0 0 0-2.066.374Zm30.6 5.088a.665.665 0 0 1-.306.524l-10.079 5.85a32.296 32.296 0 0 1-3.408-1.184 2.826 2.826 0 0 1-.05-2.245c.08-.308.198-.605.352-.883.025-.025.05-.05.05-.076a.025.025 0 0 0 .025-.025 4.32 4.32 0 0 1 .377-.555l.015-.015.02-.021.015-.015c0-.025.025-.05.05-.076.025-.051.075-.076.1-.126.176-.186.37-.354.579-.5.213-.077.431-.136.654-.177.811.06 1.617.17 2.415.328a.752.752 0 0 1 .277.1c.301.059.612.041.905-.05a1.137 1.137 0 0 0 .855-.706 1.212 1.212 0 0 0 .05-1.06c-.178-.275-.013-.436.181-.59l.068-.054c.086-.061.164-.134.231-.216.126-.252-.1-.4-.151-.63-.05-.1-.226-.05-.327-.2.352-.151.855-.43.629-.857-.151-.227-.377-.63-.1-.857.352-.2.855-.151 1.006-.48a1.137 1.137 0 0 0-.292-1.084l-.075-.108a4.754 4.754 0 0 1-.211-.32 6.905 6.905 0 0 0-.528-.757 4.297 4.297 0 0 1-.528-1.01c-.151-.377.05-.705.05-1.083a6.347 6.347 0 0 0-.327-2.144c-.126-.353-.176-.731-.327-1.06a1.12 1.12 0 0 0-.226-.58.374.374 0 0 1 0-.327c.205-.145.399-.305.579-.48a.567.567 0 0 0-.2-.705c-.327-.151-.3.328-.528.429h-.151c-.05-.126.05-.177.151-.277 0-.05 0-.151-.05-.151-.2 0-.377-.051-.428-.151a3.957 3.957 0 0 0-1.861-1.286c.188.058.382.091.579.1.338.071.69.036 1.006-.1.227-.076.277-.48.377-.706a.8.8 0 0 0-.151-.631 2.19 2.19 0 0 0-.906-.756 9.13 9.13 0 0 1-.679-.353.956.956 0 0 0-.251-.126c-2.965-1.485-9.069-.2-9.534 0h-.009a8.254 8.254 0 0 0-1.249.475 3.922 3.922 0 0 0-2.365 2.465 3.83 3.83 0 0 0-1.333 1.509c-.428.8-1.056 1.509-.956 2.414.1.78.277 1.484.428 2.289.043.272.11.54.2.8.1.276 0 .629.151.855.075.15.025.327.227.428v.2c.05.05.05.1.151.1v.2c.435.423.807.906 1.107 1.434.1.276-.478.15-.7.05a5.977 5.977 0 0 1-1.132-.956.176.176 0 0 0-.051.1c.2.352.906.78.528 1.006-.2.1-.428-.151-.629.05-.05.076 0 .177 0 .277-.277-.2-.578-.1-.855-.2-.2-.05-.252-.427-.478-.427a15.191 15.191 0 0 0-1.811-.327 15.144 15.144 0 0 0-1.739-.16V19.707a.606.606 0 0 1 .306-.524l14.987-8.761 14.994 8.677a.605.605 0 0 1 .306.524v16.932Zm-7.954-8.261a.325.325 0 0 1-.282.149 2.84 2.84 0 0 0-.282.273c.1 0 0 .149.1.149-.205.223.077.694-.205.793-.37.099-.758.099-1.127 0a.727.727 0 0 1 .167-.016h.085a.382.382 0 0 0 .337-.132v-.2c0-.05-.051-.05-.1-.05a.16.16 0 0 1-.1.05.223.223 0 0 0-.154-.2.806.806 0 0 1-.718-.273.67.67 0 0 1 .436-.05c.128 0 .077-.223.231-.322h.154c.307-.372.871-.471.974-.843 0-.1-.282-.1-.487-.15a2.26 2.26 0 0 0-.82.05c-.36.05-.712.142-1.051.274.28-.206.592-.365.923-.471.232-.09.473-.157.718-.2l.132-.026.133-.027a.97.97 0 0 1 .556 0c.231.1.615.1.666.248.1.273-.154.545-.435.744-.057.08.149.135.149.23Z'/><path fill='#FCC63A' d='M64.56 5H39a2 2 0 0 0-2 2v9.302a2 2 0 0 0 2 2h25.56a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2Z'/><path fill='#161616' d='M39.562 16.168V7.316h2.921c.97 0 1.732.236 2.289.708.565.472.847 1.117.847 1.935 0 .81-.282 1.45-.847 1.922-.557.472-1.32.708-2.289.708h-1.125v3.579h-1.796Zm2.997-7.322h-1.201v2.213h1.2c.38 0 .675-.097.886-.29.22-.195.329-.473.329-.836 0-.337-.11-.602-.329-.796-.21-.194-.506-.291-.885-.291ZM47.23 16.168V7.316h2.707c.97 0 1.736.236 2.301.708.565.472.847 1.117.847 1.935 0 .53-.126.995-.379 1.39-.244.389-.59.688-1.037.899l2.782 3.92h-2.15l-2.352-3.579h-.923v3.579h-1.795Zm2.808-7.322h-1.012v2.213h1.012c.38 0 .674-.097.885-.29.21-.195.316-.473.316-.836 0-.337-.105-.602-.316-.796-.21-.194-.506-.291-.885-.291ZM59.549 7.063c.69 0 1.323.126 1.896.38.582.252 1.08.59 1.492 1.011.414.421.734.919.962 1.492.227.565.341 1.164.341 1.796 0 .632-.114 1.235-.341 1.808a4.485 4.485 0 0 1-.962 1.48c-.413.421-.91.758-1.492 1.011a4.648 4.648 0 0 1-1.896.38 4.738 4.738 0 0 1-3.402-1.391 4.484 4.484 0 0 1-.961-1.48 4.855 4.855 0 0 1-.342-1.808c0-.633.114-1.231.342-1.796.227-.573.548-1.07.961-1.492.413-.422.91-.759 1.492-1.012a4.737 4.737 0 0 1 1.91-.379Zm0 7.676a2.8 2.8 0 0 0 1.138-.228c.354-.16.653-.37.898-.632.252-.27.45-.586.594-.949a3.27 3.27 0 0 0 .215-1.188 3.17 3.17 0 0 0-.215-1.176 2.791 2.791 0 0 0-.595-.949 2.548 2.548 0 0 0-.897-.632 2.673 2.673 0 0 0-1.138-.24c-.413 0-.797.08-1.151.24a2.678 2.678 0 0 0-.91.632 2.899 2.899 0 0 0-.582.949 3.17 3.17 0 0 0-.215 1.176c0 .421.071.817.215 1.188.143.363.337.679.581.949.253.261.557.472.91.632.355.152.739.228 1.152.228Z'/></g><defs><clipPath id='a'><path fill='#fff' d='M0 0h211v58H0z'/></clipPath></defs></svg>"); + } } diff --git a/src/lib/components/specialized/pc-button.svelte b/src/lib/components/specialized/pc-button.svelte new file mode 100644 index 000000000..f0cb2d1d7 --- /dev/null +++ b/src/lib/components/specialized/pc-button.svelte @@ -0,0 +1,28 @@ + + +
+ +
+ + +
+ + Besoin d’aide ? Contactez-nous (mais pas tout de suite) + +
+
diff --git a/src/routes/auth/connexion/+page.svelte b/src/routes/auth/connexion/+page.svelte index 58cd8ffb2..1b928aefe 100644 --- a/src/routes/auth/connexion/+page.svelte +++ b/src/routes/auth/connexion/+page.svelte @@ -14,6 +14,7 @@ import CenteredGrid from "$lib/components/display/centered-grid.svelte"; import Breadcrumb from "$lib/components/display/breadcrumb.svelte"; import IcButton from "$lib/components/specialized/ic-button.svelte"; + import PcButton from "$lib/components/specialized/pc-button.svelte"; function getLoginHint() { const loginHint = $page.url.searchParams.get("login_hint"); @@ -62,6 +63,7 @@ + From b5525a09353c6bfebac3c8b426143be982bcb6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Thu, 3 Oct 2024 21:27:15 +0200 Subject: [PATCH 02/20] =?UTF-8?q?oidc:=20redirection=20apr=C3=A8s=20callba?= =?UTF-8?q?ck=20d'identification=20OIDC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/auth/ic-callback/+page.ts | 2 ++ src/routes/auth/pc-callback/+page.ts | 2 ++ src/routes/auth/pc-callback/[token]/+page.ts | 12 ++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 src/routes/auth/pc-callback/+page.ts create mode 100644 src/routes/auth/pc-callback/[token]/+page.ts diff --git a/src/routes/auth/ic-callback/+page.ts b/src/routes/auth/ic-callback/+page.ts index f9bb84c7c..74a93655c 100644 --- a/src/routes/auth/ic-callback/+page.ts +++ b/src/routes/auth/ic-callback/+page.ts @@ -30,6 +30,8 @@ export const load: PageLoad = async ({ url, parent }) => { window.localStorage.removeItem("oidcState"); const targetUrl = `${getApiURL()}/inclusion-connect-authenticate/`; + // ce call retourne une structure avec le token DRF initialisé coté backend + const result = await fetch(targetUrl, { method: "POST", headers: { diff --git a/src/routes/auth/pc-callback/+page.ts b/src/routes/auth/pc-callback/+page.ts new file mode 100644 index 000000000..76717b012 --- /dev/null +++ b/src/routes/auth/pc-callback/+page.ts @@ -0,0 +1,2 @@ +export const ssr = false; +export const load = () => {}; diff --git a/src/routes/auth/pc-callback/[token]/+page.ts b/src/routes/auth/pc-callback/[token]/+page.ts new file mode 100644 index 000000000..e2d3185dc --- /dev/null +++ b/src/routes/auth/pc-callback/[token]/+page.ts @@ -0,0 +1,12 @@ +import { CANONICAL_URL } from "$lib/env"; +import { setToken } from "$lib/utils/auth"; +import { redirect } from "@sveltejs/kit"; +import { getNextPage } from "../../utils"; + +export const load = ({ params, url }) => { + const token = params.token; + setToken(token); + + // home pour l'instant + redirect(302, CANONICAL_URL + getNextPage(url)); +}; From 33788033c0b6cf7a0b03818a4f72905e74808424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Thu, 3 Oct 2024 21:28:13 +0200 Subject: [PATCH 03/20] =?UTF-8?q?oidc:=20effacement=20des=20donn=C3=A9es?= =?UTF-8?q?=20de=20connexion=20avant=20logout=20OIDC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En 2 phases : - effacement du token coté frontend - finalisation de la déconnexion coté backend --- src/routes/auth/pc-logout/+page.ts | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/routes/auth/pc-logout/+page.ts diff --git a/src/routes/auth/pc-logout/+page.ts b/src/routes/auth/pc-logout/+page.ts new file mode 100644 index 000000000..0f29b9af4 --- /dev/null +++ b/src/routes/auth/pc-logout/+page.ts @@ -0,0 +1,8 @@ +import { getApiURL } from "$lib/utils/api"; +import { disconnect } from "$lib/utils/auth"; +import { redirect } from "@sveltejs/kit"; + +export const load = () => { + disconnect(); + redirect(302, getApiURL() + "/oidc/pre_logout/"); +}; From a4c61d6d59c45b7cb4930117546c092e0229552e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Thu, 3 Oct 2024 21:29:21 +0200 Subject: [PATCH 04/20] =?UTF-8?q?Ajout=20du=20bouton=20de=20d=C3=A9connexi?= =?UTF-8?q?on=20ProConnect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/_index/menu-mon-compte.svelte | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/routes/_index/menu-mon-compte.svelte b/src/routes/_index/menu-mon-compte.svelte index 181c105ae..7cf9d6556 100644 --- a/src/routes/_index/menu-mon-compte.svelte +++ b/src/routes/_index/menu-mon-compte.svelte @@ -51,6 +51,15 @@ {@html logoutBoxLineIcon} - Déconnexion + Déconnexion (IC) + + +
+ + + + {@html logoutBoxLineIcon} + + Déconnexion (PC) From 98d8ac38fbbf22c04f5a89cdb21c46d6795f7d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Thu, 3 Oct 2024 15:50:13 +0200 Subject: [PATCH 05/20] models: ajout du champ `sub_pc` pour ProConnect --- dora/users/migrations/0029_user_sub_pc.py | 17 +++++++++++++++++ dora/users/models.py | 5 +++++ 2 files changed, 22 insertions(+) create mode 100644 dora/users/migrations/0029_user_sub_pc.py diff --git a/dora/users/migrations/0029_user_sub_pc.py b/dora/users/migrations/0029_user_sub_pc.py new file mode 100644 index 000000000..04be2d4ba --- /dev/null +++ b/dora/users/migrations/0029_user_sub_pc.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.14 on 2024-08-07 08:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("users", "0028_data_migration_cap_emploi"), + ] + + operations = [ + migrations.AddField( + model_name="user", + name="sub_pc", + field=models.UUIDField(null=True, verbose_name="Identifiant ProConnect"), + ), + ] diff --git a/dora/users/models.py b/dora/users/models.py index 74d559034..82f32287a 100644 --- a/dora/users/models.py +++ b/dora/users/models.py @@ -62,9 +62,14 @@ def members_invited(self): class User(AbstractBaseUser): + # obsolète : sera remplacé par `sub_pc` pour ProConnect ic_id = models.UUIDField( verbose_name="Identifiant Inclusion Connect", null=True, blank=True ) + + # null possible en base ... pour l'instant + sub_pc = models.UUIDField(verbose_name="Identifiant ProConnect", null=True) + email = models.EmailField( verbose_name="email address", max_length=255, From 70251c66a200e677c9d8c0a88fe79882a8a48e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Thu, 3 Oct 2024 15:53:53 +0200 Subject: [PATCH 06/20] oidc: modification de l'app MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ajouts des routes pesonnalisées OIDC pour les redirections vers le front-end - modification de certaines portions de `mozilla-django-oidc` avec une vue custom --- dora/oidc/__init__.py | 113 ++++++++++++++++++++++++++++++++++++++++++ dora/oidc/apps.py | 13 +++++ dora/oidc/urls.py | 18 ++++++- dora/oidc/views.py | 89 +++++++++++++++++++++++++++++++++ 4 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 dora/oidc/apps.py diff --git a/dora/oidc/__init__.py b/dora/oidc/__init__.py index b05f193d1..bfc108195 100644 --- a/dora/oidc/__init__.py +++ b/dora/oidc/__init__.py @@ -1,2 +1,115 @@ +from logging import getLogger + +import requests +from django.core.exceptions import SuspiciousOperation +from mozilla_django_oidc.auth import ( + OIDCAuthenticationBackend as MozillaOIDCAuthenticationBackend, +) +from rest_framework.authtoken.models import Token + +from dora.users.models import User + +logger = getLogger(__name__) + + class OIDCError(Exception): """Exception générique pour les erreurs OIDC""" + + +class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend): + def get_userinfo(self, access_token, id_token, payload): + # Surcharge de la récupération des informations utilisateur: + # le décodage JSON du contenu JWT pose problème avec ProConnect + # qui le retourne en format binaire (content-type: application/jwt) + # d'où ce petit hack. + # Inspiré de : https://github.com/numerique-gouv/people/blob/b637774179d94cecb0ef2454d4762750a6a5e8c0/src/backend/core/authentication/backends.py#L47C1-L47C57 + user_response = requests.get( + self.OIDC_OP_USER_ENDPOINT, + headers={"Authorization": "Bearer {0}".format(access_token)}, + verify=self.get_settings("OIDC_VERIFY_SSL", True), + timeout=self.get_settings("OIDC_TIMEOUT", None), + proxies=self.get_settings("OIDC_PROXY", None), + ) + user_response.raise_for_status() + + try: + # cas où le type du token JWT est `application/json` + return user_response.json() + except requests.exceptions.JSONDecodeError: + # sinon, on présume qu'il s'agit d'un token JWT au format `application/jwt` (+...) + # comme c'est le cas pour ProConnect. + return self.verify_token(user_response.text) + + # Pas nécessaire de surcharger `get_or_create_user` puisque sur DORA, + # les utilisateurs ont un e-mail unique qui leur sert de `username`. + + def create_user(self, claims): + # on peut à la rigueur se passer de certains élements contenus dans les claims, + # mais pas de ceux-là : + email, sub = claims.get("email"), claims.get("sub") + if not email: + raise SuspiciousOperation( + "L'adresse e-mail n'est pas inclue dans les `claims`" + ) + + if not sub: + raise SuspiciousOperation( + "Le sujet (`sub`) n'est pas inclu dans les `claims`" + ) + + # TODO: le SIRET fait partie des claims obligatoire, + # voir comment traiter les rattachements à une structure. + # De plus, il semble que l'appartenance à plusieurs SIRET soit possible. + + # L'utilisateur est créé sans mot de passe (aucune connexion à l'admin), + # et comme venant de ProConnect, on considère l'e-mail vérifié. + new_user = self.UserModel.objects.create_user( + email, + sub_pc=sub, + first_name=claims.get("given_name", "N/D"), + last_name=claims.get("usual_name", "N/D"), + is_valid=True, + ) + + # compatibilité : + # durant la phase de migration vers ProConnect on ne replace *que* le fournisseur d'identité, + # et on ne touche pas aux mécanismes d'identification entre back et front. + self.get_or_create_drf_token(new_user) + + return new_user + + def update_user(self, user, claims): + # L'utilisateur peut déjà étre inscrit à IC, dans ce cas on réutilise la plupart + # des informations déjà connues + + if not user.sub_pc: + # utilisateur existant, mais non-enregistré sur ProConnect + sub = claims.get("sub") + if not sub: + raise SuspiciousOperation( + "Le sujet (`sub`) n'est pas inclu dans les `claims`" + ) + user.sub_pc = sub + user.save() + + return user + + def get_user(self, user_id): + if user := super().get_user(user_id): + self.get_or_create_drf_token(user) + return user + return None + + def get_or_create_drf_token(self, user_email): + # Pour être temporairement compatible, on crée un token d'identification DRF lié au nouvel utilisateur. + if not user_email: + logger.exception("Utilisateur non renseigné pour la création du token DRF") + + user = User.objects.get(email=user_email) + + token, created = Token.objects.get_or_create(user=user) + + if created: + logger.info("Initialisation du token DRF pour l'utilisateur %s", user_email) + + return token diff --git a/dora/oidc/apps.py b/dora/oidc/apps.py new file mode 100644 index 000000000..44656c94a --- /dev/null +++ b/dora/oidc/apps.py @@ -0,0 +1,13 @@ +from django.apps import AppConfig + +""" +dora.oidc: + Gère les connexions OIDC-Connect via ProConnect. + Basée sur un provider custom de django-allauth. + Remplace l'ancien système de connexion à Inclusion-Connect à partir de novembre 2024. +""" + + +class OIDCConfig(AppConfig): + name = "dora.oidc" + verbose_name = "Gestion des connexions ProConnect" diff --git a/dora/oidc/urls.py b/dora/oidc/urls.py index 61c06b230..880dff54f 100644 --- a/dora/oidc/urls.py +++ b/dora/oidc/urls.py @@ -1,8 +1,9 @@ +import mozilla_django_oidc.urls # noqa: F401 from django.urls import path import dora.oidc.views as views -oidc_patterns = [ +inclusion_connect_patterns = [ path( "inclusion-connect-get-login-info/", views.inclusion_connect_get_login_info, @@ -20,3 +21,18 @@ views.inclusion_connect_authenticate, ), ] + +proconnect_patterns = [ + # les patterns internes pour le callback et le logout sont définis + # dans le fichier `urls.py` de mozilla_django_oidc + # redirection vers ProConnect pour la connexion + path("oidc/login/", views.oidc_login, name="oidc_login"), + # redirection une fois la connexion terminée + path("oidc/logged_in/", views.oidc_logged_in, name="oidc_logged_in"), + # preparation au logout : 2 étapes nécessaires + # l'une de déconnexion sur ProConnect, l'autre locale de destruction de la session active + path("oidc/pre_logout/", views.oidc_pre_logout, name="oidc_pre_logout"), +] + + +oidc_patterns = inclusion_connect_patterns + proconnect_patterns diff --git a/dora/oidc/views.py b/dora/oidc/views.py index ddc0df37c..34249d404 100644 --- a/dora/oidc/views.py +++ b/dora/oidc/views.py @@ -6,8 +6,12 @@ from django.conf import settings from django.core.cache import cache from django.db import transaction +from django.http import HttpResponseForbidden +from django.http.response import HttpResponseRedirect +from django.urls import reverse from django.utils.crypto import get_random_string from furl import furl +from mozilla_django_oidc.views import OIDCAuthenticationCallbackView, resolve_url from rest_framework import permissions from rest_framework.authtoken.models import Token from rest_framework.decorators import api_view, permission_classes @@ -171,3 +175,88 @@ def inclusion_connect_authenticate(request): except requests.exceptions.RequestException as e: logging.exception(e) raise APIException("Erreur de communication avec le fournisseur d'identité") + + +# Migration vers ProConnect : +# En parallèle des différents endpoints OIDC inclusion-connect (gardés pour problème éventuel). + + +@api_view(["GET"]) +@permission_classes([permissions.AllowAny]) +def oidc_login(request): + # Simple redirection vers la page d'identification ProConnect (si pas identifié) + return HttpResponseRedirect( + redirect_to=reverse("oidc_authentication_init") + + f"?{request.META.get("QUERY_STRING")}" + ) + + +@api_view(["GET"]) +@permission_classes([permissions.AllowAny]) +def oidc_logged_in(request): + # étape indispensable pour le passage du token au frontend_state : + # malheuresement, cette étape est "zappée" si un paramètre `next` est passé lors de l'identification + # mozilla-django-oidc ne le prends pas en compte, il faut pour modifier la vue de callback et le redirect final + + # attention : l'utilisateur est toujours anonyme (a ce point il n'existe qu'un token DRF) + token = Token.objects.get(user_id=request.session["_auth_user_id"]) + + redirect_uri = f"{settings.FRONTEND_URL}/auth/pc-callback/{token}/" + + # gestion du next : + if next := request.GET.get("next"): + redirect_uri += f"?next={next}" + + # on redirige (pour l'instant) vers le front en faisant passer le token DRF + return HttpResponseRedirect(redirect_to=redirect_uri) + + +@api_view(["GET"]) +@permission_classes([permissions.AllowAny]) +def oidc_pre_logout(request): + # attention : le nom oidc_logout est pris par mozilla-django-oidc + # récuperation du token stocké en session: + if oidc_token := request.session.get("oidc_id_token"): + # construction de l'URL de logout + params = { + "id_token_hint": oidc_token, + "state": "todo_xxx", + "post_logout_redirect_uri": request.build_absolute_uri( + reverse("oidc_logout") + ), + } + logout_url = furl(settings.OIDC_OP_LOGOUT_ENDPOINT, args=params) + return HttpResponseRedirect(redirect_to=logout_url.url) + + # FIXME: URL de fallback ? + return HttpResponseForbidden("Déconnexion incorrecte") + + +class CustomAuthorizationCallbackView(OIDCAuthenticationCallbackView): + """ + Callback OIDC : + Vue personnalisée basée en grande partie sur celle définie par `mozilla-django-oidc`, + pour la gestion du retour OIDC après identification. + + La gestion du `next_url` par la classe par défaut n'est pas satisfaisante dans le contexte de DORA, + la redirection vers le frontend nécessitant une étape supplémentaire pour l'enregistrement du token DRF. + Cette classe modifie la dernière redirection du flow pour y ajouter le paramètre d'URL suivant, + plutôt que d'effectuer une redirection directement vers ce paramètre. + + A noter qu'il est trés simple de modifier les différentes étapes du flow OIDC pour les adapter, + `mozilla-django-oidc` disposant d'une série de settings pour spécifier les classes de vue à utiliser + pour chaque étape OIDC (dans ce cas via le setting `OIDC_CALLBACK_CLASS`). + """ + + @property + def success_url(self): + # récupération du paramètre d'URL suivant stocké en session en début de flow OIDC + + next_url = self.request.session.get("oidc_login_next", None) + next_fieldname = self.get_settings("OIDC_REDIRECT_FIELD_NAME", "next") + + success_url = resolve_url(self.get_settings("LOGIN_REDIRECT_URL", "/")) + success_url += f"?{next_fieldname}={next_url}" if next_url else "" + + # redirection vers le front via `oidc/logged_in` + return success_url From 7c1b3e4f7b3bd3f6a01056138383283963337cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Thu, 3 Oct 2024 15:55:49 +0200 Subject: [PATCH 07/20] libs: ajout de `mozilla-django-oidc` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ainsi que sa configuration et la modification des routes pour permettre à la fois l'utilisation de ProConnect et d'Inclusion-Connect --- config/settings/base.py | 70 +++++++++++++++++++++++++++++++++++++++-- config/settings/test.py | 4 ++- config/urls.py | 3 ++ requirements/base.txt | 1 + 4 files changed, 74 insertions(+), 4 deletions(-) diff --git a/config/settings/base.py b/config/settings/base.py index e15f643af..91399b190 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -26,6 +26,8 @@ INSTALLED_APPS = [ "django.contrib.gis", "django.contrib.auth", + # OIDC / ProConnect : doit être chargé après `django.contrib.auth` + "mozilla_django_oidc", "django.contrib.contenttypes", "django.contrib.sessions", "django.contrib.messages", @@ -64,8 +66,19 @@ "django.contrib.messages.middleware.MessageMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", "csp.middleware.CSPMiddleware", + # Rafraichissement du token ProConnect + "mozilla_django_oidc.middleware.SessionRefresh", ] +# OIDC / ProConnect +AUTHENTICATION_BACKENDS = [ + "dora.oidc.OIDCAuthenticationBackend", +] + +# Permet de garder le comportement d'identification "standard" (e-mail/password) +ACCOUNT_EMAIL_REQUIRED = True +ACCOUNT_AUTHENTICATION_METHOD = "email" + ROOT_URLCONF = "config.urls" TEMPLATES = [ @@ -287,7 +300,7 @@ # Modération : MATTERMOST_HOOK_KEY = os.getenv("MATTERMOST_HOOK_KEY") -# INCLUSION-CONNECT / PRO-CONNECT +# INCLUSION-CONNECT IC_ISSUER_ID = os.getenv("IC_ISSUER_ID") IC_AUTH_URL = os.getenv("IC_AUTH_URL") IC_TOKEN_URL = os.getenv("IC_TOKEN_URL") @@ -296,7 +309,59 @@ IC_CLIENT_ID = os.getenv("IC_CLIENT_ID") IC_CLIENT_SECRET = os.getenv("IC_CLIENT_SECRET") -# Recherches sauvagardées : +# OIDC / PROCONNECT +PC_CLIENT_ID = os.getenv("PC_CLIENT_ID") +PC_CLIENT_SECRET = os.getenv("PC_CLIENT_SECRET") +PC_DOMAIN = os.getenv("PC_DOMAIN", "fca.integ01.dev-agentconnect.fr") +PC_ISSUER = os.getenv("PC_ISSUER", f"{PC_DOMAIN}/api/v2") +PC_AUTHORIZE_PATH = os.getenv("PC_AUTHORIZE_PATH", "authorize") +PC_TOKEN_PATH = os.getenv("PC_TOKEN_PATH", "token") +PC_USERINFO_PATH = os.getenv("PC_USERINFO_PATH", "userinfo") + +# ProConnect à besoin de ce setting pour le logout +FRONTEND_URL = os.getenv("FRONTEND_URL") + +# mozilla_django_oidc: +OIDC_RP_CLIENT_ID = os.getenv("PC_CLIENT_ID") +OIDC_RP_CLIENT_SECRET = os.getenv("PC_CLIENT_SECRET") +OIDC_RP_SCOPES = "openid given_name usual_name email siret custom uid" + +# `mozilla_django_oidc` n'utilise pas de discovery / .well-known +# on définit donc chaque endpoint +OIDC_RP_SIGN_ALGO = "RS256" +OIDC_OP_JWKS_ENDPOINT = f"https://{PC_ISSUER}/jwks" +OIDC_OP_AUTHORIZATION_ENDPOINT = f"https://{PC_ISSUER}/authorize" +OIDC_OP_TOKEN_ENDPOINT = f"https://{PC_ISSUER}/token" +OIDC_OP_USER_ENDPOINT = f"https://{PC_ISSUER}/userinfo" +OIDC_OP_LOGOUT_ENDPOINT = f"https://{PC_ISSUER}/session/end" + +# Les paramètres suivants servent à adapter la configuration OIDC +# de `mozilla-django_oidc` pour pouvoir fonctionner dans le contexte +# spécifique à DORA et ProConnect. + +# OIDC : intervalle de rafraichissement du token (4h) +OIDC_RENEW_ID_TOKEN_EXPIRY_SECONDS = 4 * 60 * 60 + +# OIDC : nécessaire pour la gestion de la fin de session coté ProConnect +OIDC_STORE_ID_TOKEN = True +ALLOW_LOGOUT_GET_METHOD = True + +# obligatoire pour ProConnect: à passer en paramètre de requête supplémentaire +# lors de la première phase du flow OIDC +OIDC_AUTH_REQUEST_EXTRA_PARAMS = {"acr_values": "eidas1"} + +# OIDC : redirection vers le front DORA en cas de succès de l'identification +# necessaire pour la gestion de "l'URL suivant" (`next_url`) +LOGIN_REDIRECT_URL = "/oidc/logged_in/" + +# OIDC : redirection vers l'acceuil du front DORA pour la déconnexion +LOGOUT_REDIRECT_URL = FRONTEND_URL + +# OIDC : permet de préciser quelle est la class/vue en charge du callback dans le flow OIDC +# (essentiellement pour la gestion du `next_url`). +OIDC_CALLBACK_CLASS = "dora.oidc.views.CustomAuthorizationCallbackView" + +# Recherches sauvegardées : INCLUDES_DI_SERVICES_IN_SAVED_SEARCH_NOTIFICATIONS = ( os.getenv("INCLUDES_DI_SERVICES_IN_SAVED_SEARCH_NOTIFICATIONS") == "true" ) @@ -353,7 +418,6 @@ EMAIL_PORT = os.getenv("EMAIL_PORT") EMAIL_USE_TLS = True EMAIL_DOMAIN = os.getenv("EMAIL_DOMAIN") -FRONTEND_URL = os.getenv("FRONTEND_URL") SUPPORT_EMAIL = os.getenv("SUPPORT_EMAIL") SUPPORT_LINK = "https://aide.dora.inclusion.beta.gouv.fr" diff --git a/config/settings/test.py b/config/settings/test.py index 32efb52db..e5e353886 100644 --- a/config/settings/test.py +++ b/config/settings/test.py @@ -40,5 +40,7 @@ IC_TOKEN_URL = os.getenv("IC_TOKEN_URL", "https://whatever-oidc-token-url.com") AWS_STORAGE_BUCKET_NAME = os.getenv("AWS_STORAGE_BUCKET_NAME", "dora") SIB_ONBOARDING_LIST = os.getenv("SIB_ONBOARDING_LIST", "1") -SIB_ONBOARDING_PUTATIVE_MEMBER_LIST = os.getenv("SIB_ONBOARDING_PUTATIVE_MEMBER_LIST", "2") +SIB_ONBOARDING_PUTATIVE_MEMBER_LIST = os.getenv( + "SIB_ONBOARDING_PUTATIVE_MEMBER_LIST", "2" +) SIB_ONBOARDING_MEMBER_LIST = os.getenv("SIB_ONBOARDING_MEMBER_LIST", "3") diff --git a/config/urls.py b/config/urls.py index f76b534fe..b9e300856 100644 --- a/config/urls.py +++ b/config/urls.py @@ -112,7 +112,10 @@ urlpatterns = [ *private_api_patterns, *di_api_patterns, + # anciennes routes Inclusion-Connect (en attente de suppression) *oidc_patterns, + # nouvelles routes OIDC pour ProConnect + path("oidc/", include("mozilla_django_oidc.urls")), ] if settings.PROFILE: diff --git a/requirements/base.txt b/requirements/base.txt index cd9ce0d07..aae89bfd0 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,6 +8,7 @@ django-storages[boto3]==1.14.4 djangorestframework-camel-case==1.4.2 djangorestframework-gis==1.1 djangorestframework==3.15.2 +mozilla-django-oidc==4.0.1 furl==2.1.3 hiredis==3.0.0 humanize==4.11.0 From a4bff9897713946d213c0030d8919f74415bbecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Mon, 7 Oct 2024 11:17:26 +0200 Subject: [PATCH 08/20] =?UTF-8?q?V=C3=A9rification=20de=20la=20d=C3=A9conn?= =?UTF-8?q?exion=20ProConnect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En 2 étapes déjà gérées, mais cette fois-ci en véfifiant l'état du paramètre `state` passé par ProConnect (sécurité). --- dora/oidc/urls.py | 3 +++ dora/oidc/views.py | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dora/oidc/urls.py b/dora/oidc/urls.py index 880dff54f..0f2eaaa1d 100644 --- a/dora/oidc/urls.py +++ b/dora/oidc/urls.py @@ -32,6 +32,9 @@ # preparation au logout : 2 étapes nécessaires # l'une de déconnexion sur ProConnect, l'autre locale de destruction de la session active path("oidc/pre_logout/", views.oidc_pre_logout, name="oidc_pre_logout"), + # la plupart des vues de `mozilla-django-oidc` sont paramètrables + # pas le logout + path("oidc/logout/", views.CustomLogoutView.as_view(), name="oidc_logout"), ] diff --git a/dora/oidc/views.py b/dora/oidc/views.py index 34249d404..60ef0606b 100644 --- a/dora/oidc/views.py +++ b/dora/oidc/views.py @@ -5,13 +5,17 @@ import requests from django.conf import settings from django.core.cache import cache +from django.core.exceptions import SuspiciousOperation from django.db import transaction -from django.http import HttpResponseForbidden from django.http.response import HttpResponseRedirect from django.urls import reverse from django.utils.crypto import get_random_string from furl import furl -from mozilla_django_oidc.views import OIDCAuthenticationCallbackView, resolve_url +from mozilla_django_oidc.views import ( + OIDCAuthenticationCallbackView, + OIDCLogoutView, + resolve_url, +) from rest_framework import permissions from rest_framework.authtoken.models import Token from rest_framework.decorators import api_view, permission_classes @@ -215,12 +219,14 @@ def oidc_logged_in(request): @permission_classes([permissions.AllowAny]) def oidc_pre_logout(request): # attention : le nom oidc_logout est pris par mozilla-django-oidc - # récuperation du token stocké en session: + # récupération du token stocké en session: if oidc_token := request.session.get("oidc_id_token"): - # construction de l'URL de logout + # ProConnect nécessite un `state` pour vérifier la déconnexion effective + logout_state = get_random_string(32) + request.session["logout_state"] = logout_state params = { "id_token_hint": oidc_token, - "state": "todo_xxx", + "state": logout_state, "post_logout_redirect_uri": request.build_absolute_uri( reverse("oidc_logout") ), @@ -228,8 +234,7 @@ def oidc_pre_logout(request): logout_url = furl(settings.OIDC_OP_LOGOUT_ENDPOINT, args=params) return HttpResponseRedirect(redirect_to=logout_url.url) - # FIXME: URL de fallback ? - return HttpResponseForbidden("Déconnexion incorrecte") + raise SuspiciousOperation("Tentative de déconnexion avec un token incorrect") class CustomAuthorizationCallbackView(OIDCAuthenticationCallbackView): @@ -260,3 +265,25 @@ def success_url(self): # redirection vers le front via `oidc/logged_in` return success_url + + +class CustomLogoutView(OIDCLogoutView): + """ + Logout OIDC : + ProConnect effectue des vérifications avant de déconnecter l'utilisateur + sur sa plateforme. + Essentiellement en vérifiant la validité d'un `state` passé en paramètre + avant la destruction de la session. + Cette classe effectue simplement la vérification du `state` précédemment stocké + en session (voir `oidc/pre_logout`) et réutilise la classe de vue originale + de `mozilla-django-oidc`. + """ + + def post(self, request): + if logout_state := request.session.pop("logout_state", None): + if request.GET.get("state") != logout_state: + raise SuspiciousOperation("La vérification de la déconnexion a échoué") + else: + raise SuspiciousOperation("Vérification de la déconnexion impossible") + + return super().post(request) From 2c047d6e898d5e50729297e2267f58446e5abb4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Mon, 7 Oct 2024 12:12:54 +0200 Subject: [PATCH 09/20] =?UTF-8?q?fix:=20ajout=20du=20backend=20d'identific?= =?UTF-8?q?ation=20par=20d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dans la configuration précédente, seule l'identification par OIDC était possible. Mais la partie admin de Django à besoin de l'identification par "modéle" (qui est celle par défaut). Les deux oexistent sereinement maintenant. --- config/settings/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/settings/base.py b/config/settings/base.py index 91399b190..093f45d50 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -72,6 +72,8 @@ # OIDC / ProConnect AUTHENTICATION_BACKENDS = [ + # auth par défaut pour la partie admin : + "django.contrib.auth.backends.ModelBackend", "dora.oidc.OIDCAuthenticationBackend", ] From 33961ddd0b29160796a708afd61874941059e772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Mon, 7 Oct 2024 15:43:17 +0200 Subject: [PATCH 10/20] =?UTF-8?q?safir:=20r=C3=A9cup=C3=A9ration=20du=20co?= =?UTF-8?q?de=20SAFIR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Même si on n'en fait encore rien, le point de récupération de la donnée est identifié dans le code. --- dora/oidc/__init__.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dora/oidc/__init__.py b/dora/oidc/__init__.py index bfc108195..543a93b52 100644 --- a/dora/oidc/__init__.py +++ b/dora/oidc/__init__.py @@ -57,10 +57,6 @@ def create_user(self, claims): "Le sujet (`sub`) n'est pas inclu dans les `claims`" ) - # TODO: le SIRET fait partie des claims obligatoire, - # voir comment traiter les rattachements à une structure. - # De plus, il semble que l'appartenance à plusieurs SIRET soit possible. - # L'utilisateur est créé sans mot de passe (aucune connexion à l'admin), # et comme venant de ProConnect, on considère l'e-mail vérifié. new_user = self.UserModel.objects.create_user( @@ -71,6 +67,13 @@ def create_user(self, claims): is_valid=True, ) + # recupération du code SAFIR : + # même pour l'instant inutilisé, on pourra par la suite le passer au frontend + # pour rattachement direct à une agence France Travail + if custom := claims.get("custom"): + code_safir = custom.get("structureTravail") # noqa F481 + # TODO: une fois le code SAFIR récupéré, voir quoi en faire (redirection vers un rattachement) + # compatibilité : # durant la phase de migration vers ProConnect on ne replace *que* le fournisseur d'identité, # et on ne touche pas aux mécanismes d'identification entre back et front. From 7b70fb2161db8be491e08cb041af61365356d25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Mon, 14 Oct 2024 14:49:16 +0200 Subject: [PATCH 11/20] fix: modification d'un log en exception MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Résidu des tests, maintenant l'absence d'e-mail doit lever une exception. --- dora/oidc/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dora/oidc/__init__.py b/dora/oidc/__init__.py index 543a93b52..dd4527f09 100644 --- a/dora/oidc/__init__.py +++ b/dora/oidc/__init__.py @@ -106,7 +106,9 @@ def get_user(self, user_id): def get_or_create_drf_token(self, user_email): # Pour être temporairement compatible, on crée un token d'identification DRF lié au nouvel utilisateur. if not user_email: - logger.exception("Utilisateur non renseigné pour la création du token DRF") + raise SuspiciousOperation( + "Utilisateur non renseigné pour la création du token DRF" + ) user = User.objects.get(email=user_email) From f74045df83d95a782b1464cf2a16b2cffb6e2b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Mon, 21 Oct 2024 17:41:39 +0200 Subject: [PATCH 12/20] Ajout d'une variable d'environnement pour identifier le backend OIDC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On peut encore choisir entre Inclusion Connect et ProConnect via la var-env OIDC_AUTH_BACKEND (par défaut `proconnect`) --- .../components/specialized/pc-button.svelte | 2 +- src/lib/env.ts | 2 ++ src/routes/_index/menu-mon-compte.svelte | 29 ++++++++++--------- src/routes/auth/connexion/+page.svelte | 8 +++-- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/lib/components/specialized/pc-button.svelte b/src/lib/components/specialized/pc-button.svelte index f0cb2d1d7..1b1cd94f9 100644 --- a/src/lib/components/specialized/pc-button.svelte +++ b/src/lib/components/specialized/pc-button.svelte @@ -22,7 +22,7 @@ rel="noopener" href="https://aide.dora.inclusion.beta.gouv.fr" > - Besoin d’aide ? Contactez-nous (mais pas tout de suite) + Besoin d’aide ? Contactez-nous diff --git a/src/lib/env.ts b/src/lib/env.ts index a21b2340b..5c3b6d24e 100644 --- a/src/lib/env.ts +++ b/src/lib/env.ts @@ -5,3 +5,5 @@ export const SENTRY_DSN = import.meta.env.VITE_SENTRY_DSN; export const CANONICAL_URL = import.meta.env.VITE_PUBLIC_CANONICAL_URL; export const METABASE_EMBED_URL = import.meta.env.VITE_METABASE_EMBED_URL; export const FLAG_STRIKING = import.meta.env.VITE_FLAG_STRIKING === "true"; +export const OIDC_AUTH_BACKEND = + import.meta.env.OIDC_AUTH_BACKEND || "proconnect"; diff --git a/src/routes/_index/menu-mon-compte.svelte b/src/routes/_index/menu-mon-compte.svelte index 7cf9d6556..d3f6ec3bb 100644 --- a/src/routes/_index/menu-mon-compte.svelte +++ b/src/routes/_index/menu-mon-compte.svelte @@ -1,6 +1,7 @@ @@ -23,14 +24,16 @@ Mes informations - + {#if OIDC_AUTH_BACKEND !== "proconnect"} + + {/if}
@@ -52,12 +55,23 @@
+

- Vous utilisez Inclusion Connect pour vous connecter à DORA. + {#if OIDC_AUTH_BACKEND === "proconnect"} + Vous utilisez ProConnect pour vous connecter à DORA. + {:else} + Vous utilisez Inclusion Connect pour vous connecter à DORA. + {/if}

From 0d1e464564386044dc39c95b2492fffa48a42fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Thu, 24 Oct 2024 18:06:34 +0200 Subject: [PATCH 18/20] =?UTF-8?q?fix:=20r=C3=A9cup=C3=A9ration=20de=20la?= =?UTF-8?q?=20var-env=20OIDC=5FAUTH=5FBACKEND?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Doit-être préfixée par 'VITE_' --- front/.env-example | 2 ++ front/src/lib/env.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/front/.env-example b/front/.env-example index 401ea3ee8..8751434c1 100644 --- a/front/.env-example +++ b/front/.env-example @@ -9,3 +9,5 @@ GITGUARDIAN_API_KEY= # Variables d'environnement publiques VITE_PUBLIC_MATOMO_CONTAINER_URL=# ex: "https:///js/container_.js" + +VITE_OIDC_AUTH_BACKEND=# proconnect | inclusionconnect diff --git a/front/src/lib/env.ts b/front/src/lib/env.ts index 5c3b6d24e..32389100e 100644 --- a/front/src/lib/env.ts +++ b/front/src/lib/env.ts @@ -6,4 +6,4 @@ export const CANONICAL_URL = import.meta.env.VITE_PUBLIC_CANONICAL_URL; export const METABASE_EMBED_URL = import.meta.env.VITE_METABASE_EMBED_URL; export const FLAG_STRIKING = import.meta.env.VITE_FLAG_STRIKING === "true"; export const OIDC_AUTH_BACKEND = - import.meta.env.OIDC_AUTH_BACKEND || "proconnect"; + import.meta.env.VITE_OIDC_AUTH_BACKEND || "proconnect"; From eb2c6aa637d6ce7c612f67aebbb445ea24982bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Fri, 25 Oct 2024 10:58:58 +0200 Subject: [PATCH 19/20] =?UTF-8?q?fix:=20correction=20du=20`next=5Furl`=20a?= =?UTF-8?q?vec=20multiples=20param=C3=A8tres?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/dora/oidc/views.py | 4 ++-- front/src/routes/auth/pc-callback/[token]/+page.ts | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/back/dora/oidc/views.py b/back/dora/oidc/views.py index 60ef0606b..fe2b4352c 100644 --- a/back/dora/oidc/views.py +++ b/back/dora/oidc/views.py @@ -208,8 +208,8 @@ def oidc_logged_in(request): redirect_uri = f"{settings.FRONTEND_URL}/auth/pc-callback/{token}/" # gestion du next : - if next := request.GET.get("next"): - redirect_uri += f"?next={next}" + if request.GET.get("next"): + redirect_uri += "?" + request.GET.urlencode() # on redirige (pour l'instant) vers le front en faisant passer le token DRF return HttpResponseRedirect(redirect_to=redirect_uri) diff --git a/front/src/routes/auth/pc-callback/[token]/+page.ts b/front/src/routes/auth/pc-callback/[token]/+page.ts index e2d3185dc..b79b1d0a9 100644 --- a/front/src/routes/auth/pc-callback/[token]/+page.ts +++ b/front/src/routes/auth/pc-callback/[token]/+page.ts @@ -7,6 +7,10 @@ export const load = ({ params, url }) => { const token = params.token; setToken(token); - // home pour l'instant - redirect(302, CANONICAL_URL + getNextPage(url)); + const nextPage = getNextPage(url); + url.searchParams.delete("next"); + const qsParams = url.searchParams.toString(); + const uri = nextPage + (qsParams !== "" ? "&" + qsParams : ""); + + redirect(302, CANONICAL_URL + uri); }; From 1ac6063341497cde49a8cf1857797406b41a0072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vergez?= Date: Fri, 25 Oct 2024 11:30:52 +0200 Subject: [PATCH 20/20] revue: corrections et typos --- front/src/app.postcss | 12 ------------ .../src/lib/components/specialized/pc-button.svelte | 9 ++++----- front/src/routes/auth/connexion/+page.svelte | 8 ++++---- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/front/src/app.postcss b/front/src/app.postcss index 2361a66ee..04ab6d82b 100644 --- a/front/src/app.postcss +++ b/front/src/app.postcss @@ -172,16 +172,4 @@ @page { size: 26.25cm 37.125cm; /* A4 * 1.25, afin de réduire la taille de l'impression */ } - - proconnect-sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0, 0, 0, 0); - white-space: nowrap; - border-width: 0; - } } diff --git a/front/src/lib/components/specialized/pc-button.svelte b/front/src/lib/components/specialized/pc-button.svelte index f9bbe6a4c..c51538a0c 100644 --- a/front/src/lib/components/specialized/pc-button.svelte +++ b/front/src/lib/components/specialized/pc-button.svelte @@ -4,8 +4,7 @@ export let nextPage: string; - const loginUrl = - getApiURL() + "/oidc/login/?next=" + encodeURIComponent(nextPage); + const loginUrl = `${getApiURL()}/oidc/login/?next=${encodeURIComponent(nextPage)}`;
@@ -21,17 +20,17 @@ rel="noopener noreferrer" href="https://aide.dora.inclusion.beta.gouv.fr/fr/category/inscription-et-gestion-du-compte-ha8m5b/" > - Besoin d’aide ? Contactez-nous + Besoin d’aide ? Contactez-nous   - Qu'est que ProConnect ? + Qu'est que ProConnect ?
diff --git a/front/src/routes/auth/connexion/+page.svelte b/front/src/routes/auth/connexion/+page.svelte index 513e8124e..1ad67eff4 100644 --- a/front/src/routes/auth/connexion/+page.svelte +++ b/front/src/routes/auth/connexion/+page.svelte @@ -64,7 +64,7 @@
{@html informationLineIcon}
-
DORA passe à Inclusion Connect !
+
DORA passe à Inclusion Connect !

Si vous aviez un ancien compte DORA, vous pouvez @@ -92,11 +92,11 @@ {#if OIDC_AUTH_BACKEND === "proconnect"}

ProConnect - Pourquoi ProConnect ? + Pourquoi ProConnect ?

- 🧑🏻‍💻 Un compte unique pour tous vos services numériques ! + 🧑🏻‍💻 Un compte unique pour tous vos services numériques !

🔐 Accédez aux différents services partenaires avec le même @@ -131,7 +131,7 @@

- 🧑🏻‍💻 Un compte unique pour tous vos services numériques ! + 🧑🏻‍💻 Un compte unique pour tous vos services numériques !

🔐 Accédez aux différents services partenaires avec le même