stuff in regards to redirect after login

leihs · Feb 25, 2020 · 13eb063 · 13eb063
1 parent 63882a4
commit 13eb063
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 20 deletions.
diff --git a/client/leihs-ui b/client/leihs-ui
diff --git a/server/shared-clj b/server/shared-clj
diff --git a/server/src/all/leihs/procurement/authorization.clj b/server/src/all/leihs/procurement/authorization.clj
@@ -1,8 +1,12 @@
 (ns leihs.procurement.authorization
   (:require [clojure.tools.logging :as log]
+            [leihs.core.core :refer [presence]]
+            [leihs.core.sign-in.external-authentication.back :as ext-auth]
             [leihs.procurement.env :as env]
+            [leihs.procurement.paths :refer [path]]
             [leihs.procurement.permissions.user :as user-perms]
-            [leihs.procurement.graphql.helpers :as helpers])
+            [leihs.procurement.graphql.helpers :as helpers]
+            [ring.util.response :as response])
   (:import leihs.procurement.UnauthorizedException))
 
 (defn wrap-ensure-one-of
@@ -51,27 +55,34 @@
                          #(check context args value))))
 
 (def skip-authorization-handler-keys
-  [:attachment
-   :image
-   :home ; leads to not-found-handler
-   :not-found ; leads to not-found-handler
-   :procurement ; leads to not-found-handler
-   :sign-in
-   :status
-   :upload])
+  (clojure.set/union #{:attachment
+                       :image
+                       :sign-in
+                       :status
+                       :upload}
+                     ext-auth/skip-authorization-handler-keys))
 
 (defn- skip?
   [handler-key]
   (some #(= handler-key %) skip-authorization-handler-keys))
 
 (defn wrap-authenticate
   [handler]
-  (fn [request]
-    (if (or (skip? (:handler-key request)) (:authenticated-entity request))
-      (handler request)
-      {:status 401,
-       :body (helpers/error-as-graphql-object "NOT_AUTHENTICATED"
-                                              "Not authenticated!")})))
+  (fn [{:keys [uri query-string handler-key] :as request}]
+    (cond
+      (or (skip? handler-key) (:authenticated-entity request))
+        (handler request)
+      (= handler-key :graphql)
+        {:status 401,
+         :body (helpers/error-as-graphql-object "NOT_AUTHENTICATED"
+                                                "Not authenticated!")}
+      :else
+        (response/redirect
+          (path :sign-in
+                nil
+                {:return-to (cond-> uri
+                              (presence query-string)
+                              (str "?" query-string))})))))
 
 (defn wrap-authorize
   [handler]

diff --git a/server/src/all/leihs/procurement/routes.clj b/server/src/all/leihs/procurement/routes.clj
@@ -143,7 +143,6 @@
       wrap-empty
       (wrap-secret-byte-array secret)
       datasource/wrap
-      (wrap-graphiql {:path "/procure/graphiql", :endpoint "/procure/graphql"})
       core-routing/wrap-canonicalize-params-maps
       wrap-params
       wrap-multipart-params

diff --git a/spec/shared/common.steps.rb b/spec/shared/common.steps.rb
@@ -48,8 +48,7 @@
 end
 
 step "I log in with the email :email" do |email|
-  visit '/'
-  click_on 'Login'
+  visit '/sign-in'
   within('.ui-form-signin') do
     step "I enter '#{email}' in the 'user' field"
     find('button[type="submit"]').click