mobile_workflow 0.6.16 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebe0ad698dcd7a206d14a7437719ffbbf1775f57d45968b2a454bb6ebab00289
-  data.tar.gz: bcc3c28476104eb9037b7621ad102e9cea81097ded5fbbdabf42686149b36cd3
+  metadata.gz: 974cb70825d3d8b73af77e17adaedf222d6e67e0b0940c0d7158dac1d3c12c3e
+  data.tar.gz: 35588fbd42ae9dacf7e0e0162df48d7442126c7e874efc14fa1fd440b7989dfb
 SHA512:
-  metadata.gz: 0dcf01b7dd9c6914b3b3240cd43a04ecfad8b582653c08cb4c5f600c4002496f16c65f4347300dd60ff0c082d5c648f23cdcfe3982d0ec0e5586f507ac2b742f
-  data.tar.gz: b5ee432e6d049dac79cb1d22f6e59b87204c853a7dcf589309b0d34fae9f2d7c5679454f976861ec40965c026d6bf29b3df8b9559c0c4c41404de0658a22a1fd
+  metadata.gz: b54532ff2c16360d7ec9b9bdd8e5b0fe22b793a41cad4c090a447c35c11f961949ab948c78afb89063eccc9c6f5622abc8db42812ee096734b9235916f45c537
+  data.tar.gz: 67d3a4b2889644571377b9bd1ef69a56ce5e0bc577e053cdd2f5915c877163632fd4b27354c8182af26e26e729d3de73d9bc47c1b165aee9381ae3d7d097b019

data/app/controllers/mobile_workflow/sns_notifications_controller.rb

@@ -10,17 +10,27 @@ module MobileWorkflow
         when 'SubscriptionConfirmation'
           confirm_subscription ? (head :ok) : (head :bad_request)
         else
+          add_attachment
+        end
+      end
+ 
+      private
+      def add_attachment
+        begin
           @object = find_object
           @object.send("#{attribute_name}=",active_record_blob)
           if @object.save
             head :ok
           else
             Rails.logger.warn "Error saving object: #{@object} #{object.errors.full_messages}"
+            head :unprocessable_entity
           end
+        rescue NameError => e
+          Rails.logger.warn "Error attaching object: #{e.message}"
+          head :unprocessable_entity
         end
       end
- 
-      private 
+       
       def verify_request_authenticity
         head :unauthorized if raw_post.blank?
     

data/app/models/concerns/mobile_workflow/displayable.rb

@@ -37,7 +37,7 @@ module MobileWorkflow
         image_url = "https://source.unsplash.com/#{unsplash_id}/800x600"
       end
       
-      {type: :image, previewURL: image_url, url: image_url}
+      {type: :image, previewURL: image_url, url: image_url}.compact
     end
     
     def mw_display_video(attachment, preview_options: { resize_to_fill: [600, 1200] })
@@ -48,36 +48,39 @@ module MobileWorkflow
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, style: style, onSuccess: on_success}
+      {type: :button, label: label, style: style, onSuccess: on_success}.compact
     end
   
     def mw_display_delete_button(url:, label: "Delete", method: :delete, style: :danger, on_success: :backward)
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success}
+      {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success}.compact
     end
-    
-    def mw_display_button_for_url(label:, url:, method: :put, style: :primary, on_success: :reload)
+        
+    def mw_display_url_button(label:, url:, method: :put, style: :primary, confirm_title: nil, confirm_text: nil, on_success: :reload)
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, url: url, method: method, style: style, onSuccess: on_success}
+      {type: :button, label: label, url: url, method: method, style: style, confirmTitle: confirm_title, confirmText: confirm_text, onSuccess: on_success}.compact
     end
+    alias_method :mw_display_button_for_url, :mw_display_url_button
     
-    def mw_display_button_for_system_url(label:, apple_system_url:, method: :put, style: :primary, on_success: :none)
-      validate_on_success!(on_success)
+    def mw_display_system_url_button(label:, apple_system_url: nil, android_deep_link: nil, style: :primary)
       validate_button_style!(style)
+      raise 'Invalid android_deep_link' unless android_deep_link.start_with?('http')
       
-      {type: :button, label: label, appleSystemURL: apple_system_url, method: method, style: style, onSuccess: on_success}
+      {type: :button, label: label, appleSystemURL: apple_system_url, androidDeepLink: android_deep_link, style: style}.compact
     end
+    alias_method :mw_display_button_for_system_url, :mw_display_system_url_button
     
-    def mw_display_button_for_modal_workflow(label:, modal_workflow_name:, style: :primary, on_success: :none)
+    def mw_display_modal_workflow_button(label:, modal_workflow_name:, style: :primary, on_success: :none)
       validate_on_success!(on_success)
       validate_button_style!(style)
       
-      {type: :button, label: label, modalWorkflow: modal_workflow_name, style: style, onSuccess: on_success}
+      {type: :button, label: label, modalWorkflow: modal_workflow_name, style: style, onSuccess: on_success}.compact
     end
+    alias_method :mw_display_button_for_modal_workflow, :mw_display_modal_workflow_button
   
     private
     def validate_on_success!(on_success)

data/lib/generators/mobile_workflow/install/templates/app/models/application_record.rb

@@ -0,0 +1,5 @@
+class ApplicationRecord < ActiveRecord::Base
+  include MobileWorkflow::Displayable
+  
+  self.abstract_class = true
+end

data/lib/generators/mobile_workflow/install/templates/lib/tasks/mobile_workflow_s3.rake

@@ -0,0 +1,9 @@
+desc "Add S3 storage to your environment"
+task add_heroku_s3_storage: :environment do
+  require 'mobile_workflow/cli'
+  app_name = ENV['APP_NAME']
+  aws = MobileWorkflow::Cli::AwsBackend.new(app_name: app_name)
+  heroku = MobileWorkflow::Cli::HerokuBackend(app_name: app_name)
+  aws.create
+  aws.create_topic_subscription(heroku.notifications_endpoint)
+end

data/lib/generators/mobile_workflow/templates/model.rb.erb

@@ -1,7 +1,5 @@
 <% module_namespacing do -%>
 class <%= class_name %> < <%= parent_class_name.classify %>
-  include MobileWorkflow::Displayable
-  
 <% attributes.select(&:reference?).each do |attribute| -%>
   belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
 <% end -%>

data/lib/mobile_workflow.rb

@@ -1,5 +1,5 @@
 require "mobile_workflow/engine"
 
 module MobileWorkflow
-  # Your code goes here...
+  require 'mobile_workflow/railtie' if defined?(Rails)
 end

data/lib/mobile_workflow/open_api_spec/parser.rb

@@ -58,7 +58,7 @@ module MobileWorkflow
   
       def model_property_type(property)
         return property["type"] unless property["type"].blank?
-        return 'attachment' if property['$ref'] == "#/components/schemas/attachment"
+        return 'attachment' if property['$ref'] == "#/components/schemas/MWAttachment"
     
         raise "Unknown property type: #{property}"
       end

data/lib/mobile_workflow/railtie.rb

@@ -0,0 +1,13 @@
+require 'mobile_workflow'
+require 'rails'
+
+module MobileWorkflow
+  class Railtie < Rails::Railtie
+    railtie_name :mobile_workflow
+
+    rake_tasks do
+      path = File.expand_path(__dir__)
+      Dir.glob("#{path}/tasks/**/*.rake").each { |f| load f }
+    end
+  end
+end

data/lib/mobile_workflow/tasks/env_set.rake

@@ -0,0 +1,58 @@
+require 'json'
+
+def each_step(json, type)
+  json['workflows'].map{|w| w["steps"].select {|s| s["type"] == type.to_s}}.flatten.each do |step|
+    yield(step)
+  end
+end
+
+def replace_oauth(app_json)
+  client_id = ENV["CLIENT_ID"]
+  client_secret = ENV["CLIENT_SECRET"]
+  redirect_scheme = ENV["SCHEME"]
+  
+  each_step(app_json, :networkOAuth2) do |step|
+    step["items"].each do |item|
+      if item["oAuth2ClientId"]
+        item["oAuth2ClientId"] = client_id
+        item["oAuth2ClientSecret"] = client_secret
+        item["oAuth2RedirectScheme"] = redirect_scheme
+      end      
+    end
+  end  
+end
+
+def replace_servers(app_json)
+  server_url = ENV["SERVER_URL"]
+  base_url = ENV["PREVIOUS_SERVER_URL"]
+  
+  app_json["servers"].each do |server|
+    server["url"] = server_url
+  end
+
+  each_step(app_json, :display) do |step|
+    step["items"].each do |item|
+      ["appleSystemURL", "androidDeepLink"].each{|key| item[key] = item[key].gsub(base_url, server_url) }
+    end
+  end
+end
+
+def env_set(path)
+  app_json = JSON.parse(File.read(app_json_path))
+  replace_oauth(app_json)
+  replace_servers(app_json)
+  File.write(app_json_path, app_json.to_json)  
+end
+
+namespace :env_set do
+  desc 'Update Android app.json to use new env'
+  task :android do
+    env_set(File.join('app', 'src', 'main', 'res', 'raw', 'app.json'))
+  end
+  
+  desc 'Update iOS app.json to use new env'
+  task :ios do
+    project_name = ENV["PROJECT_NAME"]
+    env_set(File.join(project_name, project_name, "Resources", "app.json"))
+  end
+end

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.6.16'
+  VERSION = '0.6.21'
   RUBY_VERSION = '2.7.2'
   RAILS_VERSION = '6.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.21
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,10 +112,12 @@ files:
 - lib/generators/mobile_workflow/install/templates/ability.rb
 - lib/generators/mobile_workflow/install/templates/api_controller.rb.erb
 - lib/generators/mobile_workflow/install/templates/app/helpers/application_helper.rb
+- lib/generators/mobile_workflow/install/templates/app/models/application_record.rb
 - lib/generators/mobile_workflow/install/templates/app/views/layouts/application.html.erb
 - lib/generators/mobile_workflow/install/templates/app/views/sessions/new.html.erb
 - lib/generators/mobile_workflow/install/templates/create_users.rb
 - lib/generators/mobile_workflow/install/templates/lib/tasks/mobile_workflow_doorkeeper.rake
+- lib/generators/mobile_workflow/install/templates/lib/tasks/mobile_workflow_s3.rake
 - lib/generators/mobile_workflow/install/templates/seeds.rb.erb
 - lib/generators/mobile_workflow/install/templates/sessions_controller.rb.erb
 - lib/generators/mobile_workflow/install/templates/spec/factories/users.rb
@@ -135,6 +137,8 @@ files:
 - lib/mobile_workflow/cli/heroku_backend.rb
 - lib/mobile_workflow/engine.rb
 - lib/mobile_workflow/open_api_spec/parser.rb
+- lib/mobile_workflow/railtie.rb
+- lib/mobile_workflow/tasks/env_set.rake
 - lib/mobile_workflow/version.rb
 homepage: https://github.com/futureworkshops/mobile_workflow
 licenses: