Follow up on PR #628: formatting changes only to reduce indentation a…

…nd better match convention used elsewhere, no functional changes
moqui · Jan 10, 2024 · f1f5f05 · f1f5f05
1 parent a2fb0f4
commit f1f5f05
Showing 1 changed file with 19 additions and 30 deletions.
diff --git a/framework/service/org/moqui/impl/UserServices.xml b/framework/service/org/moqui/impl/UserServices.xml
@@ -33,36 +33,25 @@ along with this software (see the LICENSE.md file). If not, see
  <parameter name="loggedIn" type="Boolean"/>
  </out-parameters>
  <actions>
- <if condition="ec.web?.sessionAttributes?.moquiPreAuthcUsername">
- <then>
- <!-- already pre-auth'ed, verify code below -->
- <set field="username" from="ec.web?.sessionAttributes?.moquiPreAuthcUsername"/>
- </then>
- <else>
- <!-- no pre-auth, try logging in (pre-auth if 2nd factor required) -->
- <set field="loggedIn" from="ec.user.loginUser(username, password)"/>
- </else>
- </if>
- <if condition="ec.web.sessionAttributes.moquiAuthcFactorRequired">
- <then>
- <if condition="code">
- <then>
- <service-call name="org.moqui.impl.UserServices.validate#ExternalUserAuthcCode"
- in-map="[code:code]"
- out-map="validateOut"/>
- <if condition="validateOut.verified">
- <then>
- <set field="loggedIn" from="ec.user.internalLoginUser(validateOut.username)"/>
- </then>
- <else>
- <message type="danger" public="true">Authentication code is not valid</message>
- </else>
- </if>
- </then>
- <else>
- <service-call name="org.moqui.impl.UserServices.get#ExternalUserAuthcFactorInfo" out-map="context"/>
- </else>
- </if>
+ <if condition="ec.web?.sessionAttributes?.moquiPreAuthcUsername"><then>
+ <!-- already pre-auth'ed, verify code below -->
+ <set field="username" from="ec.web?.sessionAttributes?.moquiPreAuthcUsername"/>
+ </then><else>
+ <!-- no pre-auth, try logging in (pre-auth if 2nd factor required) -->
+ <set field="loggedIn" from="ec.user.loginUser(username, password)"/>
+ </else></if>
+ <if condition="ec.web.sessionAttributes.moquiAuthcFactorRequired"><then>
+ <if condition="code"><then>
+ <service-call name="org.moqui.impl.UserServices.validate#ExternalUserAuthcCode"
+ in-map="[code:code]" out-map="validateOut"/>
+ <if condition="validateOut.verified"><then>
+ <set field="loggedIn" from="ec.user.internalLoginUser(validateOut.username)"/>
+ </then><else>
+ <message type="danger" public="true">Authentication code is not valid</message>
+ </else></if>
+ </then><else>
+ <service-call name="org.moqui.impl.UserServices.get#ExternalUserAuthcFactorInfo" out-map="context"/>
+ </else></if>
  </then></if>
  </actions>
  </service>