authy 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/authy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "authy"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Authy", "David A. Cuadrado"]
-  s.date = "2012-05-21"
+  s.date = "2012-05-25"
   s.description = "Ruby library to access Authy services"
   s.email = "krawek@gmail.com"
   s.executables = ["authy-api-console"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "authy.gemspec",
     "bin/authy-api-console",
+    "examples/demo.rb",
     "lib/authy.rb",
     "lib/authy/api.rb",
     "lib/authy/config.rb",

data/examples/demo.rb

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+require 'authy' # gem install authy
+require 'sqlite3'
+require 'active_record'
+require 'highline/import' # gem install highline
+
+Authy.api_url = "http://sandbox-api.authy.com"
+Authy.api_key = "a1ffc30aa2d775c7ebebe45585727fe0"
+
+# setup db
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => "db")
+class AddUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string :email
+      t.string :authy_id
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end
+AddUsers.migrate(:up) if !File.exist?("db")
+
+class User < ActiveRecord::Base
+  validates_uniqueness_of :email
+end
+
+
+choose do |menu|
+  menu.prompt = "what do you want to do? "
+
+  menu.choice(:register) do
+    loop do
+      email = ask("email: ")
+      country_code = ask("country code: ")
+      cellphone = ask("cellphone: ")
+
+      if user = User.where(:email => email).first
+        puts "You're already registered with authy id: #{user.authy_id}"
+        break
+      end
+
+      authy_user = Authy::API.register_user(:email => email, :country_code => country_code, :cellphone => cellphone)
+      if authy_user.ok?
+        puts "User was registered. its authy id is #{authy_user.id}"
+        User.create!(:authy_id => authy_user.id, :email => email)
+        break
+      else
+        puts "Failed to register user: #{authy_user.errors}"
+      end
+    end
+  end
+
+  menu.choice(:login) do
+    email = ask("email: ")
+    token = ask("token: ")
+
+    user = User.where(:email => email).first
+    otp = Authy::API.verify(:id => user.authy_id, :token => token)
+
+    if otp.ok?
+      puts "Welcome back!"
+    else
+      puts "Wrong email or token :("
+    end
+  end
+
+  menu.choice(:request_token) do
+    email = ask("email: ")
+
+    user = User.where(:email => email).first
+    response = Authy::API.request_sms(:id => user.authy_id, :force => true)
+
+    if response.ok?
+      puts "Message was sent"
+    else
+      puts "Failed to send message: #{response.errors.inspect}"
+    end
+  end
+end

data/lib/authy/api.rb

@@ -20,22 +20,30 @@ module Authy
     # options:
     # :id user id
     # :token authy token entered by the user
-    def self.verify(attributes)
-      token = attributes[:token] || attributes['token']
-      user_id = attributes[:id] || attributes['id']
-      response = Typhoeus::Request.get("#{Authy.api_uri}/protected/json/verify/#{token}/#{user_id}", :params => {:api_key => Authy.api_key})
+    # :force (true|false) force to check even if the cellphone is not confirmed
+    #
+    def self.verify(params)
+      token = params.delete(:token) || params.delete('token')
+      user_id = params.delete(:id) || params.delete('id')
+
+      response = Typhoeus::Request.get("#{Authy.api_uri}/protected/json/verify/#{escape_for_url(token)}/#{escape_for_url(user_id)}", :params => params.merge({:api_key => Authy.api_key}))
 
       Authy::Response.new(response)
     end
 
     # options:
     # :id user id
-    def self.request_sms(attributes)
-      user_id = attributes[:id] || attributes['id']
+    def self.request_sms(params)
+      user_id = params.delete(:id) || params.delete('id')
 
-      response = Typhoeus::Request.get("#{Authy.api_uri}/protected/json/sms/#{user_id}", :params => {:api_key => Authy.api_key})
+      response = Typhoeus::Request.get("#{Authy.api_uri}/protected/json/sms/#{escape_for_url(user_id)}", :params => params.merge({:api_key => Authy.api_key}))
 
       Authy::Response.new(response)
     end
+
+    private
+    def self.escape_for_url(field)
+      URI.escape(field.to_s.strip, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+    end
   end
 end

data/lib/authy/config.rb

@@ -11,7 +11,7 @@ module Authy
     def api_uri=(uri)
       @api_uri = uri
     end
-    alias :api_url= :api_key=
+    alias :api_url= :api_uri=
 
     def api_uri
       @api_uri || "https://api.authy.com"

data/lib/authy/response.rb

@@ -3,6 +3,7 @@ module Authy
     attr_reader :raw_response
     def initialize(response)
       @raw_response = response
+      @errors = {}
       parse_body
     end
 
@@ -27,7 +28,7 @@ module Authy
     end
 
     def errors
-      self['errors'] || {}
+      self['errors'] || @errors
     end
 
     protected

data/spec/authy/api_spec.rb

@@ -20,6 +20,15 @@ describe "Authy::API" do
     response.body.should == 'valid token'
   end
 
+  it "should fail to validate a given token when force=true is given" do
+    user = Authy::API.register_user(:email => generate_email, :cellphone => generate_cellphone, :country_code => 1)
+    response = Authy::API.verify(:token => 'invalid_token', :id => user['id'], :force => true)
+
+    response.should be_kind_of(Authy::Response)
+    response.ok?.should be_false
+    response.body.should == 'invalid token'
+  end
+
   it "should return the error messages as a hash" do
     user = Authy::API.register_user(:email => generate_email, :cellphone => "abc-1234", :country_code => 1)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70133947788640 !ruby/object:Gem::Requirement
+  requirement: &70093065684660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70133947788640
+  version_requirements: *70093065684660
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70133947797280 !ruby/object:Gem::Requirement
+  requirement: &70093065683380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70133947797280
+  version_requirements: *70093065683380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70133947829020 !ruby/object:Gem::Requirement
+  requirement: &70093065681480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70133947829020
+  version_requirements: *70093065681480
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70133947843780 !ruby/object:Gem::Requirement
+  requirement: &70093065893320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70133947843780
+  version_requirements: *70093065893320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70133947850600 !ruby/object:Gem::Requirement
+  requirement: &70093065886620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70133947850600
+  version_requirements: *70093065886620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70133947848220 !ruby/object:Gem::Requirement
+  requirement: &70093065963440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70133947848220
+  version_requirements: *70093065963440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70133947871480 !ruby/object:Gem::Requirement
+  requirement: &70093066181600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70133947871480
+  version_requirements: *70093066181600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70133947883720 !ruby/object:Gem::Requirement
+  requirement: &70093066179060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133947883720
+  version_requirements: *70093066179060
 - !ruby/object:Gem::Dependency
   name: reek
-  requirement: &70133947909680 !ruby/object:Gem::Requirement
+  requirement: &70093066176760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 1.2.8
   type: :development
   prerelease: false
-  version_requirements: *70133947909680
+  version_requirements: *70093066176760
 description: Ruby library to access Authy services
 email: krawek@gmail.com
 executables:
@@ -130,6 +130,7 @@ files:
 - VERSION
 - authy.gemspec
 - bin/authy-api-console
+- examples/demo.rb
 - lib/authy.rb
 - lib/authy/api.rb
 - lib/authy/config.rb
@@ -153,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 600584506253976133
+      hash: 3694718674118841425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: