omniauth-webflow 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ad987f587504fabb5720eaa3477450f4670cf147e98b5fb9daaf104250e7823
-  data.tar.gz: 4e6d2c5c10ff603dd00fc10fc4708510cc6b94ddc5c7948ffb381913b0569245
+  metadata.gz: a64baaf2173308ad1706605ad3dfb4147ce16d07201517574aba75b1204f0510
+  data.tar.gz: 2fc84632f006e91cd8c35130c4d54cff3330875ef219288754da2a6de9150c7c
 SHA512:
-  metadata.gz: 4dc8f3bf741a1a3c153e95ebaf740e33d544d8a4e7e3e24d98e92a6b17221200ad44f851a5f08dc67f6eaa16683f33c2542e8f59fc18bc01791436c4a2de5d89
-  data.tar.gz: fc3d3ec53a6486a2bfbef7ace67e037bdc97db38ec72f9055ba5ae4c7240b50ccd8f09eb2c3e3d7270fc67fb24c4d91468e9bb7861a45a07a8bf001411579993
+  metadata.gz: 8e3fd536754d099a2f669c29ee3efb382a7877540f87bbede0592245c84cae27bfc1472fb142e9e547b066fe964de19528f9308ce667f933d6b35b3347c72665
+  data.tar.gz: 593876f74cd6e103662fdfc31cc1642cc68c1dcd47f30bce176337c9cacda13ef058fd9192b07fe4d4e1982642943f3c0480021d49546731db8b6c051ae0bc01

data/Gemfile.lock

@@ -1,53 +1,41 @@
 PATH
   remote: .
   specs:
-    omniauth-webflow (0.2.1)
+    omniauth-webflow (1.0.0)
       multi_json (~> 1.15)
       omniauth-oauth2 (~> 1.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    base64 (0.2.0)
     diff-lcs (1.3)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.8.1)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
+    faraday-net_http (3.0.2)
     hashie (5.0.0)
-    jwt (2.3.0)
+    jwt (2.9.3)
+      base64
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (2.0.4)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
-    omniauth-oauth2 (1.7.2)
-      oauth2 (~> 1.4)
-      omniauth (>= 1.9, < 3)
-    rack (2.2.3)
-    rack-protection (2.1.0)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)
+    rack (3.1.8)
+    rack-protection (3.0.6)
       rack
     rake (12.3.3)
     rspec (3.9.0)
@@ -64,6 +52,10 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
     ruby2_keywords (0.0.5)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
+    version_gem (1.1.4)
 
 PLATFORMS
   ruby
@@ -74,4 +66,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.1.2
+   2.2.27

data/README.md

@@ -1,6 +1,6 @@
 # omniauth-webflow
 
-This gem is an [OmniAuth 1.0](https://github.com/omniauth/omniauth) Strategy for authenticating with the [Webflow API](https://developers.webflow.com/) (version 1.0.0)
+This gem is an [OmniAuth](https://github.com/omniauth/omniauth) Strategy for authenticating with the [Webflow API](https://developers.webflow.com/v2.0.0) (Data API version 2.0.0)
 
 ## Setup
 
@@ -17,7 +17,7 @@ After registering a new application with Webflow take note of the `client_id` an
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'omniauth-webflow'
+gem 'omniauth-webflow' ~> 1.0.0
 ```
 
 And then execute:
@@ -28,9 +28,11 @@ In your Rails app, add the Webflow provider to your Omniauth middleware, e.g. in
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :webflow, ENV['WEBFLOW_CLIENT_ID'], ENV['WEBFLOW_CLIENT_SECRET']
+  provider :webflow, ENV['WEBFLOW_CLIENT_ID'], ENV['WEBFLOW_CLIENT_SECRET'],
+  scope: 'authorized_user:read sites:read' # this is an example scope
 end
 ```
+Specify [scopes](https://docs.developers.webflow.com/reference/scopes) as required.
 
 ## Contributing
 

data/lib/omniauth/strategies/webflow.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
     class Webflow < OmniAuth::Strategies::OAuth2
-      API_VERSION = '1.0.0'.freeze
-
       option :name, 'webflow'
       option :client_options, {
         site: 'https://api.webflow.com',
@@ -12,15 +12,12 @@ module OmniAuth
         token_url: 'https://api.webflow.com/oauth/access_token'
       }
 
-      uid { raw_info['_id'] }
+      uid { raw_info['authorization']['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['authorization']['id'],
+          grant_type: raw_info['authorization']['grantType']
         }
       end
 
@@ -31,19 +28,13 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get("https://api.webflow.com/info?api_version=#{API_VERSION}").parsed
+        @raw_info ||= access_token.get('https://api.webflow.com/v2/token/introspect').parsed
       end
 
-      protected
-
-      # 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']
-        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))
+      # The Webflow API requires the redirect_uri to match exactly what you have in your Webflow Application settings
+      # This method ensures any query params are removed before the build_access_token step occurs
+      def callback_url
+        full_host + callback_path
       end
     end
   end

data/lib/omniauth-webflow/version.rb

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

data/omniauth-webflow.gemspec

@@ -27,9 +27,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  # spec.add_runtime_dependency 'omniauth-oauth2'
-  # spec.add_runtime_dependency 'multi_json'
-
   spec.add_dependency 'omniauth-oauth2', '~> 1.7'
   spec.add_dependency 'multi_json', '~> 1.15'
 end

metadata

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