Merge branch 'main' of https://github.com/chaskiq/chaskiq

app/controllers/api/v1/hooks/provider_controller.rb

@@ -26,17 +26,17 @@ def process_event
     response_handler(response)
   end
 
-  def find_application_package
-    @integration_pkg = AppPackageIntegration.decode(params[:id])
-    app = @integration_pkg.app
-  end
-
   def oauth
     response = @integration_pkg.receive_oauth_code(params)
-    pkg = AppPackageIntegration.decode(params[:id])
+    pkg = AppPackageIntegration.decode(params[:id] || params[:state])
     redirect_to "/apps/#{pkg.app.key}/integrations"
   end
 
+  def find_application_package
+    @integration_pkg = AppPackageIntegration.decode(params[:id] || params[:state])
+    app = @integration_pkg.app
+  end
+
   def resolve_status(response)
     return 422 if response[:status] == :error
 

app/models/app_package_integration.rb

@@ -20,6 +20,7 @@ class AppPackageIntegration < ApplicationRecord
     report_id
     access_token
     access_token_secret
+    refresh_token
     user_id
     user_token
     credentials
@@ -174,6 +175,10 @@ def oauth_url
     "#{Chaskiq::Config.get('HOST')}/api/v1/oauth/callback/#{encoded_id}"
   end
 
+  def global_oauth_callback
+    "#{Chaskiq::Config.get('HOST')}/api/v1/oauth/global/callback"
+  end
+
   def receive_oauth_code(params)
     klass = message_api_klass.receive_oauth_code(params, self)
   end

app/services/payment_services/paddle.rb

@@ -30,15 +30,16 @@ def get_plans
       )
 
       res.filter do |o|
-        Plan.pluck(:id).include?(o.id)
+        Plan.all.map{|o| o[:id]}.include?(o.id)
       end.map do |o|
         p = Plan.get_by_id(o.id)
         {
           id: p["id"],
           source: "paddle",
           features: p.dig("features"),
           name: p["name"],
-          pricing: o.recurring_price.USD
+          pricing: o.recurring_price.USD,
+          billing_type: o.recurring_price.billing_type
         }
       end
     end

app/services/payment_services/stripe_service.rb

@@ -12,7 +12,7 @@ def self.sync_subscription(app)
     def get_plans
       res = Stripe::Price.list(limit: 20).data
       data = res.filter do |o|
-        Plan.pluck(:id).include?(o.id)
+        Plan.all.map{|o| o["id"]}.include?(o.id)
       end
 
       data.map do |o|

config/application.rb

@@ -33,7 +33,6 @@ def self.fetch(name, fallback)
 
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    # config.load_defaults 6.1
     config.load_defaults 7.0
 
     # Configuration for the application, engines, and railties goes here.
@@ -44,9 +43,6 @@ class Application < Rails::Application
     # config.time_zone = "Central Time (US & Canada)"
     # config.eager_load_paths << Rails.root.join("extras")
 
-
-    config.load_defaults '6.0'
-
     config.encoding = 'utf-8'
 
     config.assets.css_compressor = nil
@@ -55,6 +51,8 @@ class Application < Rails::Application
 
     config.action_cable.disable_request_forgery_protection = true
 
+    config.active_storage.variant_processor = :mini_magick
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading

config/initializers/rotator.rb

@@ -0,0 +1,10 @@
+# a bug introduced in rails 7 
+# read: https://github.com/hotwired/turbo-rails/issues/340
+
+Rails.application.config.after_initialize do |app|
+  key_generator = ActiveSupport::KeyGenerator.new app.secret_key_base,
+    iterations: 1000,
+    hash_digest_class: OpenSSL::Digest::SHA1
+
+  app.message_verifier("ActiveStorage").rotate(key_generator.generate_key("ActiveStorage"))
+end

config/routes.rb

@@ -88,6 +88,10 @@
       post 'hooks/receiver/:id' => 'api/v1/hooks/provider#process_event'
       get 'hooks/receiver/:id' => 'api/v1/hooks/provider#process_event'
 
+
+      post 'oauth/global/callback' => 'api/v1/hooks/provider#oauth'
+      get 'oauth/global/callback' => 'api/v1/hooks/provider#oauth'
+
       post 'oauth/callback/:id' => 'api/v1/hooks/provider#oauth'
       get 'oauth/callback/:id' => 'api/v1/hooks/provider#oauth'