bullet_train-api 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3fdf5c4b02d770a18da4612bc302ad25ebc2dbe91fb71457e75e2a9d47702b
-  data.tar.gz: d2e9a87102c8e1fcae0d2c9938a6e5b05e77cc4906c19234c31128f4be556586
+  metadata.gz: 63cb60f45a28362fdb22fc05a9e3294cb53f2b087ca9483e142d0728e6a99968
+  data.tar.gz: b7df83aa717bd4522e0cb48c573d48735c81e66a43df360b1e16379dd08cebd5
 SHA512:
-  metadata.gz: 57265a7f4ff132ccc4651b9e753a1844b39712777a7f3212dc124747489a6873bcdc1f440449ab0dc4601f888c3306cc0d78032feff19fff9066f312cb5c06b6
-  data.tar.gz: 213ed7b2de13d9305efaa4bb7b4d224c514133425b07d06d4f91f751d36a6bf64022bde0bff1da424ee3fe90161751d050b727069f928a4306311f6892f6b639
+  metadata.gz: 3fc8313cbeb06585c5c1837e768ef37f749b2a18f5b5588a031166d6e81815eb0f6a85caeaffa309505afacaa5e35502f3c124c3ce691088b0170eec772e765a
+  data.tar.gz: 85ec379b44107488397493fc94226fc2d333d3cc0a73179f53821148f0024e028162ece11e6ba52be7f0505adf38a5767032cde00c3f528f97a8c137edb3167c

data/app/controllers/api/open_api_controller.rb

@@ -25,6 +25,10 @@ module OpenApiHelper
     result
   end
 
+  def gem_paths
+    @gem_paths ||= `bundle show --paths`.lines.map { |gem_path| gem_path.chomp }
+  end
+
   def automatic_paths_for(model, parent, except: [])
     output = render("api/#{@version}/open_api/shared/paths", except: except)
     output = Scaffolding::Transformer.new(model.name, [parent&.name]).transform_string(output).html_safe
@@ -33,7 +37,7 @@ module OpenApiHelper
 
   def automatic_components_for(model, locals: {})
     path = "app/views/api/#{@version}"
-    paths = ([path] + `bundle show --paths`.lines.map { |gem_path| "#{gem_path.chomp}/#{path}" })
+    paths = ([path] + gem_paths.map { |gem_path| "#{gem_path}/#{path}" })
     jbuilder = Jbuilder::Schema.renderer(paths, locals: {
       # If we ever get to the point where we need a real model here, we should implement an example team in seeds that we can source it from.
       model.name.underscore.split("/").last.to_sym => model.new,
@@ -50,20 +54,26 @@ module OpenApiHelper
 
     attributes_output = JSON.parse(schema_json)
 
-    strong_params_module = "Api::#{@version.upcase}::#{model.name.pluralize}Controller::StrongParameters".constantize
-    strong_parameter_keys = BulletTrain::Api::StrongParametersReporter.new(model, strong_params_module).report
-    if strong_parameter_keys.last.is_a?(Hash)
-      strong_parameter_keys += strong_parameter_keys.pop.keys
+    if has_strong_parameters?("Api::#{@version.upcase}::#{model.name.pluralize}Controller".constantize)
+      strong_params_module = "Api::#{@version.upcase}::#{model.name.pluralize}Controller::StrongParameters".constantize
+      strong_parameter_keys = BulletTrain::Api::StrongParametersReporter.new(model, strong_params_module).report
+      if strong_parameter_keys.last.is_a?(Hash)
+        strong_parameter_keys += strong_parameter_keys.pop.keys
+      end
+
+      parameters_output = JSON.parse(schema_json)
+      parameters_output["required"].select! { |key| strong_parameter_keys.include?(key.to_sym) }
+      parameters_output["properties"].select! { |key, value| strong_parameter_keys.include?(key.to_sym) }
+
+      (
+        indent(attributes_output.to_yaml.gsub("---", "#{model.name.gsub("::", "")}Attributes:"), 3) +
+        indent("    " + parameters_output.to_yaml.gsub("---", "#{model.name.gsub("::", "")}Parameters:"), 3)
+      ).html_safe
+    else
+
+      indent(attributes_output.to_yaml.gsub("---", "#{model.name.gsub("::", "")}Attributes:"), 3)
+        .html_safe
     end
-
-    parameters_output = JSON.parse(schema_json)
-    parameters_output["required"].select! { |key| strong_parameter_keys.include?(key.to_sym) }
-    parameters_output["properties"].select! { |key, value| strong_parameter_keys.include?(key.to_sym) }
-
-    (
-      indent(attributes_output.to_yaml.gsub("---", "#{model.name.gsub("::", "")}Attributes:"), 3) +
-      indent("    " + parameters_output.to_yaml.gsub("---", "#{model.name.gsub("::", "")}Parameters:"), 3)
-    ).html_safe
   end
 
   def paths_for(model)
@@ -88,6 +98,13 @@ module OpenApiHelper
     indent(attribute_block.chomp, 2)
   end
   alias_method :parameter, :attribute
+
+  private
+
+  def has_strong_parameters?(controller)
+    methods = controller.action_methods
+    methods.include?("create") || methods.include?("update")
+  end
 end
 
 class Api::OpenApiController < ApplicationController

data/app/controllers/concerns/api/controllers/base.rb

@@ -4,6 +4,10 @@ require "pagy_cursor/pagy/extras/uuid_cursor"
 module Api::Controllers::Base
   extend ActiveSupport::Concern
 
+  # We need this to show custom error that user is not authenticated
+  # neither with Doorkeeper nor with Devise
+  class NotAuthenticatedError < StandardError; end
+
   included do
     include ActionController::Helpers
     helper ApplicationHelper
@@ -42,6 +46,10 @@ module Api::Controllers::Base
       render json: {error: "Not found"}, status: :not_found
     end
 
+    rescue_from NotAuthenticatedError do |exception|
+      render json: {error: "Invalid token or no user signed in"}, status: :unauthorized
+    end
+
     before_action :apply_pagination, only: [:index]
   end
 
@@ -57,14 +65,24 @@ module Api::Controllers::Base
   end
 
   def current_user
-    raise Doorkeeper::Errors::InvalidToken unless doorkeeper_token.present?
+    @current_user ||= if doorkeeper_token
+      User.find_by(id: doorkeeper_token[:resource_owner_id])
+    else
+      warden.authenticate(scope: :user)
+    end
+
     # TODO Remove this rescue once workspace clusters can write to this column on the identity server.
     # TODO Make this logic configurable so that downstream developers can write different methods for this column getting updated.
-    begin
-      doorkeeper_token.update(last_used_at: Time.zone.now)
-    rescue ActiveRecord::StatementInvalid => _
+    if doorkeeper_token
+      begin
+        doorkeeper_token.update(last_used_at: Time.zone.now)
+      rescue ActiveRecord::StatementInvalid => _
+      end
     end
-    @current_user ||= User.find_by(id: doorkeeper_token[:resource_owner_id])
+
+    raise NotAuthenticatedError unless @current_user
+
+    @current_user
   end
 
   def current_team

data/app/controllers/concerns/api/v1/users/controller_base.rb

@@ -50,4 +50,10 @@ module Api::V1::Users::ControllerBase
   # GET /api/v1/users/:id
   def show
   end
+
+  # PUT /api/v1/users/:id
+  # TODO: Implement this!
+  def update
+    raise "Not implemented"
+  end
 end

data/app/views/account/platform/access_tokens/_index.html.erb

@@ -36,14 +36,7 @@
                     <%= render "shared/tables/checkbox", object: access_token %>
                     <td><%= render 'shared/attributes/code', attribute: :token, secret: true %></td>
                     <td><%= render 'shared/attributes/text', attribute: :description %></td>
-                    <td>
-                      <% if access_token.last_used_at %>
-                        <%= render 'shared/attributes/date_and_time', attribute: :last_used_at %>
-                      <% else %>
-                        <% # TODO Make it so we can just define a `default` key for `last_used_at` in the locale file and it will us that when present. %>
-                        Never
-                      <% end %>
-                    </td>
+                    <td><%= render 'shared/attributes/date_and_time', attribute: :last_used_at %></td>
                     <%# 🚅 super scaffolding will insert new fields above this line. %>
                     <td><%= render 'shared/attributes/date_and_time', attribute: :created_at %></td>
                     <td class="buttons">

data/lib/bullet_train/api/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Api
-    VERSION = "1.2.9"
+    VERSION = "1.2.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-api
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2022-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Bullet Train API