omniauth-webflow 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdeb0c0b2d3116f3845630ec72d36f3a2bd2b3c33a612772dd64a8b63f693d32
-  data.tar.gz: ba32be657fe24a8a1b7f0ccd9069f34d2794e68b7ca6046c7fe31ddbc779f7ce
+  metadata.gz: 4ad987f587504fabb5720eaa3477450f4670cf147e98b5fb9daaf104250e7823
+  data.tar.gz: 4e6d2c5c10ff603dd00fc10fc4708510cc6b94ddc5c7948ffb381913b0569245
 SHA512:
-  metadata.gz: ab958103ab845e0f37fa8ca049be7a0e352f5770129bb1d8b73b3cc3df08191fc3e7af01672d1bb66cf692eed12c44a07b0ded78be02393fab1f264c13a7da40
-  data.tar.gz: 65294855f9c5ee1b2376e9df6eb84158ba28b8c5f3e1722a7d8ab78c15b1b33b67be4def9b95771a515e294a8cdd8184f55c3c667bd021da7841bb90ffb91b30
+  metadata.gz: 4dc8f3bf741a1a3c153e95ebaf740e33d544d8a4e7e3e24d98e92a6b17221200ad44f851a5f08dc67f6eaa16683f33c2542e8f59fc18bc01791436c4a2de5d89
+  data.tar.gz: fc3d3ec53a6486a2bfbef7ace67e037bdc97db38ec72f9055ba5ae4c7240b50ccd8f09eb2c3e3d7270fc67fb24c4d91468e9bb7861a45a07a8bf001411579993

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-webflow (0.1.1)
+    omniauth-webflow (0.2.1)
       multi_json (~> 1.15)
       omniauth-oauth2 (~> 1.7)
 

data/lib/omniauth/strategies/webflow.rb

@@ -3,26 +3,24 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class Webflow < OmniAuth::Strategies::OAuth2
-      API_VERSION = "1.0.0"
+      API_VERSION = '1.0.0'.freeze
 
-      option :name, "webflow"
+      option :name, 'webflow'
       option :client_options, {
-        site: "https://api.webflow.com",
+        site: 'https://api.webflow.com',
         authorize_url: 'https://webflow.com/oauth/authorize',
         token_url: 'https://api.webflow.com/oauth/access_token'
       }
-      # option :token_params, { parse: :json }
-      # option :auth_token_params, { mode: :query, param_name: :token }
 
       uid { raw_info['_id'] }
 
       info do
         {
-          id: raw_info["_id"],
-          grant_type: raw_info["grantType"],
-          users: raw_info["users"],
-          orgs: raw_info["orgs"],
-          sites: raw_info["sites"],
+          id: raw_info['_id'],
+          grant_type: raw_info['grantType'],
+          users: raw_info['users'],
+          orgs: raw_info['orgs'],
+          sites: raw_info['sites']
         }
       end
 
@@ -36,14 +34,17 @@ module OmniAuth
         @raw_info ||= access_token.get("https://api.webflow.com/info?api_version=#{API_VERSION}").parsed
       end
 
-    protected
+      protected
 
-      # had to override this method as it was merging the redirect_uri into the params which was breaking the Webflow /access_token request
+      # callback_url includes the code parameter and Webflow decided to change their API recently
+      # to require the redirect_uri to match exactly what you have in your Webflow Application settings.
+      # This also means that you can not pass other url parameters through the redirect_uri.
       def build_access_token
-        verifier = request.params["code"]
-        client.auth_code.get_token(verifier, token_params.to_hash(:symbolize_keys => true), deep_symbolize(options.auth_token_params))
+        verifier = request.params['code']
+        uri = Addressable::URI.parse(callback_url)
+        redirect_uri = uri.omit(:query).to_s
+        client.auth_code.get_token(verifier, { redirect_uri: redirect_uri }.merge(token_params.to_hash(symbolize_keys: true)), deep_symbolize(options.auth_token_params))
       end
-
     end
   end
-end
+end

data/lib/omniauth-webflow/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Webflow
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-webflow
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2