diff --git a/myconext-gui/src/routes/Service.svelte b/myconext-gui/src/routes/Service.svelte
index bd2570fe..6ac9f17b 100644
--- a/myconext-gui/src/routes/Service.svelte
+++ b/myconext-gui/src/routes/Service.svelte
@@ -84,7 +84,7 @@
padding: 15px 10px;
&.details {
- font-weight: bold;
+ font-weight: 600;
div.content {
display: flex;
@@ -113,14 +113,14 @@
&.value {
width: 62%;
- font-weight: bold;
+ font-weight: 600;
ul {
list-style: disc outside none;
margin-left: 18px;
li {
- font-weight: bold;
+ font-weight: 600;
&:not(:last-child) {
margin-bottom: 5px;
diff --git a/myconext-gui/src/routes/Services.svelte b/myconext-gui/src/routes/Services.svelte
index 2d8b4205..1eda1aa7 100644
--- a/myconext-gui/src/routes/Services.svelte
+++ b/myconext-gui/src/routes/Services.svelte
@@ -71,7 +71,7 @@
td.value {
width: 70%;
- font-weight: bold;
+ font-weight: 600;
padding: 20px;
}
diff --git a/myconext-gui/src/routes/Start.svelte b/myconext-gui/src/routes/Start.svelte
index ac7c307c..2dc89066 100644
--- a/myconext-gui/src/routes/Start.svelte
+++ b/myconext-gui/src/routes/Start.svelte
@@ -95,7 +95,7 @@
margin-bottom: 36px;
span.info-bold {
- font-weight: bold;
+ font-weight: 600;
}
}
diff --git a/myconext-gui/src/routes/SubjectAlreadyLinked.svelte b/myconext-gui/src/routes/SubjectAlreadyLinked.svelte
index e36a3a94..77edce1c 100644
--- a/myconext-gui/src/routes/SubjectAlreadyLinked.svelte
+++ b/myconext-gui/src/routes/SubjectAlreadyLinked.svelte
@@ -21,7 +21,7 @@
h1 {
color: var(--color-primary-red);
font-size: 32px;
- font-weight: bold;
+ font-weight: 600;
margin: 22px 0;
}
diff --git a/myconext-gui/src/routes/WebAuthn.svelte b/myconext-gui/src/routes/WebAuthn.svelte
index d09e68c3..116a447a 100644
--- a/myconext-gui/src/routes/WebAuthn.svelte
+++ b/myconext-gui/src/routes/WebAuthn.svelte
@@ -42,7 +42,7 @@
}
label {
- font-weight: bold;
+ font-weight: 600;
margin: 33px 0 13px 0;
display: inline-block;
}
diff --git a/myconext-gui/src/routes/tiqr/DeactivateApp.svelte b/myconext-gui/src/routes/tiqr/DeactivateApp.svelte
index f564dc05..8254f252 100644
--- a/myconext-gui/src/routes/tiqr/DeactivateApp.svelte
+++ b/myconext-gui/src/routes/tiqr/DeactivateApp.svelte
@@ -89,7 +89,7 @@
}
label {
- font-weight: bold;
+ font-weight: 600;
margin: 33px 0 13px 0;
display: inline-block;
}
diff --git a/myconext-gui/src/routes/tiqr/RecoveryCode.svelte b/myconext-gui/src/routes/tiqr/RecoveryCode.svelte
index 2ce82c7f..c7357bd1 100644
--- a/myconext-gui/src/routes/tiqr/RecoveryCode.svelte
+++ b/myconext-gui/src/routes/tiqr/RecoveryCode.svelte
@@ -82,8 +82,8 @@
span {
margin: auto;
- font-size: 18px;
- font-weight: bold;
+ font-size: 20px;
+ font-weight: 600;
}
}
diff --git a/myconext-gui/src/routes/tiqr/UseApp.svelte b/myconext-gui/src/routes/tiqr/UseApp.svelte
index 7c146cd4..e1c7bb9c 100644
--- a/myconext-gui/src/routes/tiqr/UseApp.svelte
+++ b/myconext-gui/src/routes/tiqr/UseApp.svelte
@@ -150,7 +150,7 @@
}
span.note {
- font-weight: bold;
+ font-weight: 600;
}
}
diff --git a/myconext-gui/src/verify/ServiceDesk.svelte b/myconext-gui/src/verify/ServiceDesk.svelte
new file mode 100644
index 00000000..827e0c44
--- /dev/null
+++ b/myconext-gui/src/verify/ServiceDesk.svelte
@@ -0,0 +1,193 @@
+
+
+
+
+
+ {#if step === 0}
+
+
{I18n.t("verify.serviceDesk.confirmIdentity")}
+
{I18n.t("verify.serviceDesk.stepsHeader")}
+
+ {I18n.t("verify.serviceDesk.step1")}
+ {I18n.t("verify.serviceDesk.step2")}
+ {I18n.t("verify.serviceDesk.step3")}
+
+
+ {@html alertSvg}
+
+
{@html I18n.t("verify.serviceDesk.acceptedIds")}
+
+ {@html I18n.t("verify.serviceDesk.passports")}
+ {@html I18n.t("verify.serviceDesk.eea")}
+ {@html I18n.t("verify.serviceDesk.driverLicense")}
+ {@html I18n.t("verify.serviceDesk.residencePermit")}
+
+
{I18n.t("verify.serviceDesk.note")}
+
{@html I18n.t("verify.serviceDesk.eeaNote")}
+
+
+
step = 1}/>
+ {:else if (step === 1)}
+
+ {@html idCard}
+
+ {I18n.t("verify.serviceDesk.idCard.information")}
+ {I18n.t("verify.serviceDesk.idCard.lastName")}
+ {I18n.t("verify.serviceDesk.idCard.firstName")}
+ {I18n.t("verify.serviceDesk.idCard.dateOfBirth")}
+ generateControlCode()}/>
+ {/if}
+
+
diff --git a/myconext-gui/src/verify/VerifyChoice.svelte b/myconext-gui/src/verify/VerifyChoice.svelte
index 68307b59..cd651d2c 100644
--- a/myconext-gui/src/verify/VerifyChoice.svelte
+++ b/myconext-gui/src/verify/VerifyChoice.svelte
@@ -11,12 +11,15 @@
import {logo} from "./banks";
import alertSvg from "../icons/alert-circle.svg?raw";
import Spinner from "../components/Spinner.svelte";
+ import ServiceDesk from "./ServiceDesk.svelte";
+ import {onMount} from "svelte";
export let addInstitution;
export let addBank;
export let addEuropean;
export let issuers;
export let showIdinOptions;
+ export let showServiceDesk = false;
let showOtherOptions = false;
let showBankOptions = false;
@@ -98,6 +101,7 @@
&:hover {
background-color: var(--color-background);
}
+
p {
margin: auto;
}
@@ -124,7 +128,7 @@
span {
color: var(--color-primary-blue);
- font-weight: bold;
+ font-weight: 600;
}
}
@@ -148,7 +152,7 @@
- {#if !showBankOptions || busyProcessing}
+ {#if !showServiceDesk && (!showBankOptions || busyProcessing)}
{showIdinOptions ? I18n.t("verify.modal.info.please") : I18n.t("profile.addInstitutionInfo")}
@@ -166,16 +170,16 @@
onClick={() => proceed(addInstitution)}/>
- {#if !showOtherOptions && $config.featureIdVerify && showIdinOptions}
+ {#if !showOtherOptions && $config.featureIdVerify && showIdinOptions && !showServiceDesk}
showOtherOptions = !showOtherOptions}>
{I18n.t("verify.modal.info.other")}
{/if}
- {#if showOtherOptions}
+ {#if showOtherOptions && !showServiceDesk}
{I18n.t("verify.modal.info.verifyBank")}
- {@html bankIcon}
+ {@html bankIcon}
proceed(addEuropean)}/>
-
- {@html I18n.t("verify.modal.info.help")}
+
showServiceDesk = !showServiceDesk}>
+
{I18n.t("verify.modal.info.cantUse")}
{/if}
{/if}
- {#if showBankOptions && !busyProcessing}
+ {#if showBankOptions && !busyProcessing && !showServiceDesk}
{/if}
-{#if showBankOptions && !busyProcessing}
+{#if showBankOptions && !busyProcessing && !showServiceDesk}
{@html alertSvg}
{I18n.t("verify.modal.bank.anotherMethodPrefix")}
@@ -239,3 +243,7 @@
{/if}
+{#if !busyProcessing && showServiceDesk}
+
showServiceDesk = false}/>
+{/if}
+
diff --git a/myconext-server/src/main/java/myconext/api/LoginController.java b/myconext-server/src/main/java/myconext/api/LoginController.java
index 1393098d..5671cb7e 100644
--- a/myconext-server/src/main/java/myconext/api/LoginController.java
+++ b/myconext-server/src/main/java/myconext/api/LoginController.java
@@ -1,27 +1,38 @@
package myconext.api;
import io.swagger.v3.oas.annotations.Hidden;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import myconext.exceptions.UserNotFoundException;
+import myconext.model.SamlAuthenticationRequest;
import myconext.model.User;
+import myconext.repository.AuthenticationRequestRepository;
import myconext.repository.UserRepository;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.context.SecurityContextRepository;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.util.UriComponents;
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
import static myconext.security.GuestIdpAuthenticationRequestFilter.REGISTER_MODUS_COOKIE_NAME;
import static org.springframework.security.web.context.HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY;
@@ -30,12 +41,18 @@
@Hidden
public class LoginController {
+ private static final Log LOG = LogFactory.getLog(LoginController.class);
+
private final boolean secureCookie;
private final Map config = new HashMap<>();
private final UserRepository userRepository;
+ private final AuthenticationRequestRepository authenticationRequestRepository;
+ private final SecurityContextRepository securityContextRepository;
public LoginController(UserRepository userRepository,
+ AuthenticationRequestRepository authenticationRequestRepository,
+ SecurityContextRepository securityContextRepository,
@Value("${base_path}") String basePath,
@Value("${base_domain}") String baseDomain,
@Value("${my_conext_url}") String myConextUrl,
@@ -59,6 +76,7 @@ public LoginController(UserRepository userRepository,
@Value("${mobile_app_redirect}") String mobileAppRedirect,
@Value("${feature.id_verify}") boolean idVerify
) {
+ this.config.put("basePath", basePath);
this.config.put("loginUrl", basePath + "/login");
this.config.put("continueAfterLoginUrl", continueAfterLoginUrl);
this.config.put("baseDomain", baseDomain);
@@ -83,6 +101,8 @@ public LoginController(UserRepository userRepository,
this.config.put("featureIdVerify", idVerify);
this.secureCookie = secureCookie;
this.userRepository = userRepository;
+ this.authenticationRequestRepository = authenticationRequestRepository;
+ this.securityContextRepository = securityContextRepository;
}
@GetMapping("/config")
@@ -123,6 +143,33 @@ public void register(@PathVariable("enrollmentVerificationKey") String enrollmen
response.sendRedirect(redirectLocation);
}
+ @GetMapping("/servicedesk/{id}")
+ @Hidden
+ public ResponseEntity redirectToSPServiceDeskHook(@PathVariable("id") String id,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ Optional optionalSamlAuthenticationRequest = authenticationRequestRepository.findByIdAndNotExpired(id);
+ if (!optionalSamlAuthenticationRequest.isPresent()) {
+ String idpBaseUrl = (String) this.config.get("idpBaseUrl");
+ return ResponseEntity.status(HttpStatus.FOUND).location(URI.create(idpBaseUrl + "/expired")).build();
+ }
+ SamlAuthenticationRequest samlAuthenticationRequest = optionalSamlAuthenticationRequest.get();
+ String userId = samlAuthenticationRequest.getUserId();
+ User user = userRepository.findById(userId).orElseThrow(() -> new UserNotFoundException(userId));
+
+ UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(user, null,
+ user.getAuthorities());
+ SecurityContext context = SecurityContextHolder.getContext();
+ context.setAuthentication(authentication);
+ this.securityContextRepository.saveContext(SecurityContextHolder.getContext(), request, response);
+
+ String redirectUrl = String.format("%s/personal?servicedesk=start", this.config.get("spBaseUrl"));
+
+ LOG.info(String.format("User %s logged in to process servicedesk request. Redirecting to %s", user.getEmail(), redirectUrl));
+
+ return ResponseEntity.status(HttpStatus.FOUND).location(URI.create(redirectUrl)).build();
+ }
+
@GetMapping("/doLogin")
public void doLogin(@RequestParam(value = "lang", required = false, defaultValue = "en") String lang,
@RequestParam(value = "location", required = false) String location,
@@ -137,6 +184,9 @@ private void doRedirect(String lang, String location, HttpServletResponse respon
response.setHeader("Set-Cookie", cookieValue);
}
String redirectLocation = StringUtils.hasText(location) ? location : this.config.get("eduIDLoginUrl") + "&lang=" + lang;
+
+ LOG.info(String.format("Redirecting to %s", redirectLocation));
+
response.sendRedirect(redirectLocation);
}
@@ -158,6 +208,9 @@ public void doLogout(HttpServletRequest request,
request.getSession().invalidate();
SecurityContextHolder.clearContext();
String redirectLocation = String.format("%s/landing?%s", this.config.get("spBaseUrl"), param);
+
+ LOG.info(String.format("Logout and redirect to %s", redirectLocation));
+
response.sendRedirect(redirectLocation);
}
@@ -196,12 +249,13 @@ private void doCreateUserFromInstitutionKey(HttpServletRequest request,
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(user, null,
user.getAuthorities());
- SecurityContext context = SecurityContextHolder.getContext();
- context.setAuthentication(authentication);
- HttpSession session = request.getSession();
- session.setAttribute(SPRING_SECURITY_CONTEXT_KEY, context);
+ SecurityContextHolder.getContext().setAuthentication(authentication);
+ this.securityContextRepository.saveContext(SecurityContextHolder.getContext(), request, response);
String redirectLocation = redirectUrl + String.format("?new=%s", newUser ? "true" : "false");
+
+ LOG.info(String.format("User %s create from institutionKey. Redirecting to %s", user.getEmail(), redirectLocation));
+
response.sendRedirect(redirectLocation);
}
}
diff --git a/myconext-server/src/main/java/myconext/model/ControlCode.java b/myconext-server/src/main/java/myconext/model/ControlCode.java
new file mode 100644
index 00000000..3d3c2224
--- /dev/null
+++ b/myconext-server/src/main/java/myconext/model/ControlCode.java
@@ -0,0 +1,21 @@
+package myconext.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ControlCode implements Serializable {
+
+ private String firstName;
+ private String lastName;
+ private String dayOfBirth;
+ @Setter
+ private String code;
+
+}
diff --git a/myconext-server/src/main/java/myconext/model/ExternalLinkedAccount.java b/myconext-server/src/main/java/myconext/model/ExternalLinkedAccount.java
index 64666778..2921bb99 100644
--- a/myconext-server/src/main/java/myconext/model/ExternalLinkedAccount.java
+++ b/myconext-server/src/main/java/myconext/model/ExternalLinkedAccount.java
@@ -124,6 +124,7 @@ public boolean areNamesValidated() {
case eherkenning -> StringUtils.hasText(firstName) && StringUtils.hasText(preferredLastName);
case studielink ->
StringUtils.hasText(firstName) && StringUtils.hasText(legalLastName) && !Verification.Ongeverifieerd.equals(verification);
+ case serviceDesk -> StringUtils.hasText(firstName) && StringUtils.hasText(legalLastName);
};
}
diff --git a/myconext-server/src/main/java/myconext/model/IdpScoping.java b/myconext-server/src/main/java/myconext/model/IdpScoping.java
index 26fb8c2f..44a89dae 100644
--- a/myconext-server/src/main/java/myconext/model/IdpScoping.java
+++ b/myconext-server/src/main/java/myconext/model/IdpScoping.java
@@ -2,5 +2,5 @@
public enum IdpScoping {
- idin, eherkenning, studielink
+ idin, eherkenning, studielink, serviceDesk
}
diff --git a/myconext-server/src/main/java/myconext/model/User.java b/myconext-server/src/main/java/myconext/model/User.java
index 538e4a57..61af4d8f 100644
--- a/myconext-server/src/main/java/myconext/model/User.java
+++ b/myconext-server/src/main/java/myconext/model/User.java
@@ -104,6 +104,9 @@ public class User implements Serializable, UserDetails {
@Setter
private List memberships = new ArrayList<>();
+ @Setter
+ private ControlCode controlCode;
+
public User(CreateInstitutionEduID createInstitutionEduID, Map userInfo) {
this.email = createInstitutionEduID.getEmail();
this.chosenName = (String) userInfo.get("given_name");
diff --git a/myconext-server/src/main/java/myconext/security/SecurityConfiguration.java b/myconext-server/src/main/java/myconext/security/SecurityConfiguration.java
index 3203f79b..6e42eb3f 100644
--- a/myconext-server/src/main/java/myconext/security/SecurityConfiguration.java
+++ b/myconext-server/src/main/java/myconext/security/SecurityConfiguration.java
@@ -58,13 +58,20 @@ public class SecurityConfiguration {
private static final Log LOG = LogFactory.getLog(SecurityConfiguration.class);
+ @Bean
+ public SecurityContextRepository securityContextRepository() {
+ return new DelegatingSecurityContextRepository(
+ new RequestAttributeSecurityContextRepository(),
+ new HttpSessionSecurityContextRepository()
+ );
+ }
+
@Configuration
@Order(1)
@EnableConfigurationProperties(IdentityProviderMetaData.class)
public static class SamlSecurity {
private final GuestIdpAuthenticationRequestFilter guestIdpAuthenticationRequestFilter;
- private final SecurityContextRepository securityContextRepository;
public SamlSecurity(@Value("${private_key_path}") Resource privateKeyPath,
@Value("${certificate_path}") Resource certificatePath,
@@ -95,7 +102,8 @@ public SamlSecurity(@Value("${private_key_path}") Resource privateKeyPath,
MailBox mailBox,
Manage serviceProviderResolver,
IdentityProviderMetaData identityProviderMetaData,
- CookieValueEncoder cookieValueEncoder) {
+ CookieValueEncoder cookieValueEncoder,
+ SecurityContextRepository securityContextRepository) {
ACR.initialize(
linkedInstitution,
validateNames,
@@ -117,7 +125,6 @@ public SamlSecurity(@Value("${private_key_path}") Resource privateKeyPath,
serviceProviders,
requiresSignedAuthnRequest
);
- this.securityContextRepository = securityContextRepository();
this.guestIdpAuthenticationRequestFilter = new GuestIdpAuthenticationRequestFilter(
redirectUrl,
serviceProviderResolver,
@@ -143,15 +150,8 @@ public SamlSecurity(@Value("${private_key_path}") Resource privateKeyPath,
);
}
- private SecurityContextRepository securityContextRepository() {
- return new DelegatingSecurityContextRepository(
- new RequestAttributeSecurityContextRepository(),
- new HttpSessionSecurityContextRepository()
- );
- }
-
@Bean
- public SecurityFilterChain samlSecurityFilterChain(HttpSecurity http) throws Exception {
+ public SecurityFilterChain samlSecurityFilterChain(HttpSecurity http, SecurityContextRepository securityContextRepository) throws Exception {
http
.securityMatcher("/saml/guest-idp/**")
.csrf(csrf -> csrf.disable())
@@ -162,7 +162,7 @@ public SecurityFilterChain samlSecurityFilterChain(HttpSecurity http) throws Exc
.anyRequest().hasRole("GUEST"))
//We need a reference to the securityContextRepository to update the authentication after an InstitutionAdmin invitation accept
.securityContext(securityContextConfigurer ->
- securityContextConfigurer.securityContextRepository(this.securityContextRepository));
+ securityContextConfigurer.securityContextRepository(securityContextRepository));
return http.build();
}
diff --git a/servicedesk-gui/src/icons/Owl_Emblem.svg b/servicedesk-gui/src/icons/Owl_Emblem.svg
deleted file mode 100644
index 0840719f..00000000
--- a/servicedesk-gui/src/icons/Owl_Emblem.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/servicedesk-gui/src/icons/alarm_bell.svg b/servicedesk-gui/src/icons/alarm_bell.svg
deleted file mode 100644
index ab1d5eea..00000000
--- a/servicedesk-gui/src/icons/alarm_bell.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/servicedesk-gui/src/icons/alert-triangle.svg b/servicedesk-gui/src/icons/alert-triangle.svg
new file mode 100644
index 00000000..0d01d2e0
--- /dev/null
+++ b/servicedesk-gui/src/icons/alert-triangle.svg
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
diff --git a/servicedesk-gui/src/icons/calendar-alt.svg b/servicedesk-gui/src/icons/calendar-alt.svg
deleted file mode 100644
index dc757af7..00000000
--- a/servicedesk-gui/src/icons/calendar-alt.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/critical.svg b/servicedesk-gui/src/icons/critical.svg
deleted file mode 100644
index 5868f553..00000000
--- a/servicedesk-gui/src/icons/critical.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/duplicate.svg b/servicedesk-gui/src/icons/duplicate.svg
deleted file mode 100644
index 39e8b996..00000000
--- a/servicedesk-gui/src/icons/duplicate.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/email_new.svg b/servicedesk-gui/src/icons/email_new.svg
deleted file mode 100644
index bf6210d2..00000000
--- a/servicedesk-gui/src/icons/email_new.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/gpt_logo.svg b/servicedesk-gui/src/icons/gpt_logo.svg
new file mode 100644
index 00000000..96386d3c
--- /dev/null
+++ b/servicedesk-gui/src/icons/gpt_logo.svg
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
diff --git a/servicedesk-gui/src/icons/image-not-found.svg b/servicedesk-gui/src/icons/image-not-found.svg
deleted file mode 100644
index b9506206..00000000
--- a/servicedesk-gui/src/icons/image-not-found.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/informational.svg b/servicedesk-gui/src/icons/informational.svg
new file mode 100644
index 00000000..0efe5521
--- /dev/null
+++ b/servicedesk-gui/src/icons/informational.svg
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/landing/collaborate.svg b/servicedesk-gui/src/icons/landing/collaborate.svg
deleted file mode 100644
index f2ea295f..00000000
--- a/servicedesk-gui/src/icons/landing/collaborate.svg
+++ /dev/null
@@ -1,285 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/servicedesk-gui/src/icons/landing/happy.svg b/servicedesk-gui/src/icons/landing/happy.svg
deleted file mode 100644
index 97e6f39d..00000000
--- a/servicedesk-gui/src/icons/landing/happy.svg
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/servicedesk-gui/src/icons/landing/idcard.svg b/servicedesk-gui/src/icons/landing/idcard.svg
new file mode 100644
index 00000000..3565a064
--- /dev/null
+++ b/servicedesk-gui/src/icons/landing/idcard.svg
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/servicedesk-gui/src/icons/landing/landingpage.svg b/servicedesk-gui/src/icons/landing/landingpage.svg
new file mode 100644
index 00000000..b8bb201f
--- /dev/null
+++ b/servicedesk-gui/src/icons/landing/landingpage.svg
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
diff --git a/servicedesk-gui/src/icons/landing/mail.svg b/servicedesk-gui/src/icons/landing/mail.svg
deleted file mode 100644
index b0675b54..00000000
--- a/servicedesk-gui/src/icons/landing/mail.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
diff --git a/servicedesk-gui/src/icons/landing/screen.svg b/servicedesk-gui/src/icons/landing/screen.svg
deleted file mode 100644
index 4888f338..00000000
--- a/servicedesk-gui/src/icons/landing/screen.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/servicedesk-gui/src/icons/landing/sketch.svg b/servicedesk-gui/src/icons/landing/sketch.svg
deleted file mode 100644
index f6affef6..00000000
--- a/servicedesk-gui/src/icons/landing/sketch.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
diff --git a/servicedesk-gui/src/icons/landing/undraw_access_denied_re_awnf.svg b/servicedesk-gui/src/icons/landing/undraw_access_denied_re_awnf.svg
deleted file mode 100644
index 93519348..00000000
--- a/servicedesk-gui/src/icons/landing/undraw_access_denied_re_awnf.svg
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/landing/undraw_authentication_re_svpt.svg b/servicedesk-gui/src/icons/landing/undraw_authentication_re_svpt.svg
deleted file mode 100644
index 709de5f8..00000000
--- a/servicedesk-gui/src/icons/landing/undraw_authentication_re_svpt.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/landing/undraw_enter_uhqk.svg b/servicedesk-gui/src/icons/landing/undraw_enter_uhqk.svg
deleted file mode 100644
index ee873cd9..00000000
--- a/servicedesk-gui/src/icons/landing/undraw_enter_uhqk.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-
- enter
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/landing/undraw_startled_-8-p0r.svg b/servicedesk-gui/src/icons/landing/undraw_startled_-8-p0r.svg
deleted file mode 100644
index 3b1392d8..00000000
--- a/servicedesk-gui/src/icons/landing/undraw_startled_-8-p0r.svg
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-
-
-
- startled
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/landing/undraw_subscriptions_re_k7jj.svg b/servicedesk-gui/src/icons/landing/undraw_subscriptions_re_k7jj.svg
deleted file mode 100644
index 3d37cf27..00000000
--- a/servicedesk-gui/src/icons/landing/undraw_subscriptions_re_k7jj.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/locks.svg b/servicedesk-gui/src/icons/locks.svg
deleted file mode 100644
index 56ea3eee..00000000
--- a/servicedesk-gui/src/icons/locks.svg
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
- Openclipart
-
-
-
- Locks
-
- 2011-02-24T01:51:57
-
- https://openclipart.org/detail/122125/locks-by-dear_theophilus
-
-
-
- dear_theophilus
-
-
-
-
-
- lock
-
- locks
-
- padlock
-
- private
-
- public
-
- safe
-
- secure
-
-
-
-
-
-
-
-
-
diff --git a/servicedesk-gui/src/icons/logo.svg b/servicedesk-gui/src/icons/logo.svg
new file mode 100644
index 00000000..a4b4aa35
--- /dev/null
+++ b/servicedesk-gui/src/icons/logo.svg
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/logo_blue.svg b/servicedesk-gui/src/icons/logo_blue.svg
new file mode 100644
index 00000000..16a7c9e2
--- /dev/null
+++ b/servicedesk-gui/src/icons/logo_blue.svg
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
diff --git a/servicedesk-gui/src/icons/multi-role.svg b/servicedesk-gui/src/icons/multi-role.svg
deleted file mode 100644
index 2320811f..00000000
--- a/servicedesk-gui/src/icons/multi-role.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/servicedesk-gui/src/icons/network-information.svg b/servicedesk-gui/src/icons/network-information.svg
deleted file mode 100644
index 72f2c94c..00000000
--- a/servicedesk-gui/src/icons/network-information.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/owl.wav b/servicedesk-gui/src/icons/owl.wav
deleted file mode 100644
index a3676665..00000000
Binary files a/servicedesk-gui/src/icons/owl.wav and /dev/null differ
diff --git a/servicedesk-gui/src/icons/persons.svg b/servicedesk-gui/src/icons/persons.svg
deleted file mode 100644
index b9b09b56..00000000
--- a/servicedesk-gui/src/icons/persons.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/undraw_High_five.svg b/servicedesk-gui/src/icons/undraw_High_five.svg
new file mode 100644
index 00000000..a9d10497
--- /dev/null
+++ b/servicedesk-gui/src/icons/undraw_High_five.svg
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/undraw_page_not_found_re_e9o6.svg b/servicedesk-gui/src/icons/undraw_page_not_found_re_e9o6.svg
deleted file mode 100644
index 5442a706..00000000
--- a/servicedesk-gui/src/icons/undraw_page_not_found_re_e9o6.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/undraw_people_search_re_5rre.svg b/servicedesk-gui/src/icons/undraw_people_search_re_5rre.svg
deleted file mode 100644
index 5c0d540d..00000000
--- a/servicedesk-gui/src/icons/undraw_people_search_re_5rre.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/icons/undraw_void_-3-ggu.svg b/servicedesk-gui/src/icons/undraw_void_-3-ggu.svg
deleted file mode 100644
index 2288188e..00000000
--- a/servicedesk-gui/src/icons/undraw_void_-3-ggu.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-
- void
-
\ No newline at end of file
diff --git a/servicedesk-gui/src/locale/en.js b/servicedesk-gui/src/locale/en.js
index f39f7765..d1403f9b 100644
--- a/servicedesk-gui/src/locale/en.js
+++ b/servicedesk-gui/src/locale/en.js
@@ -10,12 +10,11 @@ const en = {
},
landing: {
header: {
- title: "Manage access to your applications",
+ title: "ServiceDesk",
login: "Log in",
- sup: "SURFconext Invite is by invitation only.",
+ sup: "EduID ServiceDesk is by invitation only.",
},
works: "How does it work?",
- adminFunction: "admin function",
info: [
//Arrays of titles and info blocks and if a function is an admin function
["Invites", "SURF invites institution managers who can create roles for their applications.
" +