5 files changed, 28 insertions, 8 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
index 6e7c891da..94882de77 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
@@ -145,7 +145,10 @@ public final class Linker implements Serializable {
 
 		//Assertion storage
 		this.assertions.put(source, attrResponse);
-
+        // previously: getTotalPersonalAttributeList() in both cases
+		if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY )
+			this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList());
+		else
 		this.attributeProvidersMap.put(source, attrResponse.getPersonalAttributeList());
 		//this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList());
 	}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
index 5da9ba494..f2493db4e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
@@ -325,8 +325,13 @@ public enum PEPSErrors {
   /**
    * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier.
    */
-  COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML");
-  
+  COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML"),
+
+  /**
+   * Represents the 'invalid.attr.country.code' constant error identifier.
+   */
+  INVALID_COUNTRY_CODE("invalid.attr.country.code");
+
   /**
    * Represents the constant's value.
    */
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
index 15c2ae552..dd534499d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
@@ -407,10 +407,17 @@ public enum PEPSParameters {
    * Represents the 'spCountry' constant value.
    */
   SPCOUNTRY("spCountry"),
+
   /**
    * Represents the 'spInstitution' constant value.
    */
   SPINSTITUTION("spInstitution"),
+
+  /**
+   * Represents the 'spCountryCode' constant value.
+   */
+  SP_COUNTRY_CODE("spCountryCode"),
+
   /**
    * Represents the 'storkAttribute.number' parameter constant.
    */
@@ -598,7 +605,12 @@ public enum PEPSParameters {
   /**
    * Represents the 'complexAttrListOpt' parameter constant.
    */
-  COMPLEX_ATTR_LIST_OPT("complexAttrListOpt");
+  COMPLEX_ATTR_LIST_OPT("complexAttrListOpt"),
+  /**
+   * Represents the 'idPDerivedAttrList' parameter constant.
+   */
+
+  IDP_DERIVED_ATTR_LIST("idPDerivedAttrList");
 
   /**
    * Represents the constant's value.
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
index 1974f4f66..276b26a03 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
@@ -38,7 +38,7 @@ public class STORKAttrQueryResponse implements Serializable {
   private String subStatusCode;
   
   /** Audience restriction. */
-  private transient String audienceRest;
+  private String audienceRest;
   
   /** Error message. */
   private String message;
@@ -65,7 +65,7 @@ public class STORKAttrQueryResponse implements Serializable {
   private List<Assertion> assertions;
   
   /** The complete list from all assertions **/
-  private transient IPersonalAttributeList totalAttributeList = new PersonalAttributeList();
+  private IPersonalAttributeList totalAttributeList = new PersonalAttributeList();
   
   /** All personal attribute lists **/
   private List<IPersonalAttributeList> attributeLists;
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
index c4a3e2b6c..62a5343ec 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
@@ -47,7 +47,7 @@ public final class STORKAuthnResponse implements Serializable {
   private String subStatusCode;
   
   /** Audience restriction. */
-  private transient String audienceRest;
+  private String audienceRest;
   
   /** Error message. */
   private String message;
@@ -74,7 +74,7 @@ public final class STORKAuthnResponse implements Serializable {
   private List<Assertion> assertions;
   
   /** The complete list from all assertions **/
-  private transient IPersonalAttributeList totalAttributeList = new PersonalAttributeList();
+  private IPersonalAttributeList totalAttributeList = new PersonalAttributeList();
   
   /** All personal attribute lists **/
   private List<IPersonalAttributeList> attributeLists;