metadata for nonce

Evolveum · Nov 6, 2016 · eed869f · eed869f
1 parent 9c68835
commit eed869f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3420,4 +3420,5 @@ PageXmlDataReview.aceEditorPanelTitle='{0}' historical xml data {1}
 PageLogin.selfRegistration=Sign up
 PageSelfRegistration.registration.failed.unsatisfied.registration.configuration=Registration process not allowed. Please contact system administrator.
 ObjectHistoryTabPanel.viewHistoricalObjectDataTitle=View object data
-ObjectHistoryTabPanel.viewHistoricalObjectXmlTitle=View object xml
+ObjectHistoryTabPanel.viewHistoricalObjectXmlTitle=View object xml
+PageRegistrationConfirmation.bad.credentials=Invalid username or password
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
@@ -29,6 +29,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.NonceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationalStateType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.PasswordType;
@@ -187,6 +188,9 @@ public abstract class SchemaConstants {
 	public static final ItemPath PATH_PASSWORD = new ItemPath(C_CREDENTIALS, CredentialsType.F_PASSWORD);
 	public static final ItemPath PATH_PASSWORD_VALUE = new ItemPath(C_CREDENTIALS, CredentialsType.F_PASSWORD,
 			PasswordType.F_VALUE);
+	public static final ItemPath PATH_NONCE = new ItemPath(C_CREDENTIALS, CredentialsType.F_NONCE);
+	public static final ItemPath PATH_NONCE_VALUE = new ItemPath(C_CREDENTIALS, CredentialsType.F_NONCE,
+			NonceType.F_VALUE);
 	public static final ItemPath PATH_ACTIVATION = new ItemPath(C_ACTIVATION);
 	public static final ItemPath PATH_ACTIVATION_ADMINISTRATIVE_STATUS = new ItemPath(C_ACTIVATION,
 			ActivationType.F_ADMINISTRATIVE_STATUS);

diff --git a/...l/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java b/...l/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
@@ -85,6 +85,7 @@ public <F extends FocusType> void processFocusCredentials(LensContext<F> context
 			XMLGregorianCalendar now, Task task, OperationResult result) throws ExpressionEvaluationException,
 					ObjectNotFoundException, SchemaException, PolicyViolationException {
 		processFocusPassword(context, now, task, result);
+		processFocusNonce(context, now, task, result);
 	}
 
 	private <F extends FocusType> void processFocusPassword(LensContext<F> context, XMLGregorianCalendar now,
@@ -112,6 +113,27 @@ <F extends ObjectType> void processProjectionCredentials(LensContext<F> context,
 
 		passwordPolicyProcessor.processPasswordPolicy(projectionContext, context, task, result);
 	}
+
+	//for now just saving metadata
+	private <F extends FocusType> void processFocusNonce(LensContext<F> context, XMLGregorianCalendar now,
+			Task task, OperationResult result) throws ExpressionEvaluationException, ObjectNotFoundException,
+					SchemaException, PolicyViolationException {
+
+		processFocusCredentialsCommon(context, SchemaConstants.PATH_NONCE, now, task, result);
+//		
+//
+//		ObjectDelta<F> focusDelta = focusContext.getDelta();
+//		
+//		if (hasValueDelta(focusDelta, SchemaConstants.PATH_NONCE)) {
+//			Collection<? extends ItemDelta<?, ?>> metaDeltas = LensUtil.createModifyMetadataDeltas(
+//					context, SchemaConstants.PATH_NONCE.subPath(AbstractCredentialType.F_METADATA),
+//					focusContext.getObjectDefinition(), now, task);
+//			for (ItemDelta<?, ?> metaDelta : metaDeltas) {
+//				context.getFocusContext().swallowToSecondaryDelta(metaDelta);
+//			}
+//		}
+
+	}
 
 	private <F extends FocusType> void processProjectionPassword(LensContext<F> context,
 			final LensProjectionContext projCtx, XMLGregorianCalendar now, Task task, OperationResult result)