eliminate "classic" OpenId workflow, gh-45

cemerick · Jan 5, 2017 · 608d8a1 · 608d8a1
1 parent 1529fcf
commit 608d8a1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 168 deletions.
diff --git a/project.clj b/project.clj
@@ -11,17 +11,7 @@
                  [org.mindrot/jbcrypt "0.3m"]
 
                  ;; http-basic
-                 [commons-codec "1.6"]
-
-                 ;; openid
-                 [org.clojure/core.cache "0.6.3"]
-                 [org.openid4java/openid4java-nodeps "0.9.6"
-                  ; the openid4java artifact refers to a now-disappeared guice repo that
-                  ; was previously hosted via google code svn :X
-                  :exclusions [com.google.code.guice/guice]]
-                 [com.google.inject/guice "2.0"]
-                 [net.sourceforge.nekohtml/nekohtml "1.9.10"]
-                 [org.apache.httpcomponents/httpclient "4.3.5"]]
+                 [commons-codec "1.6"]]
 
   :deploy-repositories {"releases" {:url "https://clojars.org/repo/" :creds :gpg}
                         "snapshots" {:url "https://clojars.org/repo/" :creds :gpg}}

diff --git a/src/cemerick/friend/openid.clj b/src/cemerick/friend/openid.clj
diff --git a/test/test_friend/mock_app.clj b/test/test_friend/mock_app.clj
@@ -1,8 +1,7 @@
 (ns test-friend.mock-app
   (:require [cemerick.friend :as friend]
             (cemerick.friend [workflows :as workflows]
-                             [credentials :as creds]
-                             [openid :as openid])
+                             [credentials :as creds])
             [cheshire.core :as json]
             [robert.hooke :as hooke]
             [hiccup.core :as hiccup]
@@ -47,12 +46,6 @@
 (defroutes ^{:private true} mock-app*
   ;;;;; ANON
   (GET "/" request (page-bodies (:uri request)))
-  ;; TODO move openid test into its own ns
-  (GET "/test-openid" request (hiccup/html [:html
-                                            [:form {:action "/openid" :method "POST"}
-                                             "OpenId endpoint: "
-                                             [:input {:type "text" :name "identifier"}]
-                                             [:input {:type "submit" :name "login"}]]]))
   (GET "/login" request (page-bodies (:uri request)))
   (GET "/free-api" request (api-call 99))
   (friend/logout (ANY "/logout" request (resp/redirect "/")))
@@ -83,9 +76,6 @@
                                  {:response-msg "403 message thrown with unauthorized stone"}
                                  (reset! missles-fired? "shouldn't happen")))
 
-  (GET "/view-openid" request
-       (str "OpenId authentication? " (some-> request friend/identity friend/current-authentication pr-str)))
-
   ;; FIN
   (route/not-found "404"))
 
@@ -121,9 +111,7 @@
        :unauthorized-handler #(if-let [msg (-> % ::friend/authorization-failure :response-msg)]
                                 {:status 403 :body msg}
                                 (#'friend/default-unauthorized-handler %)) 
-       :workflows [(workflows/interactive-form)
-                   ;; TODO move openid test into its own ns
-                   (openid/workflow :credential-fn identity)]})
+       :workflows [(workflows/interactive-form)]})
     handler/site))
 
 (def api-app