omniauth-webmaker 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407751734ebab6e2b3f88ecde8160083300e0cfa
-  data.tar.gz: d9963a8ba9f58793fbc330535db8cb8d1a1fe436
+  metadata.gz: 87237c2420edcc3662ad30b22aa4b8db4812b2ce
+  data.tar.gz: 87237d72bdf6132fca28b0e0d360ae47ffb56e25
 SHA512:
-  metadata.gz: df94fd7b274a9f9055c7c97399729cdc570579aa8e65e87e0f491876c525ec8d74dfa571b6dbf0846ace8c57aea706b3b10e645212f1548d26b28460bb207ca0
-  data.tar.gz: 9e67c86d0a9234a39d799fcb6987f5748dabe5289b2a1e49c6fcffc93c0f62f31095b245219b61f8fceeb473b3dc6c6cf5490dc956637d8ab64973376ff59c15
+  metadata.gz: ab13120144b584685ee4b2da65aec45c70942b9b4258d4e2338cea1eeeb48fb003d50ae160b20a9cc18ca4004ed877d84c4f717243d932c59fc399b418aa29f5
+  data.tar.gz: 0b1a4735244ec4df89ecd761adcc48311c61576c7cf7095502a426aeb73645ee743033ba70829145592b57d4741754a546464fd1306cffb2ccc05924cd33f643

data/lib/omniauth/strategies/webmaker.rb

@@ -8,16 +8,34 @@ module OmniAuth
     class Webmaker
       include OmniAuth::Strategy
 
+      class WebmakerError < StandardError
+        attr_accessor :error
+
+        def initialize(error)
+          self.error = error
+        end
+
+        def message
+          error
+        end
+      end
+
       option :login_server_url, "http://localhost:3000/api/user/authenticate"
       option :name, "webmaker"
       option :client_options, {}
 
       info do
         {
-          :email => verify_webmaker['user']['email']
+          :email => verify_webmaker
         }
       end
 
+      def callback_phase
+        super
+      rescue WebmakerError => e
+        fail! e.message, e
+      end
+
       def verify_webmaker
         req_body = MultiJson.decode request.body
         conn = Faraday.new( options[:client_options].update(:url => options["login_server_url"]) )
@@ -26,7 +44,17 @@ module OmniAuth
           :audience => req_body["audience"]
         )
 
-        resp = MultiJson.decode(response.body)
+        resp_body = MultiJson.decode(response.body)
+
+        if resp_body.has_key? "user"
+          resp_body["user"]["email"]
+        elsif resp_body.has_key? "error"
+          raise WebmakerError, "Error Logging In"
+        elsif resp_body.has_key? "email"
+          raise WebmakerError, "You Must <a href=\\\"https://webmaker.org\\\"> create a Webmaker account</a> to log in"
+        else
+          raise WebmakerError, "Unknown Error"
+        end
       end
     end
   end

data/lib/omniauth/webmaker/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Webmaker
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-webmaker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Christopher De Cairos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth