From 24d8f1d58bd89cb1474be27a00c13105c09fa31e Mon Sep 17 00:00:00 2001
From: Fabrice Lecomte <fabrice.lecomte.be@gmail.com>
Date: Fri, 4 Sep 2020 11:10:22 +0200
Subject: [PATCH] Fix route /citizens/current if not logged

---
 .idea/runConfigurations/Run_dependencies.xml |  1 +
 .idea/runConfigurations/Run_for_dev.xml      |  7 +++++++
 src/main/kotlin/routes/Citizen.kt            | 10 +++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 .idea/runConfigurations/Run_for_dev.xml

diff --git a/.idea/runConfigurations/Run_dependencies.xml b/.idea/runConfigurations/Run_dependencies.xml
index 41c2d87..84ae74c 100644
--- a/.idea/runConfigurations/Run_dependencies.xml
+++ b/.idea/runConfigurations/Run_dependencies.xml
@@ -17,6 +17,7 @@
             <option value="elasticsearch" />
             <option value="rabbitmq" />
             <option value="redis" />
+            <option value="openapi" />
           </list>
         </option>
         <option name="sourceFilePath" value="docker-compose.yml" />
diff --git a/.idea/runConfigurations/Run_for_dev.xml b/.idea/runConfigurations/Run_for_dev.xml
new file mode 100644
index 0000000..856ec6c
--- /dev/null
+++ b/.idea/runConfigurations/Run_for_dev.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run for dev" type="CompoundRunConfigurationType">
+    <toRun name="Run" type="GradleRunConfiguration" />
+    <toRun name="Run dependencies" type="docker-deploy" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/src/main/kotlin/routes/Citizen.kt b/src/main/kotlin/routes/Citizen.kt
index 684174b..b693882 100644
--- a/src/main/kotlin/routes/Citizen.kt
+++ b/src/main/kotlin/routes/Citizen.kt
@@ -2,6 +2,7 @@ package fr.dcproject.routes
 
 import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
 import fr.dcproject.citizen
+import fr.dcproject.citizenOrNull
 import fr.dcproject.entity.Citizen
 import fr.dcproject.routes.CitizenPaths.ChangePasswordCitizenRequest
 import fr.dcproject.routes.CitizenPaths.CitizenRequest
@@ -68,9 +69,12 @@ fun Route.citizen(
     }
 
     get<CurrentCitizenRequest> {
-        assertCan(VIEW, citizen)
-
-        call.respond(citizen)
+        if (citizenOrNull === null) {
+            call.respond(HttpStatusCode.Unauthorized)
+        } else {
+            assertCan(VIEW, citizen)
+            call.respond(citizen)
+        }
     }
 
     put<ChangePasswordCitizenRequest> {