The current session:
" (cjson/generate-string session {:pretty true}) ""))))
+(defroutes app-routes
+ (GET "/" [] (redirect (route/base-path)))
+ (GET route/base-template [] (redirect (route/updates-path)))
+ (GET route/updates-template [] handle-list-view)
+ (POST route/updates-template [] new-update)
+ (GET [route/update-template, :id #"[0-9]+"] [id :as r] (page id r))
+ (DELETE [route/update-template, :id #"[0-9]+"] [id :as r] (delete-entry id r))
+ (GET [route/update-replyform-template, :id #"[0-9]+"] [id :as r] (replyform id r))
+ (GET route/conversation-template [id :as r] (conversation id r))
+ (GET route/info-template [] info)
+ (GET route/too-long-template [length :as r] (too-long length r))
+ (GET "/statuses/session" [] render-session-page)
+ (GET route/logout-template [] (friend/logout* (redirect (route/updates-path))))
+ (not-found "Not Found"))
+
+
+
+
+
+
+(def config-auth {:roles #{::user ::admin}})
+
+(defn client-config
+ [current-config]
+ {:client-id (:oauth-client-id current-config)
+ :client-secret (:oauth-client-secret current-config)
+ :auth-uri (:oauth-server-authorize-uri current-config)
+ :token-uri (:oauth-server-token-uri current-config)
+ ;; TODO get friend-oauth2 to support :context, :path-info
+ :callback {:domain (:external-url current-config) :path (str (:external-url-path current-config) "/oauth2callback")}})
+
+(defn uri-config
+ [client-config]
+ {:authentication-uri {:url (:auth-uri client-config)
+ :query {:client_id (:client-id client-config)
+ :redirect_uri (format-config-uri client-config)
+ :response_type "code"}}
+ :access-token-uri {:url (:token-uri client-config)
+ :query {:client_id (:client-id client-config)
+ :client_secret (:client-secret client-config)
+ :grant_type "authorization_code"
+ :redirect_uri (format-config-uri client-config)}}})
+
+(defn get-user-profile
+ "Call the OpenID provider to retrieve the profile information for the current authenticated user."
+ [access-token]
+ (let [url (route/user-profile-path access-token)
+ response (http/get url {:accept :json})
+ profile (cjson/parse-string (:body response) true)]
+ profile))
+
+(defn retrieve-user-profile
+ "Extracts the access-token to call the user-profile service which returns the user's profile data"
+ [creds]
+ (let [token (:access-token creds)
+ profile (get-user-profile token)]
+ {:identity {:token token :profile profile}}))
+
+(defn extract-access-token
+ "Alternate function to read the access_token from the HTTP body"
+ [request]
+ (-> (:body request) cjson/parse-string (get "access_token")))
+
+(defn site
+ [current-config]
+ "Entry function to be called on server startup"
+ (handler/site
+ (friend/authenticate
+ app-routes
+ {:allow-anon? false
+ :login-uri "/statuses/login"
+ :workflows [(oauth2/workflow
+ {:client-config (client-config current-config)
+ :uri-config (uri-config (client-config current-config))
+ ; is called to extract the access_token. This is the chance to retrieve the user profile
+ :credential-fn retrieve-user-profile
+ ; the access_token is returned by the openID server in the HTTP request body after 'access-token-uri' (see above) has been called
+ :access-token-parsefn extract-access-token
+ ; this is called if authorization fails
+ :auth-error-fn render-session-page
+ :config-auth config-auth})]})))
diff --git a/src/statuses/server.clj b/src/statuses/server.clj
index 79caff0..6720700 100644
--- a/src/statuses/server.clj
+++ b/src/statuses/server.clj
@@ -11,8 +11,9 @@
[statuses.routing :as main])
(:gen-class))
-(def app
- (-> main/app-routes
+(defn init-app
+ [current-config]
+ (-> (main/site current-config)
wrap-params
(wrap-resource "public")
wrap-content-type
@@ -26,11 +27,13 @@
(println "Starting server on host" (config :host)
"port" (config :http-port)
"in mode" (config :run-mode))
- (run-jetty
- (if (= (config :run-mode) :dev)
- (wrap-reload app)
- app)
- {:host (config :host)
- :port (config :http-port)
- :join? false}))
+
+ (let [appl (init-app (config))]
+ (run-jetty
+ (if (= (config :run-mode) :dev)
+ (wrap-reload appl)
+ appl)
+ {:host (config :host)
+ :port (config :http-port)
+ :join? false})))
diff --git a/src/statuses/views/layout.clj b/src/statuses/views/layout.clj
index b699f30..3dcdbd9 100644
--- a/src/statuses/views/layout.clj
+++ b/src/statuses/views/layout.clj
@@ -3,16 +3,16 @@
[hiccup.form :refer [check-box]]
[hiccup.page :refer [html5 include-css include-js]]
[statuses.configuration :refer [config]]
- [statuses.routes :refer [info-path issue-path mention-path]]
+ [statuses.routes :refer [info-path issue-path mention-path avatar-path logout-path]]
[statuses.views.common :refer [icon]]))
-(defn preference [id title iconname]
+(defn- preference [id title iconname]
[:li [:a {:name id}
(icon iconname)
[:label {:for (str "pref-" id)} title]
(check-box {:class "pref" :disabled "disabled"} (str "pref-" id))]])
-(defn nav-link [url title iconname]
+(defn- nav-link [url title iconname]
[:li (link-to url (icon iconname) title)])
(defn nav-links [username]
@@ -20,16 +20,17 @@
(nav-link (mention-path username :atom) "Feed (mentions)" "rss")
(nav-link (info-path) "Info" "info")
(nav-link (issue-path) "Issues" "github")
- (preference "inline-images" "Inline images?" "cogs")))
+ (preference "inline-images" "Inline images?" "cogs")
+ (nav-link (logout-path) "Logout" "sign-out")))
(defn default
([title username content] (default title username content nil))
([title username content footer]
- (html5
+ (html5 {:lang "de" :content "en" :dir "ltr" :typeof "bibo:Document" :property "dcterms:language"}
[:head
[:meta {:name "viewport"
:content "width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no"}]
- [:title (str title " - innoQ Statuses")]
+ [:title (str title " - " (config :title))]
(include-css "//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css")
(include-css "//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css")
(include-css "/statuses/css/statuses.css")
@@ -47,6 +48,8 @@
[:span.icon-bar]
[:span.icon-bar]
[:span.icon-bar]]
+ [:div.avatar
+ (link-to "/statuses/session" [:img {:src (avatar-path username) :alt username}])]
[:a {:class "navbar-brand", :href "/statuses/updates"} "Statuses"]]
[:div.collapse.navbar-collapse
[:ul.nav.navbar-nav (nav-links username)]]]]
diff --git a/test/oauth.clj b/test/oauth.clj
new file mode 100644
index 0000000..28fa099
--- /dev/null
+++ b/test/oauth.clj
@@ -0,0 +1,9 @@
+ (ns oauth
+ (:use clojure.test
+ [statuses.routing :only [extract-access-token]]))
+
+ (deftest extract-access-token-from-body
+ (is
+ (=
+ (extract-access-token {:body "{\"access_token\":\"test.A-JEKLslDlCv5uO0SmH_TWB9SHxLuk9IqITcWk1ZvA\"}"})
+ "test.A-JEKLslDlCv5uO0SmH_TWB9SHxLuk9IqITcWk1ZvA")))