omniauth-mailup 0.0.1 → 0.0.2

data/README.md

@@ -20,7 +20,7 @@ use OmniAuth::Builder do
 end
 ```
 
-In Rails, you'll want to add to the middleware stack:
+In Rails, you'll want to add to the middleware stack (`config/initializers/omniauth.rb`):
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
@@ -35,18 +35,32 @@ Here's an example _Authentication Hash_ available in `request.env['omniauth.auth
 ```ruby
 {
   :provider => 'mailup',
+  :uid => '10',
+  :info => {
+	  :company => 'ACME, Inc.',
+	  :nickname => 'm12345',
+	  :is_trial => true
+  },
   :credentials => {
-    :token => 'adsf456lkj758klfdsg' # OAuth 2.0 access_token. Store and use to authenticate API requests.
-  }
+    :token => 'adsf456lkj758klfdsg5634kl',        # OAuth 2.0 access_token.
+    :refresh_token => '6l5k37hl345656lh342345lh', # OAuth 2.0 refresh_token.
+    :expires => true,
+    :expires_at => 1369866442
+  },
+  :extra => {...}
 }
 ```
 
-## License
+## Example
 
-Copyright (c) 2013 by Brian Getting and MailUp Inc.
+An example Sinatra app is provided in `example/config.ru`. Simply follow these instructions:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+```
+cd example
+bundle
+rackup config.ru
+```
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+You can then view the app in your browser at `localhost:9292`.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Please note that in order to authenticate with MailUp you will need to tunnel your local app using a service like [PageKite](http://pagekite.net) (recommended) or [Localtunnel](http://progrium.com/localtunnel/).

data/example/config.ru

@@ -18,8 +18,7 @@ class App < Sinatra::Base
 
   get '/auth/:provider/callback' do
     content_type 'text/plain'
-    token = request.env['omniauth.auth']['credentials']['token']
-    "Access token is #{token}".inspect rescue "No data"
+    "AuthHash: #{request.env['omniauth.auth']}".inspect rescue "No data"
   end
 
   get '/auth/failure' do

data/lib/omniauth/strategies/mailup.rb

@@ -1,5 +1,6 @@
 require 'omniauth-oauth2'
 require 'multi_json'
+require 'multi_xml'
 
 module OmniAuth
   module Strategies
@@ -14,22 +15,27 @@ module OmniAuth
       }
       
       # TODO: Do we need this?
-      #option :provider_ignores_state, true
-
-      uid { raw_info["id"] }
+      option :provider_ignores_state, true
 
+      # AuthHash data for Omniauth
+      uid { raw_info["UID"] } # TODO: Need uid from MailUp
+      
       info do
         {
-          :email => raw_info["email"]
-          # TODO: Whatever other info we want to return
+          :company => raw_info["Company"],
+          :nickname => raw_info["Username"],
+          :is_trial => raw_info["IsTrial"]
         }
       end
-
+      
+      # Get more information about the user.
       def raw_info
-        @raw_info ||= access_token.get('/API/v1/Console/User/Info.json').parsed
+        req = access_token.get('/API/v1/Rest/ConsoleService.svc/Console/Authentication/Info')
+        @raw_info ||= MultiXml.parse(req.body)["ConsoleCurrentAuthenticatedUserInfo"]
       end
     end
   end
 end
 
+# Make sure that 'mailup' camelizes properly to 'MailUp'.
 OmniAuth.config.add_camelization 'mailup', 'MailUp'

data/lib/omniauth-mailup/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module MailUp
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/omniauth-mailup.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   
   gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.1.0'
+  gem.add_runtime_dependency 'multi_json', '~> 1.7.3'
+  gem.add_runtime_dependency 'multi_xml', '~> 0.5.3'
   
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mailup
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -27,6 +27,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+- !ruby/object:Gem::Dependency
+  name: multi_xml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement