3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-13 03:16:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat(backend): add logout and better router initialization

Browse source
This commit is contained in:
Andrey Antukh 2019-07-02 17:13:25 +02:00
parent 932875a317
commit be7e8e63ee
2 changed files with 75 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backend/src/uxbox/api/auth.clj
View file

@ -25,6 +25,13 @@
(-> (rsp/no-content) (-> (rsp/no-content)
(assoc :session {:user-id id}))))))) (assoc :session {:user-id id})))))))
(defn logout
{:description "User logout endpoint"}
[req]
(-> (rsp/no-content)
(assoc :session nil)
(p/resolved)))
(defn register (defn register
{:parameters {:body {:username [st/required st/string] {:parameters {:body {:username [st/required st/string]
:email [st/required st/email] :email [st/required st/email]

134
backend/src/uxbox/http.clj
View file

@ -38,89 +38,91 @@
:middleware middleware}}) :middleware middleware}})
(def routes (def routes
(rr/router [["/media/*" (rr/create-resource-handler {:root "public/media"})]
[["/media/*" (rr/create-resource-handler {:root "public/media"})] ["/static/*" (rr/create-resource-handler {:root "public/static"})]
["/static/*" (rr/create-resource-handler {:root "public/static"})]
["/api/auth" ["/api/auth"
["/login" {:post (handler #'api-auth/login)}] ["/login" {:post (handler #'api-auth/login)}]
["/register" {:post (handler #'api-auth/register)}] ["/logout" {:post (handler #'api-auth/logout)}]
["/recovery/:token" {:get (handler #'api-auth/register)}] ["/register" {:post (handler #'api-auth/register)}]
["/recovery" {:post (handler #'api-auth/request-recovery) ["/recovery/:token" {:get (handler #'api-auth/register)}]
:get (handler #'api-auth/recover-password)}]] ["/recovery" {:post (handler #'api-auth/request-recovery)
:get (handler #'api-auth/recover-password)}]]
["/api" {:middleware [authorization-middleware]} ["/api" {:middleware [authorization-middleware]}
;; KVStore ;; KVStore
["/kvstore/:key" {:put (handler #'api-kvstore/upsert) ["/kvstore/:key" {:put (handler #'api-kvstore/upsert)
:get (handler #'api-kvstore/retrieve) :get (handler #'api-kvstore/retrieve)
:delete (handler #'api-kvstore/delete)}] :delete (handler #'api-kvstore/delete)}]
["/svg/parse" {:post (handler #'api-svg/parse)}] ["/svg/parse" {:post (handler #'api-svg/parse)}]
;; Projects ;; Projects
["/projects" {:get (handler #'api-projects/list-projects) ["/projects" {:get (handler #'api-projects/list-projects)
:post (handler #'api-projects/create-project)}] :post (handler #'api-projects/create-project)}]
["/projects/by-token/:token" {:get (handler #'api-projects/get-project-by-share-token)}] ["/projects/by-token/:token" {:get (handler #'api-projects/get-project-by-share-token)}]
["/projects/:id" {:put (handler #'api-projects/update-project) ["/projects/:id" {:put (handler #'api-projects/update-project)
:delete (handler #'api-projects/delete-project)}] :delete (handler #'api-projects/delete-project)}]
;; Pages ;; Pages
["/pages" {:get (handler #'api-pages/list-pages) ["/pages" {:get (handler #'api-pages/list-pages)
:post (handler #'api-pages/create-page)}] :post (handler #'api-pages/create-page)}]
["/pages/:id" {:put (handler #'api-pages/update-page) ["/pages/:id" {:put (handler #'api-pages/update-page)
:delete (handler #'api-pages/delete-page)}] :delete (handler #'api-pages/delete-page)}]
["/pages/:id/metadata" {:put (handler #'api-pages/update-page-metadata)}] ["/pages/:id/metadata" {:put (handler #'api-pages/update-page-metadata)}]
["/pages/:id/history" {:get (handler #'api-pages/retrieve-page-history)}] ["/pages/:id/history" {:get (handler #'api-pages/retrieve-page-history)}]
["/pages/:id/history/:hid" {:put (handler #'api-pages/update-page-history)}] ["/pages/:id/history/:hid" {:put (handler #'api-pages/update-page-history)}]
;; Profile ;; Profile
["/profile/me" {:get (handler #'api-users/retrieve-profile) ["/profile"
:put (handler #'api-users/update-profile)}] ["/me" {:get (handler #'api-users/retrieve-profile)
["/profile/me/password" {:put (handler #'api-users/update-password)}] :put (handler #'api-users/update-profile)}]
["/profile/me/photo" {:post (handler #'api-users/update-photo)}] ["/me/password" {:put (handler #'api-users/update-password)}]
["/me/photo" {:post (handler #'api-users/update-photo)}]]
;; Library ;; Library
["/library" ["/library"
;; Icons ;; Icons
["/icon-collections/:id" {:put (handler #'api-icons/update-collection) ["/icon-collections/:id" {:put (handler #'api-icons/update-collection)
:delete (handler #'api-icons/delete-collection)}] :delete (handler #'api-icons/delete-collection)}]
["/icon-collections" {:get (handler #'api-icons/list-collections) ["/icon-collections" {:get (handler #'api-icons/list-collections)
:post (handler #'api-icons/create-collection)}] :post (handler #'api-icons/create-collection)}]
["/icons/:id/copy" {:put (handler #'api-icons/copy-icon)}] ["/icons/:id/copy" {:put (handler #'api-icons/copy-icon)}]
["/icons/:id" {:put (handler #'api-icons/update-icon) ["/icons/:id" {:put (handler #'api-icons/update-icon)
:delete (handler #'api-icons/delete-icon)}] :delete (handler #'api-icons/delete-icon)}]
["/icons" {:post (handler #'api-icons/create-icon) ["/icons" {:post (handler #'api-icons/create-icon)
:get (handler #'api-icons/list-icons)}] :get (handler #'api-icons/list-icons)}]
;; Images ;; Images
["/image-collections/:id" {:put (handler #'api-images/update-collection) ["/image-collections/:id" {:put (handler #'api-images/update-collection)
:delete (handler #'api-images/delete-collection)}] :delete (handler #'api-images/delete-collection)}]
["/image-collections" {:post (handler #'api-images/create-collection) ["/image-collections" {:post (handler #'api-images/create-collection)
:get (handler #'api-images/list-collections)}] :get (handler #'api-images/list-collections)}]
["/images/:id/copy" {:put (handler #'api-images/copy-image)}] ["/images/:id/copy" {:put (handler #'api-images/copy-image)}]
["/images/:id" {:get (handler #'api-images/retrieve-image) ["/images/:id" {:get (handler #'api-images/retrieve-image)
:delete (handler #'api-images/delete-image) :delete (handler #'api-images/delete-image)
:put (handler #'api-images/update-image)}] :put (handler #'api-images/update-image)}]
["/images" {:post (handler #'api-images/create-image) ["/images" {:post (handler #'api-images/create-image)
:get (handler #'api-images/list-images)}] :get (handler #'api-images/list-images)}]
] ]
]] ]])
router-options))
(def app
(rr/ring-handler routes (rr/create-default-handler)))
;; --- State Initialization ;; --- State Initialization
(def app
(delay
(-> (rr/router routes router-options)
(rr/ring-handler (rr/create-default-handler)))))
(defn- start-server (defn- start-server
[config] [config]
(jetty/run-jetty app {:join? false (jetty/run-jetty @app {:join? false
:async? true :async? true
:daemon? true :daemon? true
:port (:http-server-port config)})) :port (:http-server-port config)}))
(defstate server (defstate server
:start (start-server cfg/config) :start (start-server cfg/config)