silencer_shop 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb38ed07576442bf645ab679d4b0faa38f2de8ed7fcee2bb06ec7f948f82058
-  data.tar.gz: 498e71ac8fb336bafd44c76b3e6efff98029675b210fe5e730398719becdbd1e
+  metadata.gz: 38cb8d12db135dd31536cc93d8158b2ba23dc5bc456d5fb6de42ca2a2f38cf81
+  data.tar.gz: 0d157839522268b64e4889b160b510ccf21fd17db2fa1fc6366dda1d13af874b
 SHA512:
-  metadata.gz: 457c9c8bf80466b5e470bed00b1208bb9f1adb974776ed78c624e44d201c6bb0f9bc219b312c8e019232df2b65fe5639133095b8471f361a19c12516f4c3c1cd
-  data.tar.gz: 22a8ea41b9da4ba5adb06f85eb4366fb5c18393e50e87a8582c714749a6ea6a4dec49bc45c1fbe033e9285af099401c6f782eaccd0d2a8914002b0623ef10043
+  metadata.gz: 4a906308b603fa51def2b7f086d251acd9ed9c025a1b44ca8afa6b150c73bf8a5264e9249dcb84dc3f9cab0dde47bab28d5c5eafc9f8189c04741ff913a5174d
+  data.tar.gz: b7abe26ab5262049773bf9e0a935631ce0b82b6626f5b61854c7b5097acaae4eadcf2f5f4aa07cae783e145b92a5c19bd70089c42097b3629aa67d10716dfa3b

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

@@ -21,7 +21,11 @@ module SilencerShop
           _data.map(&:deep_symbolize_keys)
         end
       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
 

data/lib/silencer_shop/version.rb

@@ -1,3 +1,3 @@
 module SilencerShop
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.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.0
 platform: ruby
 authors:
 - Jeffrey Dill
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport