adding deprecated tag for elements resertMail, resetSms and resretSec…

…Question
Evolveum · Nov 30, 2021 · 3a2d68b · 3a2d68b
1 parent e64129d
commit 3a2d68b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/ResetPolicyDto.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/ResetPolicyDto.java
@@ -43,19 +43,10 @@ public void initResetPolicyDto(SecurityPolicyType securityPolicyType) throws Sch
             return;
         }
 
-//        if (securityPolicyType.getCredentials() != null
-//                && securityPolicyType.getCredentials().getSecurityQuestions() != null) {
-//            this.securityQuestions = securityPolicyType.getCredentials().getSecurityQuestions();
-//            resetMethod.add(ResetMethod.SECURITY_QUESTIONS);
-//            return;
-//        }
-
         if (securityPolicyType.getCredentialsReset() == null) {
             return;
         }
 
-
-
         MailResetPolicyType mailResetPolicy = securityPolicyType.getCredentialsReset().getMailReset();
         if (mailResetPolicy != null) {
             this.resetMethod = ResetMethod.MAIL;
@@ -82,7 +73,10 @@ public void initResetPolicyDto(SecurityPolicyType securityPolicyType) throws Sch
 
     private void initResetPolicy(AbstractCredentialsResetPolicyType resetPolicy,
             SecurityPolicyType securityPolicyType) throws SchemaException {
-        this.formRef = resetPolicy.getFormRef();
+        this.formRef = securityPolicyType.getCredentialsReset().getFormRef();
+        if (this.formRef == null) {
+            this.formRef = resetPolicy.getFormRef();
+        }
         AbstractAuthenticationPolicyType authPolicy = SecurityPolicyUtil
                 .getAuthenticationPolicy(resetPolicy.getAdditionalAuthenticationName(), securityPolicyType);
         if (authPolicy instanceof MailAuthenticationPolicyType) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationBase.java
@@ -82,8 +82,6 @@ private void initPostAuthenticationConfiguration() {
     }
 
     private void initResetCredentialsConfiguration() {
-
-        // TODO: cleanup, the same as in the PageRegistrationBase
         SecurityPolicyType securityPolicy = resolveSecurityPolicy();
 
         this.resetPasswordPolicy = new ResetPolicyDto();

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd
@@ -113,7 +113,7 @@
                     <xsd:appinfo>
                         <a:deprecated>true</a:deprecated>
                         <a:deprecatedSince>4.1</a:deprecatedSince>
-                        <a:plannedRemoval>4.5</a:plannedRemoval>
+                        <a:plannedRemoval>4.6</a:plannedRemoval>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
@@ -122,7 +122,7 @@
                     <xsd:appinfo>
                         <a:deprecated>true</a:deprecated>
                         <a:deprecatedSince>4.1</a:deprecatedSince>
-                        <a:plannedRemoval>4.5</a:plannedRemoval>
+                        <a:plannedRemoval>4.6</a:plannedRemoval>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
@@ -1573,13 +1573,41 @@
             </xsd:element>
             <!-- Later: delivery -->
             <xsd:element name="securityQuestionReset" type="tns:SecurityQuestionsResetPolicyType" minOccurs="0">
-                <!-- This will be deprecated soon -->
+                <xsd:annotation>
+                    <xsd:appinfo>
+                        <a:deprecated>true</a:deprecated>
+                        <a:deprecatedSince>4.5</a:deprecatedSince>
+                        <a:plannedRemoval>4.6</a:plannedRemoval>
+                    </xsd:appinfo>
+                </xsd:annotation>
             </xsd:element>
             <xsd:element name="mailReset" type="tns:MailResetPolicyType" minOccurs="0">
-                <!-- This will be deprecated soon -->
+                <xsd:annotation>
+                    <xsd:appinfo>
+                        <a:deprecated>true</a:deprecated>
+                        <a:deprecatedSince>4.5</a:deprecatedSince>
+                        <a:plannedRemoval>4.6</a:plannedRemoval>
+                    </xsd:appinfo>
+                </xsd:annotation>
             </xsd:element>
             <xsd:element name="smsReset" type="tns:SmsResetPolicyType" minOccurs="0">
-                <!-- This will be deprecated soon -->
+                <xsd:annotation>
+                    <xsd:appinfo>
+                        <a:deprecated>true</a:deprecated>
+                        <a:deprecatedSince>4.5</a:deprecatedSince>
+                        <a:plannedRemoval>4.6</a:plannedRemoval>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="formRef" type="c:ObjectReferenceType" minOccurs="0" maxOccurs="1">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Reference to form which is displayed for registration
+                    </xsd:documentation>
+                    <xsd:appinfo>
+                        <a:objectReferenceTargetType>tns:FormType</a:objectReferenceTargetType>
+                    </xsd:appinfo>
+                </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
     </xsd:complexType>