From 979735e28de2866d5bc275a6371a9bc8b73d5704 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@sunet.se>
Date: Tue, 5 Sep 2023 12:43:50 +0200
Subject: [PATCH] changing logo, icon and Freja IDP's name in proxy prod

Ref: SC-1744
---
 .../se/cfg/application-se.properties            |  4 ++--
 .../etc/eidas-proxy/se/cfg/idpdisco.properties  |  2 ++
 .../eidas-proxy/se/cfg/img/idp-logo-notext.svg  |  9 +++++++++
 .../etc/eidas-proxy/se/cfg/img/idp-logo.svg     | 17 +++++++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/img/idp-logo-notext.svg
 create mode 100644 eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/img/idp-logo.svg

diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application-se.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application-se.properties
index 4ab78ee8..3cc5cf96 100644
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application-se.properties
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application-se.properties
@@ -7,8 +7,8 @@ server.servlet.context-path=/eidas-ps
 #proxy-service.path.prefix=${spring.config.additional.location}..
 #proxy-service.config.location=file://${spring.config.additional.location}
 
-proxy-service.image.logo=${spring.config.additional.location}/img/sweden-connect-color-yellow-on-blue.svg
-proxy-service.image.icon=${spring.config.additional.location}/img/sweden-connect-color-yellow-on-blue-no-text.svg
+proxy-service.image.logo=${spring.config.additional.location}/img/idp-logo.svg
+proxy-service.image.icon=${spring.config.additional.location}/img/idp-logo-notext.svg
 
 # Service port connector settings
 server.port=8443
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
index a4300755..0b2a773f 100644
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
@@ -5,6 +5,8 @@
 # - natToEidasNotifiedMapping = National IdP:s are allowed to respond with national LoA. These counts as notified eID
 
 idp.freja.entityid=https://idp-sweden-connect-valfr-2017.prod.frejaeid.com
+idp.freja.name.sv=Freja+
+idp.freja.name.en=Freja+
 idp.freja.loapolicy=justEidasLoa
 idp.freja.consent=false
 idp.freja.deriveDob=false
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/img/idp-logo-notext.svg b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/img/idp-logo-notext.svg
new file mode 100644
index 00000000..037227a5
--- /dev/null
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/img/idp-logo-notext.svg
@@ -0,0 +1,9 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="64" width="64" height="64" fill="#CD7A6E"/>
+<rect x="128" y="64" width="64" height="64" fill="#695F59"/>
+<rect x="192" y="64" width="64" height="64" fill="#B4AFAC"/>
+<path d="M0 128H64V192H0V128Z" fill="#5A6751"/>
+<rect x="64" y="128" width="64" height="64" fill="#ACB3A8"/>
+<rect x="192" y="128" width="64" height="64" fill="#F4E0CE"/>
+<rect x="128" y="192" width="64" height="64" fill="#D59151"/>
+</svg>
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/img/idp-logo.svg b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/img/idp-logo.svg
new file mode 100644
index 00000000..406331fc
--- /dev/null
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/img/idp-logo.svg
@@ -0,0 +1,17 @@
+<svg width="280" height="56" viewBox="0 0 280 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_707:482)">
+<rect x="14" width="14" height="14" fill="#CD7A6E"/>
+<rect x="28" y="14" width="14" height="14" fill="#695F59"/>
+<rect x="42" y="14" width="14" height="14" fill="#B4AFAC"/>
+<rect y="28" width="14" height="14" fill="#5A6751"/>
+<rect x="14" y="28" width="14" height="14" fill="#ACB3A8"/>
+<rect x="42" y="28" width="14" height="14" fill="#F4E0CE"/>
+<rect x="28" y="42" width="14" height="14" fill="#D59151"/>
+<path d="M76.532 34.668C77.148 34.668 77.652 34.6213 78.044 34.528C78.4547 34.416 78.7813 34.276 79.024 34.108C79.2667 33.9213 79.4347 33.7067 79.528 33.464C79.6213 33.2213 79.668 32.9507 79.668 32.652C79.668 32.0173 79.3693 31.4947 78.772 31.084C78.1747 30.6547 77.148 30.1973 75.692 29.712C75.0573 29.488 74.4227 29.236 73.788 28.956C73.1533 28.6573 72.584 28.2933 72.08 27.864C71.576 27.416 71.1653 26.884 70.848 26.268C70.5307 25.6333 70.372 24.868 70.372 23.972C70.372 23.076 70.54 22.2733 70.876 21.564C71.212 20.836 71.688 20.22 72.304 19.716C72.92 19.212 73.6667 18.8293 74.544 18.568C75.4213 18.288 76.4107 18.148 77.512 18.148C78.8187 18.148 79.948 18.288 80.9 18.568C81.852 18.848 82.636 19.156 83.252 19.492L81.992 22.936C81.4507 22.656 80.844 22.4133 80.172 22.208C79.5187 21.984 78.7253 21.872 77.792 21.872C76.7467 21.872 75.9907 22.0213 75.524 22.32C75.076 22.6 74.852 23.0387 74.852 23.636C74.852 23.9907 74.936 24.2893 75.104 24.532C75.272 24.7747 75.5053 24.9987 75.804 25.204C76.1213 25.3907 76.476 25.568 76.868 25.736C77.2787 25.8853 77.7267 26.044 78.212 26.212C79.22 26.5853 80.0973 26.9587 80.844 27.332C81.5907 27.6867 82.2067 28.1067 82.692 28.592C83.196 29.0773 83.5693 29.6467 83.812 30.3C84.0547 30.9533 84.176 31.7467 84.176 32.68C84.176 34.4907 83.5413 35.9 82.272 36.908C81.0027 37.8973 79.0893 38.392 76.532 38.392C75.6733 38.392 74.8987 38.336 74.208 38.224C73.5173 38.1307 72.9013 38.0093 72.36 37.86C71.8373 37.7107 71.38 37.552 70.988 37.384C70.6147 37.216 70.2973 37.0573 70.036 36.908L71.268 33.436C71.8467 33.7533 72.556 34.0427 73.396 34.304C74.2547 34.5467 75.3 34.668 76.532 34.668ZM95.0214 29.544C94.6481 30.9627 94.2467 32.372 93.8174 33.772C93.4067 35.172 92.9681 36.5813 92.5014 38H89.2534C88.9174 37.216 88.5534 36.2827 88.1614 35.2C87.7694 34.1173 87.3587 32.9413 86.9294 31.672C86.5187 30.384 86.0894 29.0307 85.6414 27.612C85.2121 26.1747 84.7921 24.728 84.3814 23.272H88.7774C88.9267 23.944 89.0854 24.6813 89.2534 25.484C89.4401 26.268 89.6267 27.08 89.8134 27.92C90.0187 28.76 90.2241 29.6093 90.4294 30.468C90.6534 31.308 90.8774 32.12 91.1014 32.904C91.3441 32.0827 91.5774 31.2427 91.8014 30.384C92.0441 29.5253 92.2681 28.6853 92.4734 27.864C92.6974 27.024 92.9027 26.2213 93.0894 25.456C93.2947 24.672 93.4721 23.944 93.6214 23.272H96.6454C96.7947 23.944 96.9627 24.672 97.1494 25.456C97.3361 26.2213 97.5321 27.024 97.7374 27.864C97.9427 28.6853 98.1574 29.5253 98.3814 30.384C98.6054 31.2427 98.8387 32.0827 99.0814 32.904C99.3054 32.12 99.5294 31.308 99.7534 30.468C99.9774 29.6093 100.183 28.76 100.369 27.92C100.575 27.08 100.761 26.268 100.929 25.484C101.116 24.6813 101.284 23.944 101.433 23.272H105.773C105.363 24.728 104.933 26.1747 104.485 27.612C104.056 29.0307 103.627 30.384 103.197 31.672C102.787 32.9413 102.376 34.1173 101.965 35.2C101.573 36.2827 101.209 37.216 100.873 38H97.6254C97.1587 36.5813 96.7014 35.172 96.2534 33.772C95.8054 32.372 95.3947 30.9627 95.0214 29.544ZM106.15 30.748C106.15 29.4413 106.346 28.3027 106.738 27.332C107.149 26.3427 107.681 25.5213 108.334 24.868C108.988 24.2147 109.734 23.72 110.574 23.384C111.433 23.048 112.31 22.88 113.206 22.88C115.297 22.88 116.949 23.524 118.162 24.812C119.376 26.0813 119.982 27.9573 119.982 30.44C119.982 30.6827 119.973 30.9533 119.954 31.252C119.936 31.532 119.917 31.784 119.898 32.008H110.434C110.528 32.8667 110.929 33.548 111.638 34.052C112.348 34.556 113.3 34.808 114.494 34.808C115.26 34.808 116.006 34.7427 116.734 34.612C117.481 34.4627 118.088 34.2853 118.554 34.08L119.114 37.468C118.89 37.58 118.592 37.692 118.218 37.804C117.845 37.916 117.425 38.0093 116.958 38.084C116.51 38.1773 116.025 38.252 115.502 38.308C114.98 38.364 114.457 38.392 113.934 38.392C112.609 38.392 111.452 38.196 110.462 37.804C109.492 37.412 108.68 36.88 108.026 36.208C107.392 35.5173 106.916 34.7053 106.598 33.772C106.3 32.8387 106.15 31.8307 106.15 30.748ZM115.95 29.152C115.932 28.7973 115.866 28.452 115.754 28.116C115.661 27.78 115.502 27.4813 115.278 27.22C115.073 26.9587 114.802 26.744 114.466 26.576C114.149 26.408 113.748 26.324 113.262 26.324C112.796 26.324 112.394 26.408 112.058 26.576C111.722 26.7253 111.442 26.9307 111.218 27.192C110.994 27.4533 110.817 27.7613 110.686 28.116C110.574 28.452 110.49 28.7973 110.434 29.152H115.95ZM125.918 30.524C125.918 31.812 126.207 32.848 126.786 33.632C127.365 34.416 128.223 34.808 129.362 34.808C129.735 34.808 130.081 34.7987 130.398 34.78C130.715 34.7427 130.977 34.7053 131.182 34.668V27.08C130.921 26.912 130.575 26.772 130.146 26.66C129.735 26.548 129.315 26.492 128.886 26.492C126.907 26.492 125.918 27.836 125.918 30.524ZM135.354 37.524C134.981 37.636 134.551 37.748 134.066 37.86C133.581 37.9533 133.067 38.0373 132.526 38.112C132.003 38.1867 131.462 38.2427 130.902 38.28C130.361 38.336 129.838 38.364 129.334 38.364C128.121 38.364 127.038 38.1867 126.086 37.832C125.134 37.4773 124.331 36.9733 123.678 36.32C123.025 35.648 122.521 34.8453 122.166 33.912C121.83 32.96 121.662 31.896 121.662 30.72C121.662 29.5253 121.811 28.452 122.11 27.5C122.409 26.5293 122.838 25.708 123.398 25.036C123.958 24.364 124.639 23.8507 125.442 23.496C126.263 23.1413 127.197 22.964 128.242 22.964C128.821 22.964 129.334 23.02 129.782 23.132C130.249 23.244 130.715 23.4027 131.182 23.608V16.944L135.354 16.272V37.524ZM137.72 30.748C137.72 29.4413 137.916 28.3027 138.308 27.332C138.719 26.3427 139.251 25.5213 139.904 24.868C140.558 24.2147 141.304 23.72 142.144 23.384C143.003 23.048 143.88 22.88 144.776 22.88C146.867 22.88 148.519 23.524 149.732 24.812C150.946 26.0813 151.552 27.9573 151.552 30.44C151.552 30.6827 151.543 30.9533 151.524 31.252C151.506 31.532 151.487 31.784 151.468 32.008H142.004C142.098 32.8667 142.499 33.548 143.208 34.052C143.918 34.556 144.87 34.808 146.064 34.808C146.83 34.808 147.576 34.7427 148.304 34.612C149.051 34.4627 149.658 34.2853 150.124 34.08L150.684 37.468C150.46 37.58 150.162 37.692 149.788 37.804C149.415 37.916 148.995 38.0093 148.528 38.084C148.08 38.1773 147.595 38.252 147.072 38.308C146.55 38.364 146.027 38.392 145.504 38.392C144.179 38.392 143.022 38.196 142.032 37.804C141.062 37.412 140.25 36.88 139.596 36.208C138.962 35.5173 138.486 34.7053 138.168 33.772C137.87 32.8387 137.72 31.8307 137.72 30.748ZM147.52 29.152C147.502 28.7973 147.436 28.452 147.324 28.116C147.231 27.78 147.072 27.4813 146.848 27.22C146.643 26.9587 146.372 26.744 146.036 26.576C145.719 26.408 145.318 26.324 144.832 26.324C144.366 26.324 143.964 26.408 143.628 26.576C143.292 26.7253 143.012 26.9307 142.788 27.192C142.564 27.4533 142.387 27.7613 142.256 28.116C142.144 28.452 142.06 28.7973 142.004 29.152H147.52ZM153.932 23.776C154.641 23.5707 155.556 23.384 156.676 23.216C157.796 23.0293 158.972 22.936 160.204 22.936C161.455 22.936 162.491 23.104 163.312 23.44C164.152 23.7573 164.815 24.2147 165.3 24.812C165.785 25.4093 166.131 26.1187 166.336 26.94C166.541 27.7613 166.644 28.676 166.644 29.684V38H162.472V30.188C162.472 28.844 162.295 27.892 161.94 27.332C161.585 26.772 160.923 26.492 159.952 26.492C159.653 26.492 159.336 26.5107 159 26.548C158.664 26.5667 158.365 26.5947 158.104 26.632V38H153.932V23.776ZM184.595 38.392C181.44 38.392 179.032 37.5147 177.371 35.76C175.728 34.0053 174.907 31.5133 174.907 28.284C174.907 26.6787 175.159 25.2507 175.663 24C176.167 22.7307 176.857 21.6667 177.735 20.808C178.612 19.9307 179.657 19.268 180.871 18.82C182.084 18.372 183.4 18.148 184.819 18.148C185.64 18.148 186.387 18.2133 187.059 18.344C187.731 18.456 188.319 18.596 188.823 18.764C189.327 18.9133 189.747 19.072 190.083 19.24C190.419 19.408 190.661 19.5387 190.811 19.632L189.551 23.16C188.953 22.8427 188.253 22.572 187.451 22.348C186.667 22.124 185.771 22.012 184.763 22.012C184.091 22.012 183.428 22.124 182.775 22.348C182.14 22.572 181.571 22.936 181.067 23.44C180.581 23.9253 180.189 24.56 179.891 25.344C179.592 26.128 179.443 27.08 179.443 28.2C179.443 29.096 179.536 29.936 179.723 30.72C179.928 31.4853 180.245 32.148 180.675 32.708C181.123 33.268 181.701 33.716 182.411 34.052C183.12 34.3693 183.979 34.528 184.987 34.528C185.621 34.528 186.191 34.4907 186.695 34.416C187.199 34.3413 187.647 34.2573 188.039 34.164C188.431 34.052 188.776 33.9307 189.075 33.8C189.373 33.6693 189.644 33.548 189.887 33.436L191.091 36.936C190.475 37.3093 189.607 37.6453 188.487 37.944C187.367 38.2427 186.069 38.392 184.595 38.392ZM206.231 30.608C206.231 31.7653 206.063 32.8293 205.727 33.8C205.391 34.752 204.906 35.5733 204.271 36.264C203.636 36.936 202.871 37.4587 201.975 37.832C201.098 38.2053 200.108 38.392 199.007 38.392C197.924 38.392 196.935 38.2053 196.039 37.832C195.162 37.4587 194.406 36.936 193.771 36.264C193.136 35.5733 192.642 34.752 192.287 33.8C191.932 32.8293 191.755 31.7653 191.755 30.608C191.755 29.4507 191.932 28.396 192.287 27.444C192.66 26.492 193.164 25.68 193.799 25.008C194.452 24.336 195.218 23.8133 196.095 23.44C196.991 23.0667 197.962 22.88 199.007 22.88C200.071 22.88 201.042 23.0667 201.919 23.44C202.815 23.8133 203.58 24.336 204.215 25.008C204.85 25.68 205.344 26.492 205.699 27.444C206.054 28.396 206.231 29.4507 206.231 30.608ZM201.975 30.608C201.975 29.32 201.714 28.312 201.191 27.584C200.687 26.8373 199.959 26.464 199.007 26.464C198.055 26.464 197.318 26.8373 196.795 27.584C196.272 28.312 196.011 29.32 196.011 30.608C196.011 31.896 196.272 32.9227 196.795 33.688C197.318 34.4347 198.055 34.808 199.007 34.808C199.959 34.808 200.687 34.4347 201.191 33.688C201.714 32.9227 201.975 31.896 201.975 30.608ZM208.623 23.776C209.332 23.5707 210.247 23.384 211.367 23.216C212.487 23.0293 213.663 22.936 214.895 22.936C216.145 22.936 217.181 23.104 218.003 23.44C218.843 23.7573 219.505 24.2147 219.991 24.812C220.476 25.4093 220.821 26.1187 221.027 26.94C221.232 27.7613 221.335 28.676 221.335 29.684V38H217.163V30.188C217.163 28.844 216.985 27.892 216.631 27.332C216.276 26.772 215.613 26.492 214.643 26.492C214.344 26.492 214.027 26.5107 213.691 26.548C213.355 26.5667 213.056 26.5947 212.795 26.632V38H208.623V23.776ZM224.271 23.776C224.98 23.5707 225.895 23.384 227.015 23.216C228.135 23.0293 229.311 22.936 230.543 22.936C231.794 22.936 232.83 23.104 233.651 23.44C234.491 23.7573 235.154 24.2147 235.639 24.812C236.124 25.4093 236.47 26.1187 236.675 26.94C236.88 27.7613 236.983 28.676 236.983 29.684V38H232.811V30.188C232.811 28.844 232.634 27.892 232.279 27.332C231.924 26.772 231.262 26.492 230.291 26.492C229.992 26.492 229.675 26.5107 229.339 26.548C229.003 26.5667 228.704 26.5947 228.443 26.632V38H224.271V23.776ZM239.219 30.748C239.219 29.4413 239.415 28.3027 239.807 27.332C240.218 26.3427 240.75 25.5213 241.403 24.868C242.057 24.2147 242.803 23.72 243.643 23.384C244.502 23.048 245.379 22.88 246.275 22.88C248.366 22.88 250.018 23.524 251.231 24.812C252.445 26.0813 253.051 27.9573 253.051 30.44C253.051 30.6827 253.042 30.9533 253.023 31.252C253.005 31.532 252.986 31.784 252.967 32.008H243.503C243.597 32.8667 243.998 33.548 244.707 34.052C245.417 34.556 246.369 34.808 247.563 34.808C248.329 34.808 249.075 34.7427 249.803 34.612C250.55 34.4627 251.157 34.2853 251.623 34.08L252.183 37.468C251.959 37.58 251.661 37.692 251.287 37.804C250.914 37.916 250.494 38.0093 250.027 38.084C249.579 38.1773 249.094 38.252 248.571 38.308C248.049 38.364 247.526 38.392 247.003 38.392C245.678 38.392 244.521 38.196 243.531 37.804C242.561 37.412 241.749 36.88 241.095 36.208C240.461 35.5173 239.985 34.7053 239.667 33.772C239.369 32.8387 239.219 31.8307 239.219 30.748ZM249.019 29.152C249.001 28.7973 248.935 28.452 248.823 28.116C248.73 27.78 248.571 27.4813 248.347 27.22C248.142 26.9587 247.871 26.744 247.535 26.576C247.218 26.408 246.817 26.324 246.331 26.324C245.865 26.324 245.463 26.408 245.127 26.576C244.791 26.7253 244.511 26.9307 244.287 27.192C244.063 27.4533 243.886 27.7613 243.755 28.116C243.643 28.452 243.559 28.7973 243.503 29.152H249.019ZM254.731 30.636C254.731 29.572 254.899 28.5733 255.235 27.64C255.589 26.688 256.093 25.8667 256.747 25.176C257.4 24.4667 258.193 23.9067 259.127 23.496C260.06 23.0853 261.124 22.88 262.319 22.88C263.103 22.88 263.821 22.9547 264.475 23.104C265.128 23.2347 265.763 23.4307 266.379 23.692L265.511 27.024C265.119 26.8747 264.689 26.744 264.223 26.632C263.756 26.52 263.233 26.464 262.655 26.464C261.423 26.464 260.499 26.8467 259.883 27.612C259.285 28.3773 258.987 29.3853 258.987 30.636C258.987 31.9613 259.267 32.988 259.827 33.716C260.405 34.444 261.404 34.808 262.823 34.808C263.327 34.808 263.868 34.7613 264.447 34.668C265.025 34.5747 265.557 34.4253 266.043 34.22L266.631 37.636C266.145 37.8413 265.539 38.0187 264.811 38.168C264.083 38.3173 263.28 38.392 262.403 38.392C261.059 38.392 259.901 38.196 258.931 37.804C257.96 37.3933 257.157 36.8427 256.523 36.152C255.907 35.4613 255.449 34.6493 255.151 33.716C254.871 32.764 254.731 31.7373 254.731 30.636ZM268.451 19.604L272.623 18.932V23.272H277.635V26.744H272.623V31.924C272.623 32.8013 272.772 33.5013 273.071 34.024C273.388 34.5467 274.013 34.808 274.947 34.808C275.395 34.808 275.852 34.7707 276.319 34.696C276.804 34.6027 277.243 34.4813 277.635 34.332L278.223 37.58C277.719 37.7853 277.159 37.9627 276.543 38.112C275.927 38.2613 275.171 38.336 274.275 38.336C273.136 38.336 272.193 38.1867 271.447 37.888C270.7 37.5707 270.103 37.1413 269.655 36.6C269.207 36.04 268.889 35.368 268.703 34.584C268.535 33.8 268.451 32.932 268.451 31.98V19.604Z" fill="#2B2A29"/>
+</g>
+<defs>
+<clipPath id="clip0_707:482">
+<rect width="280" height="56" fill="white"/>
+</clipPath>
+</defs>
+</svg>