silencer_shop 1.0.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb38ed07576442bf645ab679d4b0faa38f2de8ed7fcee2bb06ec7f948f82058
-  data.tar.gz: 498e71ac8fb336bafd44c76b3e6efff98029675b210fe5e730398719becdbd1e
+  metadata.gz: 37df1cda1a90d164d017a1f186baeb2105628159c98c478ad4135c5b05b26e14
+  data.tar.gz: 9291d75904fddd9313e4a67bb5f45f0988c09c5d0ee094f692ec74e65182eaaf
 SHA512:
-  metadata.gz: 457c9c8bf80466b5e470bed00b1208bb9f1adb974776ed78c624e44d201c6bb0f9bc219b312c8e019232df2b65fe5639133095b8471f361a19c12516f4c3c1cd
-  data.tar.gz: 22a8ea41b9da4ba5adb06f85eb4366fb5c18393e50e87a8582c714749a6ea6a4dec49bc45c1fbe033e9285af099401c6f782eaccd0d2a8914002b0623ef10043
+  metadata.gz: ec85b9fb8ed25ddd55bec12260f51647500bed27702d85a2359049889297b73f33ba40c9bd5a8292ff23753c47e014c86b470272f9c2e6ae1b930a81cbf1a9d7
+  data.tar.gz: f588c3004bad236b3596d52f42eb9e05fb9479b4b4fe43429f33da0b44e85aebaee83c8db0754216d0de7145f17431b64bde76f30a151af2f249e5f79348082f

data/lib/silencer_shop.rb

@@ -26,13 +26,18 @@ module SilencerShop
     yield(config)
   end
 
+  def self.sandbox?
+    !!config.sandbox
+  end
+
+
   class Configuration
-    attr_accessor :proxy_address
-    attr_accessor :proxy_port
+    attr_accessor :proxy_address, :proxy_port, :sandbox
 
     def initialize
       @proxy_address ||= nil
       @proxy_port    ||= nil
+      @sandbox       ||= true
     end
   end
 

data/lib/silencer_shop/api.rb

@@ -3,9 +3,11 @@ require 'net/http'
 module SilencerShop
   module API
 
-    ROOT_API_URL = 'https://silencershopportaldebug.azurewebsites.net/api'.freeze
     USER_AGENT = "SilencerShopRubyGem/#{SilencerShop::VERSION}".freeze
-
+    API_URL = {
+      development: 'https://silencershopportaldebug.azurewebsites.net/api'.freeze,
+      production:  'https://silencershopportal.azurewebsites.net/api'.freeze
+    }
     FILE_UPLOAD_ATTRS = {
       permitted: %i( file_name file_type file_contents ).freeze,
       reqired:   %i( file_type file_contents ).freeze,
@@ -91,7 +93,7 @@ module SilencerShop
     end
 
     def request_url(endpoint, root_url = nil)
-      root_url ||= ROOT_API_URL
+      root_url ||= (SilencerShop.sandbox? ? API_URL[:development] : API_URL[:production])
 
       [root_url, endpoint].join('/')
     end

data/lib/silencer_shop/client.rb

@@ -8,6 +8,15 @@ module SilencerShop
 
     include SilencerShop::API
 
+    TOKEN_RESOURCE = {
+      development: 'https://silencershopstaging.onmicrosoft.com/SilencerShop.Portal'.freeze,
+      production:  'https://silencershopsso.onmicrosoft.com/SilencerShop.Portal'.freeze
+    }
+    TOKEN_URL = {
+      development: 'silencershopstaging.onmicrosoft.com/oauth2/token'.freeze,
+      production:  'silencershopsso.onmicrosoft.com/oauth2/token'.freeze
+    }
+
     attr_accessor :access_token
 
     def initialize(options = {})
@@ -32,15 +41,17 @@ module SilencerShop
     private
 
     def authenticate!
+      environment = SilencerShop.sandbox? ? :development : :production
+      token_resource, token_url = [TOKEN_RESOURCE[environment], TOKEN_URL[environment]]
       request_data = [
-        ['resource', CGI.escape('https://silencershopstaging.onmicrosoft.com/SilencerShop.Portal')],
         ['grant_type', 'client_credentials'],
+        ['resource', CGI.escape(token_resource)],
         ['client_id', CGI.escape(@options[:username])],
         ['client_secret', CGI.escape(@options[:password])]
       ].map { |a| a.join('=') }.join('&')
 
       response = post_request(
-        'silencershopstaging.onmicrosoft.com/oauth2/token',
+        token_url,
         request_data,
         content_type_header('application/x-www-form-urlencoded'),
         'https://login.microsoftonline.com'

data/lib/silencer_shop/response.rb

@@ -1,6 +1,8 @@
 module SilencerShop
   class Response
 
+    attr_accessor :success
+
     def initialize(response)
       @response = response
 
@@ -13,15 +15,24 @@ module SilencerShop
         SilencerShop::Error::NoContent.new(@response.body)
       when Net::HTTPOK, Net::HTTPSuccess
         _data = (JSON.parse(@response.body) if @response.body.present?)
-
         @data = case
         when _data.is_a?(Hash)
           _data.deep_symbolize_keys
         when _data.is_a?(Array)
           _data.map(&:deep_symbolize_keys)
         end
+
+        if @data.is_a?(Hash) && @data.has_key?(:ErrorMessage)
+          raise SilencerShop::Error::RequestError.new(@response.body)
+        end
+
+        self.success = true
       else
-        raise SilencerShop::Error::RequestError.new(@response.body)
+        if @response.body =~ /unable to verify credentials/i
+          SilencerShop::Error::NotAuthorized.new(@response.body)
+        else
+          raise SilencerShop::Error::RequestError.new(@response.body)
+        end
       end
     end
 
@@ -38,7 +49,7 @@ module SilencerShop
     end
 
     def success?
-      !!self[:success] && self[:errors].empty?
+      !!success
     end
 
   end

data/lib/silencer_shop/version.rb

@@ -1,3 +1,3 @@
 module SilencerShop
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: silencer_shop
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.4
 platform: ruby
 authors:
 - Jeffrey Dill
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport