Changeset 3160

Timestamp:

07/18/13 16:02:09 (11 years ago)

Author:

andmor

Message:

Changed if-then-else block logic.
Fixed problem when logging the 'principal' value (was logging the value of its reference instead) by adding an assignment for active:findPrincipal request and logging the assigment variable.

File:

• cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.interface.rest/interface/findUser.dpml (modified) (2 diffs)

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.interface.rest/interface/findUser.dpml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sequence debug="false">
+<sequence debug="true">
         <!-- first find the Shibboleth principal -->
-        <request>
+        <request assignment="principal">
                 <identifier>active:findPrincipal</identifier>
-                <argument name="request">arg:request</argument>
         </request>
         <!-- check if the principal belongs to a known user -->
@@ -12 +11 @@
                                 <verb>EXISTS</verb>
                                 <identifier>active:org.isocat.schemacat.access.data.user</identifier>
-                                <argument name="principal">scratch:principal</argument>
+                                <argument name="principal">this:principal</argument>
                         </request>
                 </cond>
-                <then>
-                        <!-- user is known -->
-                        <request assignment="user">
-                                <identifier>active:org.isocat.schemacat.access.data.user</identifier>
-                                <argument name="principal">scratch:principal</argument>
-                        </request>
-                </then>
                 <else>
                         <!-- user is unknown, create it -->
-                        <request assignment="user">
+                        <request>
                                 <verb>NEW</verb>
                                 <identifier>active:org.isocat.schemacat.access.data.user</identifier>
-                                <argument name="principal">scratch:principal</argument>
+                                <argument name="principal">this:principal</argument>
                         </request>
                 </else>
         </if>
+        <!-- get user -->
+        <request assignment="user">
+                <identifier>active:org.isocat.schemacat.access.data.user</identifier>
+                <argument name="principal">this:principal</argument>
+        </request>
         <sloot-debug>
                 <request>