omniauth-visma 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 477afd3499aa92780ec4bd963663f94d0a856786090d97847d61b8d3dd3292d0
-  data.tar.gz: 54789a09b77956aa697fff347c09a0a9cdda39886daaf2c7aa0d8a76a37ae40d
+  metadata.gz: ad14691ae656580b454323786b143049a4bcabc5aa7a5712e191e63f8e54d05d
+  data.tar.gz: cd1e500ae5c9cffdee787310b91951943989908d42a86df64a7966c28ab32651
 SHA512:
-  metadata.gz: c2305700f15a743ffd9ceb076cdc77fdd6f520171a716657474ab8ee0834e354a2666aeb627f783c7bc3bc5edf7af84d9d9707c7d3cb762f1b14d6dbfa492980
-  data.tar.gz: e60145dfb1922c2b0a3c4a5426db6a60ff238ecea72f8835f0d0a369dc40ba7bd742424fa9f1470abaaf6be4f87ebb776c0149d8929809ccf68db19ac41a67a4
+  metadata.gz: 2705bcdde3b8902f02541b626a4c64793c5820ad95383a309ee77daaec3df5c0f3fcdac05ccb33b14b27fb4dd48d071a69221161cf39d3d4a25d3d3a368f5ff7
+  data.tar.gz: e90621cbcf3ec84dbd6e480f77aec72d19c490d5d221ae7a484b20106896ee649c88de5c25df588e12a3175484c643cb45889db49724241bb93d681eec79aea8

data/lib/omniauth/strategies/visma.rb

@@ -6,20 +6,24 @@ module OmniAuth
     class Visma < OmniAuth::Strategies::OAuth2
       AUTH_URLS = {
         :sandbox => {
-            :site => "https://eaccountingapi-sandbox.test.vismaonline.com/v2/",
-            :authorize_url => "https://identity-sandbox.test.vismaonline.com/connect/authorize",
-            :token_url => "https://identity-sandbox.test.vismaonline.com/connect/token"
+            site: "https://eaccountingapi-sandbox.test.vismaonline.com/v2/",
+            authorize_url: "https://identity-sandbox.test.vismaonline.com/connect/authorize",
+            token_url: "https://identity-sandbox.test.vismaonline.com/connect/token"
           },
         :production => {
-            :site => "https://eaccountingapi.vismaonline.com/v2/",
-            :authorize_url => "https://identity.vismaonline.com/connect/authorize",
-            :token_url => "https://identity.vismaonline.com/connect/token"
+            site: "https://eaccountingapi.vismaonline.com/v2/",
+            authorize_url: "https://identity.vismaonline.com/connect/authorize",
+            token_url: "https://identity.vismaonline.com/connect/token"
           }
       }
-
       option :name, "visma"
-      option :environment, :production
       option :client_options, AUTH_URLS[:production]
+      option :environment, :production
+
+      def initialize(*args)
+        super(*args)
+        update_default_environment_urls
+      end
 
       info do
         {
@@ -46,15 +50,13 @@ module OmniAuth
         @raw_info ||= access_token.get('/v2/companysettings').parsed
       end
 
-      def request_phase
-        set_urls
-        super
-      end
-
       private
 
-      def set_urls
-        options.client_options = AUTH_URLS[options.environment].merge(options.client_options)
+      def update_default_environment_urls
+        case options.environment
+        when :sandbox
+          options.client_options = options.client_options.merge( AUTH_URLS[options.environment] )
+        end
       end
 
       def callback_url

data/lib/omniauth-visma/version.rb

@@ -1,6 +1,5 @@
 module OmniAuth
   module Visma
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
-end
-
+end

data/spec/omniauth/strategies/visma_spec.rb

@@ -12,16 +12,17 @@ describe OmniAuth::Strategies::Visma do
 
   describe '#client' do
     it 'should have the correct Visma site' do
-      subject.client.site.should eq("https://eaccountingapi-sandbox.test.vismaonline.com/v2/")
+      subject.client.site.should eq("https://eaccountingapi.vismaonline.com/v2/")
     end
 
     it 'should have the correct authorization url' do
-      subject.client.options[:authorize_url].should eq("https://identity-sandbox.test.vismaonline.com/connect/authorize")
+      subject.client.options[:authorize_url].should eq("https://identity.vismaonline.com/connect/authorize")
     end
 
     it 'should have the correct token url' do
-      subject.client.options[:token_url].should eq('https://identity-sandbox.test.vismaonline.com/connect/token')
+      subject.client.options[:token_url].should eq('https://identity.vismaonline.com/connect/token')
     end
+
   end
 
   describe '#callback_path' do
@@ -29,4 +30,25 @@ describe OmniAuth::Strategies::Visma do
       subject.callback_path.should eq('/auth/visma/callback')
     end
   end
+
+  describe '#environment' do
+
+    subject do
+      strategy = OmniAuth::Strategies::Visma.new(nil, @options || {})
+      strategy.stub(:session) { {} }
+      strategy
+    end
+
+    it 'should use production environment by default' do
+      subject.client.authorize_url.should eq("https://identity.vismaonline.com/connect/authorize")
+    end
+
+    it 'should set environment' do
+      @options = {:environment => :sandbox}
+      subject.options.environment.should eq(:sandbox)
+      subject.client.authorize_url.should eq("https://identity-sandbox.test.vismaonline.com/connect/authorize")
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-visma
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Espen Antonsen