@@ -447,11 +447,15 @@ if (!errors.isEmpty()) {
447447 String nameId = auth.getNameId();
448448 String nameIdFormat = auth.getNameIdFormat();
449449 String sessionIndex = auth.getSessionIndex();
450+ String nameidNameQualifier = auth.getNameIdNameQualifier();
451+ String nameidSPNameQualifier = auth.getNameIdNameQualifier();
450452
451453 session.setAttribute("attributes", attributes);
452454 session.setAttribute("nameId", nameId);
453455 session.setAttribute("nameIdFormat", nameIdFormat);
454456 session.setAttribute("sessionIndex", sessionIndex);
457+ session.setAttribute("nameidNameQualifier", nameidNameQualifier);
458+ session.setAttribute("nameidSPNameQualifier", nameidSPNameQualifier);
455459
456460 String relayState = request.getParameter("RelayState");
457461
@@ -531,6 +535,14 @@ String nameIdFormat = null;
531535if (session.getAttribute("nameIdFormat") != null) {
532536 nameIdFormat = session.getAttribute("nameIdFormat").toString();
533537}
538+ String nameidNameQualifier = null;
539+ if (session.getAttribute("nameidNameQualifier") != null) {
540+ nameIdFormat = session.getAttribute("nameidNameQualifier").toString();
541+ }
542+ String nameidSPNameQualifier = null;
543+ if (session.getAttribute("nameidSPNameQualifier") != null) {
544+ nameidSPNameQualifier = session.getAttribute("nameidSPNameQualifier").toString();
545+ }
534546String sessionIndex = null;
535547if (session.getAttribute("sessionIndex") != null) {
536548 sessionIndex = session.getAttribute("sessionIndex").toString();
0 commit comments