Merge pull request #67 from Flexiana/update_framework_version

update version in acl-example

Author: ianffcs

examples/acl/project.clj

@@ -2,7 +2,7 @@
   :description "FIXME: write description"
   :min-lein-version "2.0.0"
   :dependencies [[org.clojure/clojure "1.10.1"]
-                 [com.flexiana/framework "0.1.5"]
+                 [com.flexiana/framework "0.1.7"]
                  [thheller/shadow-cljs "2.11.7"]
                  [migratus "1.3.3"]
                  [clj-http "3.12.0"]

examples/acl/src/backend/acl.clj

@@ -53,18 +53,18 @@
         :router (xiana.router/make-router routes)
         :session-backend session-bcknd
         :acl-cfg acl-cfg
-        :app (xiana.app/make-app app-cfg
-                                 acl-cfg
-                                 session-bcknd
-                                 []
-                                 [;interceptors/log
-                                  (interceptors/muuntaja)
-                                  interceptors/params
-                                  (interceptors/require-logged-in)
-                                  interceptors/session-interceptor
-                                  interceptors/view
-                                  (interceptors/db-access user/load-user)
-                                  (interceptors/acl-restrict views.common/not-allowed)])
+        :app (xiana.app/make-app {:config app-cfg
+                                  :acl-cfg acl-cfg
+                                  :session-backend session-bcknd
+                                  :router-interceptors []
+                                  :controller-interceptors [;; interceptors/log
+                                                            (interceptors/muuntaja)
+                                                            interceptors/params
+                                                            (interceptors/require-logged-in)
+                                                            interceptors/session-interceptor
+                                                            interceptors/view
+                                                            (interceptors/db-access user/load-user)
+                                                            (interceptors/acl-restrict views.common/not-allowed)]})
         :web-server (xiana.web-server/make-web-server web-server-cfg))
       (component/system-using
         {:router     [:db]

project.clj

@@ -1,4 +1,4 @@
-(defproject com.flexiana/framework "0.1.6"
+(defproject com.flexiana/framework "0.1.7"
   :description "Framework"
   :url "https://github.com/Flexiana/framework"
   :license {:name "FIXME" :url "FIXME"}

src/framework/components/interceptors.clj

@@ -69,22 +69,21 @@
   ([]
    {:leave (fn [{query :query
                  :as   state}]
-             (xiana/ok (let [result (db/execute state (sql/format query))]
-                         (assoc-in state [:response-data :db-data] result))))})
+             (if query
+               (xiana/ok (let [result (db/execute state (sql/format query))]
+                           (assoc-in state [:response-data :db-data] result)))
+               (xiana/ok state)))})
   ([on-new-session]
-   {:enter (fn [{{new-session :new-session} :session-data
-                 :as                        state}]
-             (if new-session
-               (on-new-session state)
-               (xiana/ok state)))
-    :leave (fn [{query :query
-                 :as   state}]
-             (xiana/ok (let [result (db/execute state (sql/format query))]
-                         (assoc-in state [:response-data :db-data] result))))}))
+   (assoc (db-access)
+     :enter (fn [{{new-session :new-session} :session-data
+                  :as                        state}]
+              (if new-session
+                (on-new-session state)
+                (xiana/ok state))))))
 
 (def view
-  {:leave (fn [state]
-            ((:view state) state))})
+  {:leave (fn [{view :view :as state}]
+            (view state))})
 
 (defn muuntaja
   ([]