infobip-twofactor 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5e31fd0716a9b302a593c60f0eadbdb5dcd04a7
-  data.tar.gz: 2ab4169ba41545cc68366f3f5f9e5801b3873676
+  metadata.gz: cfbd3770741ba8e91f7360ef0950e720e6fee09d
+  data.tar.gz: 8f0f0b96891ca2a5142aaa4ef0089d56806bcde0
 SHA512:
-  metadata.gz: a60e6bfbf5a5ee6051b196daf0b3e9b3c92c576bcea52cdc851a2c03de90f51396a7982bc80f6eccbfb9424a0ba092bcc6fe5f75ba0db9de56b8f1e5d737d24a
-  data.tar.gz: bb8d091f16eea12c75b945aebd83c0c2633c044cadefe8eb37bac8a10eafc937900eb9d48fef1951905969dc97f0f79c4f8a35b38e268af5bd84336363cbbab0
+  metadata.gz: 2a6b51186e3a88c83da88ad069a82748e804279c1322f5d6a5a289108d9c3c5a83cb976c1e05e61827d96352ce5e1fdc7155fb4d66be6131a13a127ea6c746e9
+  data.tar.gz: ec8b79b164a173dece4aadfd8333cd6554583b06c9d436185087c277b3df1d3fc564811522c8f5bec09a6326879486269df9e72070bf6dbbab59d1197983179c

data/Guardfile

@@ -10,7 +10,7 @@ guard :bundler do
   files.each { |file| watch(helper.real_path(file)) }
 end
 
-guard :rspec, cmd: "bundle exec rspec" do
+guard :rspec, cmd: "bundle exec rspec --fail-fast" do
   require "guard/rspec/dsl"
   dsl = Guard::RSpec::Dsl.new(self)
 

data/Rakefile

@@ -1,2 +1,5 @@
 require "bundler/gem_tasks"
 
+task :console do
+    exec "irb -r twofactor -I ./lib/infobip"
+end

data/infobip-twofactor.gemspec

@@ -19,8 +19,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  # spec.add_runtime_dependency "blanket_wrapper"
-  spec.add_runtime_dependency "crib"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -31,6 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-bundler"
   spec.add_development_dependency "terminal-notifier-guard"
   spec.add_development_dependency "fakeweb"
-  # spec.add_development_dependency "pry-nav"
 
 end

data/lib/infobip/twofactor/api.rb

@@ -1,5 +1,6 @@
-require 'crib'
-require 'base64'
+require 'net/https'
+require 'uri'
+require 'JSON'
 
 module Infobip
   module Twofactor
@@ -12,41 +13,44 @@ module Infobip
       def initialize(username, password, url, message_id, application_id)
         raise "Missing message_id" unless message_id
         raise "Missing application_id" unless application_id
-        #send auth reqest
-        @authorization_string = Base64.strict_encode64("#{username}:#{password}")
         @message_id = message_id
         @application_id = application_id
-
-        @auth = Crib.api(url) do |http|
-          http.headers[:authorization] =  "Basic #{@authorization_string}"
-        end
-
-        #get and save api key
-        @api_key = @auth.send("api-key")._post.gsub('"','')
-        @api = Crib.api(url) do |http|
-          http.headers[:authorization]  = "App #{@api_key}"
-          http.headers["content-type"] = "application/json"
-        end
-
+        @url = url
+        uri = URI.parse(@url+"/api-key")
+        @http = Net::HTTP.new(uri.host, 443)
+        @http.use_ssl = true
+        request = Net::HTTP::Post.new(uri.path)
+        request.basic_auth(username,password)
+        request["content-type"] = "application/json"
+        @api_key = @http.request(request).body.gsub('"','')
       end
 
-
       def send_pin(phone)
         raise "Missing phone number" unless phone
         raise "Missing message_id" unless @message_id
         raise "Missing application_id" unless @application_id
-        response = @api.pin._post(applicationId: @application_id, messageId: @message_id, to: phone)
-        raise "Malformed two factor API response - no sms status field" unless (response.respond_to?(:smsStatus))
-        raise "Malformed two factor API response - no pin Id field" unless (response.respond_to?(:pinId))
-        raise "SMS not sent" unless (response.smsStatus == "MESSAGE_SENT")
-        @pin_id = response[:pinId]
+        uri = URI.parse(@url+"/pin")
+        request = Net::HTTP::Post.new(uri.path)
+        request["authorization"] = "App #{@api_key}"
+        request["content-type"] = "application/json"
+        request.body = {applicationId: @application_id, messageId: @message_id, to: phone}.to_json
+        response = JSON.parse @http.request(request).body
+        raise "Malformed two factor API response - no sms status field. Response was: #{response.inspect}" if (response["smsStatus"].nil?)
+        raise "Malformed two factor API response - no pin Id field. Response was: #{response.inspect}" if (response["pinId"].nil?)
+        raise "SMS not sent" unless (response["smsStatus"] == "MESSAGE_SENT")
+        @pin_id = response["pinId"]
         response
       end
 
       def verify_pin(pin_id, pin)
         raise "Missing pin id" unless pin_id
-        response = @api.pin(pin_id).verify._post(pin: pin)
-        raise "Malformed two factor API response - no verified field" unless (response.respond_to?(:verified))
+        uri = URI.parse(@url+"/pin/#{pin_id}/verify")
+        request = Net::HTTP::Post.new(uri.path)
+        request["content-type"] = "application/json"
+        request["authorization"] = "App #{@api_key}"
+        request.body = {pin: pin}.to_json
+        response = JSON.parse @http.request(request).body
+        raise "Malformed two factor API response - no verified field. Response was: #{response.inspect}" if (response["verified"].nil?)
         response
       end
 

data/lib/infobip/twofactor/version.rb

@@ -1,5 +1,5 @@
 module Infobip
   module Twofactor
-    VERSION = "1.0.1"
+    VERSION = "1.0.3"
   end
 end

data/spec/twofactor_api_spec.rb

@@ -9,10 +9,9 @@ describe Infobip::Twofactor::API do
   before do
     @configuration = YAML.load_file("configuration.yml")
 
-    FakeWeb.register_uri(:post, "http://ippdok:4%40SkK2*_@oneapi-test.infobip.com/2fa/1/api-key",  status: ["200", "OK"], body: api_key_response_body)
-    FakeWeb.register_uri(:post, "http://oneapi-test.infobip.com/2fa/1/pin",  response: api_send_pin_response)
-    FakeWeb.register_uri(:post, "http://oneapi-test.infobip.com/2fa/1/pin/2B29B71922B37D3C93F8CEBB85B9E3CF/verify", response: api_verify_pin_response)
-
+    FakeWeb.register_uri(:post, "https://ippdok:4%40SkK2*_@oneapi.infobip.com/2fa/1/api-key",  status: ["200", "OK"], body: api_key_response_body)
+    FakeWeb.register_uri(:post, "https://oneapi.infobip.com/2fa/1/pin",  response: api_send_pin_response)
+    FakeWeb.register_uri(:post, "https://oneapi.infobip.com/2fa/1/pin/2B29B71922B37D3C93F8CEBB85B9E3CF/verify", response: api_verify_pin_response)
     @twofactor = Infobip::Twofactor::API.new(@configuration["username"], @configuration["password"], @configuration["url"], @configuration["message_id"], @configuration["application_id"])
   end
 
@@ -25,13 +24,13 @@ describe Infobip::Twofactor::API do
 
   it "should create a valid Send PIN request, given valid params" do
     response = subject.send_pin("48790809242")
-    expect(response[:smsStatus]).to eq "MESSAGE_SENT"
+    expect(response["smsStatus"]).to eq "MESSAGE_SENT"
   end
 
   it "should create a valid Verify PIN request, given valid params" do
     response = subject.send_pin("48790809242")
     response = subject.verify_pin("2B29B71922B37D3C93F8CEBB85B9E3CF", "1234")
-    expect(response[:verified]).to eq true
+    expect(response["verified"]).to eq true
   end
 
   context "error handling" do
@@ -48,4 +47,4 @@ describe Infobip::Twofactor::API do
 
   end
 
-end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: infobip-twofactor
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - knx
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: crib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement