cgi_party 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: eafefe96bd17d0fdfe9195b72f116247dc3abb4b
-  data.tar.gz: 1444190411a637ecd29bdcc0aa0d04f2cd326f33
+SHA256:
+  metadata.gz: 3ccde7f8565b47c59777e7e49248a7c4b1c4d0039c166b929e81f0fe5634a11f
+  data.tar.gz: 34147e2d4f52348ea984d03d88b663d69b76d96141149a14e8ceb30b5787cefe
 SHA512:
-  metadata.gz: 7b0da00dcd45482a479afaaa1d3d2f28b48afeaa9d3694e81a37008c211495fd3227d4977527ffb5b964060d943057dd9ec69e8524797bc46c7cdf2c8f7aaa5d
-  data.tar.gz: 07315f65d6dcd2e44eac37d853c6b73e1ac57f0ceed58fe178b5eb225ffafedbdf0eff70909f982479ab12490fcc753b1d65cb2df8300f87650b0cca41822942
+  metadata.gz: cdb8dca7984eda608e251f8e84e6e90d5e37e4ec624feb75c9f6d7c608f5028dedcc56a4d28f962df33546f5bc54febf51f5497c8f058a9f8335e8e22bed4162
+  data.tar.gz: 2554848dc0feef524370632a4d0920c6b5d56804438e9b48c8020f664b25e9f09cbc3e0763dd3d334643159185e321a3b06054ba0e92557e5dca90b8c081b255

data/.ruby-version

@@ -1 +1 @@
-2.4.3
+2.6.0

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.6.0
 before_install: gem install bundler -v 1.17.3

data/Gemfile.lock

@@ -1,33 +1,44 @@
 PATH
   remote: .
   specs:
-    cgi_party (1.0.0)
-      savon (~> 2.0)
+    cgi_party (2.0.0)
+      rqrcode (~> 2.0)
+      savon (= 2.12.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     akami (1.3.1)
       gyoku (>= 0.4.0)
       nokogiri
-    builder (3.2.3)
+    builder (3.2.4)
+    chunky_png (1.4.0)
     coderay (1.1.2)
     diff-lcs (1.3)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
-    httpi (2.4.4)
+      rexml (~> 3.0)
+    httpi (2.5.0)
       rack
       socksify
     method_source (0.9.0)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nori (2.6.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.0.7)
-    rake (10.4.2)
+    public_suffix (4.0.7)
+    rack (3.0.2)
+    rake (13.0.1)
+    rexml (3.2.5)
+    rqrcode (2.1.2)
+      chunky_png (~> 1.0)
+      rqrcode_core (~> 1.0)
+    rqrcode_core (1.2.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -41,7 +52,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    savon (2.12.0)
+    savon (2.12.1)
       akami (~> 1.2)
       builder (>= 2.1.2)
       gyoku (~> 1.2)
@@ -51,7 +62,8 @@ GEM
       wasabi (~> 3.4)
     socksify (1.7.1)
     timecop (0.9.1)
-    wasabi (3.5.0)
+    wasabi (3.7.0)
+      addressable
       httpi (~> 2.0)
       nokogiri (>= 1.4.2)
 
@@ -62,7 +74,7 @@ DEPENDENCIES
   bundler (~> 1.17.3)
   cgi_party!
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   timecop
 

data/README.md

@@ -1,9 +1,11 @@
 # CGIParty
-CGIParty is a gem made for integrating against the CGI Group GRP API.
-As of now you can only perform BankID authorisation.
+CGIParty is a gem made for integrating against the CGI Group GRP2 API.
+As of now you can only perform BankID authorization.
 
 - *You will need an agreement with CGI group in order to user their API. We do not provide this.*
 
+**NOTE: If you're still using the old GRP API, you'll need to install the old version ([1.0.0](https://github.com/standout/cgi-party/tree/v1.0.0)) of this gem.**
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -48,15 +50,24 @@ the authenticate method. The authenticate response will contain information abou
 the authentication order.
 ```ruby
 client = CGIParty::Client.new
-authenticate_response = client.authenticate(social_security_number)
+authenticate_response = client.authenticate(ip_address)
 ```
-
+### Autostart on the same device
 You can acquire an url for prompting the BankID application on the device.
 ```ruby
 authenticate_response.autostart_url(return_url)
-#=> "bankid:///?autostarttoken=[token]&redirect=[return_url]"
+#=> "bankid:///?autostart=[token]&return=[return_url]"
+```
+
+### QR code for BankID on another device
+Generate an animated QR code. You'll need some way to keep track of elapsed seconds as you refresh the QR code.
+```ruby
+client.generate_qr(start_token: authenticate_response.qr_start_token,
+                   start_secret: authenticate_response.qr_start_secret,
+                   seconds: seconds_elapsed)
 ```
 
+### Collect
 To poll the collect action you can use the poll collect method. The block will be yielded
 every time the API responds. You can take appropriate action in your application by using the provided
 progress statuses.

data/cgi_party.gemspec

@@ -6,8 +6,8 @@ require "cgi_party/version"
 Gem::Specification.new do |spec|
   spec.name          = "cgi_party"
   spec.version       = CGIParty::VERSION
-  spec.authors       = ["Emric","Stavros"]
-  spec.email         = ["w.e.w@live.se","stavros.gemitzoglou@standout.se"]
+  spec.authors       = ["Emric","Stavros","Tobias"]
+  spec.email         = ["w.e.w@live.se","stavros.gemitzoglou@standout.se","tobias@almstrand.com"]
 
   spec.summary       = %q{Makes CGI Group GRP integration a party! <3}
   spec.homepage      = "https://github.com/standout/cgi-party"
@@ -29,10 +29,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "savon", "~> 2.0"
+  spec.add_dependency "savon", "2.12.1"
+  spec.add_dependency "rqrcode", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.17.3"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "timecop"

data/lib/cgi_party/authenticate_request.rb

@@ -3,11 +3,10 @@ require "cgi_party/request"
 
 module CGIParty
   class AuthenticateRequest < CGIParty::Request
-    attr_reader :service_id, :display_name, :provider, :ssn
+    attr_reader :service_id, :display_name, :provider
 
-    def initialize(savon_client, ssn, options: {})
-      super(savon_client, options)
-      @ssn = ssn
+    def initialize(savon_client, ip_address, options: {})
+      super(savon_client, ip_address, options)
     end
 
     private
@@ -22,10 +21,10 @@ module CGIParty
 
     def message_hash
       {
-        display_name: @options[:display_name],
-        provider: @options[:provider],
         policy: @options[:service_id],
-        personal_number: @ssn
+        provider: @options[:provider],
+        rp_display_name: @options[:display_name],
+        end_user_info: end_user_info
       }
     end
   end

data/lib/cgi_party/authenticate_response.rb

@@ -3,7 +3,7 @@ require "cgi_party/response"
 module CGIParty
   class AuthenticateResponse < Response
     def autostart_url(return_url)
-      "bankid:///?autostarttoken=#{auto_start_token}&redirect=#{return_url}"
+      "bankid:///?autostart=#{auto_start_token}&return=#{return_url}"
     end
   end
 end

data/lib/cgi_party/client.rb

@@ -1,5 +1,5 @@
 require "savon"
-
+require "rqrcode"
 
 module CGIParty
   class Client
@@ -11,11 +11,14 @@ module CGIParty
 
     def poll_collect(order_ref, transaction_id = nil)
       @polling_started_at = Time.now
+
       loop do
         collect_response = collect(order_ref, transaction_id)
         return collect_response if timeout_polling?
+
         yield(collect_response)
         return collect_response if collect_response.authentication_finished?
+
         sleep(CGIParty.config.collect_polling_delay)
       end
     end
@@ -24,12 +27,23 @@ module CGIParty
       Time.now - @polling_started_at
     end
 
-    def authenticate(ssn, options: {})
-      CGIParty::AuthenticateRequest.new(@savon_client, ssn).execute
+    def authenticate(ip_address, options: {})
+      CGIParty::AuthenticateRequest.new(@savon_client,
+                                        ip_address,
+                                        options: options)
+                                   .execute
+    end
+
+    def generate_qr(start_token:, start_secret:, seconds:)
+      RQRCode::QRCode.new(qr_auth_code(start_token, start_secret, seconds))
     end
 
     def collect(order_reference, transaction_id, options: {})
-      CGIParty::CollectRequest.new(@savon_client, order_reference, transaction_id).execute
+      CGIParty::CollectRequest.new(@savon_client,
+                                   order_reference,
+                                   transaction_id,
+                                   options: options)
+                              .execute
     end
 
     private
@@ -38,10 +52,19 @@ module CGIParty
       polling_duration >= CGIParty.config.collect_polling_timeout
     end
 
+    def qr_auth_code(start_token, start_secret, seconds)
+      auth_code = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new("SHA256"),
+                                          start_secret,
+                                          seconds.to_s)
+
+      "bankid.#{start_token}.#{seconds}.#{auth_code}"
+    end
+
     def savon_opts
       {
+        soap_version: 2,
         namespace: CGIParty::WSDL_NAMESPACE,
-        namespace_identifier: :v1,
+        namespace_identifier: :v2,
         wsdl: CGIParty.config.wsdl_path,
         env_namespace: :soapenv,
         ssl_verify_mode: :none

data/lib/cgi_party/collect_request.rb

@@ -5,7 +5,8 @@ module CGIParty
   class CollectRequest < CGIParty::Request
     attr_reader :order_reference, :transaction_id
 
-    def initialize(savon_client, order_reference, transaction_id = nil, options: {})
+    def initialize(savon_client, order_reference,
+                   transaction_id = nil, options: {})
       super(savon_client, options)
       @order_reference = order_reference
       @transaction_id = transaction_id
@@ -18,13 +19,14 @@ module CGIParty
     end
 
     def available_options
-      %i[display_name service_id]
+      %i[display_name service_id provider]
     end
 
     def message_hash
       {
-        display_name: @options[:display_name],
         policy: @options[:service_id],
+        provider: @options[:provider],
+        rp_display_name: @options[:display_name],
         transaction_id: @transaction_id,
         order_ref: @order_reference
       }

data/lib/cgi_party/request.rb

@@ -1,18 +1,14 @@
 module CGIParty
   class Request
-    def initialize(savon_client, options)
+    def initialize(savon_client, ip_address = nil, options)
       @options = fetch_options(options, available_options)
       @savon_client = savon_client
+      @ip_address = ip_address
     end
 
     def execute
-      serialize_data(
-        @savon_client.call(
-          action_name,
-          message: message_hash,
-          message_tag: message_tag
-        ).body
-      )
+      response = @savon_client.call(action_name, message: message_hash, message_tag: message_tag, soap_action: false)
+      serialize_data(response.body)
     end
 
     private
@@ -21,6 +17,7 @@ module CGIParty
       available_options.each do |option_name|
         options[option_name] ||= CGIParty.config.public_send(option_name)
       end
+
       options
     end
 
@@ -32,5 +29,12 @@ module CGIParty
     def message_tag
       self.class.name.gsub(/^.*::/, '')
     end
+
+    def end_user_info
+      {
+        type: 'IP_ADDR',
+        value: @ip_address
+      }
+    end
   end
 end

data/lib/cgi_party/version.rb

@@ -1,3 +1,3 @@
 module CGIParty
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/cgi_party/wsdl_paths.rb

@@ -1,5 +1,5 @@
 module CGIParty
-  WSDL_PATH = "https://grp.funktionstjanster.se:8890/grp/v1?wsdl"
-  WSDL_TEST_PATH = "https://grpt.funktionstjanster.se:18898/grp/v1?wsdl"
-  WSDL_NAMESPACE = "http://funktionstjanster.se/grp/service/v1.0.0/"
+  WSDL_PATH = "https://grp.funktionstjanster.se:8890/grp/v2.1?wsdl"
+  WSDL_TEST_PATH = "https://grpt.funktionstjanster.se:18898/grp/v2.1?wsdl"
+  WSDL_NAMESPACE = "http://mobilityguard.com/grp/service/v2.0/"
 end

metadata

@@ -1,18 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: cgi_party
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Emric
 - Stavros
+- Tobias
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.12.1
+- !ruby/object:Gem::Dependency
+  name: rqrcode
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -45,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +114,7 @@ description:
 email:
 - w.e.w@live.se
 - stavros.gemitzoglou@standout.se
+- tobias@almstrand.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -145,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.4.9
 signing_key: 
 specification_version: 4
 summary: Makes CGI Group GRP integration a party! <3