Revert "Eager load `lib/api`"

This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809.

5 files changed, 140 insertions, 141 deletions

diff --git a/config/application.rb b/config/application.rb
index d4b86bb38bb..b602e2b6168 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -102,8 +102,6 @@ module Gitlab
     # This is needed for gitlab-shell
     ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
 
-    config.eager_load_paths += ["#{Rails.root}/lib"]
-
     config.generators do |g|
       g.factory_girl false
     end
diff --git a/config/routes.rb b/config/routes.rb
index bfc6818a8d8..3c855cfafd0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,6 @@
 require 'sidekiq/web'
 require 'sidekiq/cron/web'
+require 'api/api'
 
 Rails.application.routes.draw do
   if Gitlab::Sherlock.enabled?
diff --git a/lib/api/api.rb b/lib/api/api.rb
index d41b4b71865..6ddfe11d98e 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -1,6 +1,8 @@
+Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file}
+
 module API
   class API < Grape::API
-    include ::API::APIGuard
+    include APIGuard
     version 'v3', using: :path
 
     rescue_from ActiveRecord::RecordNotFound do
diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb
index 6dfd6e4396b..b9994fcefda 100644
--- a/lib/api/api_guard.rb
+++ b/lib/api/api_guard.rb
@@ -2,173 +2,171 @@
 
 require 'rack/oauth2'
 
-module API
-  module APIGuard
-    extend ActiveSupport::Concern
+module APIGuard
+  extend ActiveSupport::Concern
 
-    included do |base|
-      # OAuth2 Resource Server Authentication
-      use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request|
-        # The authenticator only fetches the raw token string
+  included do |base|
+    # OAuth2 Resource Server Authentication
+    use Rack::OAuth2::Server::Resource::Bearer, 'The API' do |request|
+      # The authenticator only fetches the raw token string
 
-        # Must yield access token to store it in the env
-        request.access_token
-      end
+      # Must yield access token to store it in the env
+      request.access_token
+    end
 
-      helpers HelperMethods
+    helpers HelperMethods
 
-      install_error_responders(base)
-    end
+    install_error_responders(base)
+  end
 
-    # Helper Methods for Grape Endpoint
-    module HelperMethods
-      # Invokes the doorkeeper guard.
-      #
-      # If token is presented and valid, then it sets @current_user.
-      #
-      # If the token does not have sufficient scopes to cover the requred scopes,
-      # then it raises InsufficientScopeError.
-      #
-      # If the token is expired, then it raises ExpiredError.
-      #
-      # If the token is revoked, then it raises RevokedError.
-      #
-      # If the token is not found (nil), then it raises TokenNotFoundError.
-      #
-      # Arguments:
-      #
-      #   scopes: (optional) scopes required for this guard.
-      #           Defaults to empty array.
-      #
-      def doorkeeper_guard!(scopes: [])
-        if (access_token = find_access_token).nil?
-          raise TokenNotFoundError
-
-        else
-          case validate_access_token(access_token, scopes)
-            when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
-              raise InsufficientScopeError.new(scopes)
-            when Oauth2::AccessTokenValidationService::EXPIRED
-              raise ExpiredError
-            when Oauth2::AccessTokenValidationService::REVOKED
-              raise RevokedError
-            when Oauth2::AccessTokenValidationService::VALID
-              @current_user = User.find(access_token.resource_owner_id)
-          end
+  # Helper Methods for Grape Endpoint
+  module HelperMethods
+    # Invokes the doorkeeper guard.
+    #
+    # If token is presented and valid, then it sets @current_user.
+    #
+    # If the token does not have sufficient scopes to cover the requred scopes,
+    # then it raises InsufficientScopeError.
+    #
+    # If the token is expired, then it raises ExpiredError.
+    #
+    # If the token is revoked, then it raises RevokedError.
+    #
+    # If the token is not found (nil), then it raises TokenNotFoundError.
+    #
+    # Arguments:
+    #
+    #   scopes: (optional) scopes required for this guard.
+    #           Defaults to empty array.
+    #
+    def doorkeeper_guard!(scopes: [])
+      if (access_token = find_access_token).nil?
+        raise TokenNotFoundError
+
+      else
+        case validate_access_token(access_token, scopes)
+        when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
+          raise InsufficientScopeError.new(scopes)
+        when Oauth2::AccessTokenValidationService::EXPIRED
+          raise ExpiredError
+        when Oauth2::AccessTokenValidationService::REVOKED
+          raise RevokedError
+        when Oauth2::AccessTokenValidationService::VALID
+          @current_user = User.find(access_token.resource_owner_id)
         end
       end
+    end
 
-      def doorkeeper_guard(scopes: [])
-        if access_token = find_access_token
-          case validate_access_token(access_token, scopes)
-            when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
-              raise InsufficientScopeError.new(scopes)
+    def doorkeeper_guard(scopes: [])
+      if access_token = find_access_token
+        case validate_access_token(access_token, scopes)
+        when Oauth2::AccessTokenValidationService::INSUFFICIENT_SCOPE
+          raise InsufficientScopeError.new(scopes)
 
-            when Oauth2::AccessTokenValidationService::EXPIRED
-              raise ExpiredError
+        when Oauth2::AccessTokenValidationService::EXPIRED
+          raise ExpiredError
 
-            when Oauth2::AccessTokenValidationService::REVOKED
-              raise RevokedError
+        when Oauth2::AccessTokenValidationService::REVOKED
+          raise RevokedError
 
-            when Oauth2::AccessTokenValidationService::VALID
-              @current_user = User.find(access_token.resource_owner_id)
-          end
+        when Oauth2::AccessTokenValidationService::VALID
+          @current_user = User.find(access_token.resource_owner_id)
         end
       end
+    end
 
-      def current_user
-        @current_user
-      end
+    def current_user
+      @current_user
+    end
 
-      private
-      def find_access_token
-        @access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods)
-      end
+    private
+    def find_access_token
+      @access_token ||= Doorkeeper.authenticate(doorkeeper_request, Doorkeeper.configuration.access_token_methods)
+    end
 
-      def doorkeeper_request
-        @doorkeeper_request ||= ActionDispatch::Request.new(env)
-      end
+    def doorkeeper_request
+      @doorkeeper_request ||= ActionDispatch::Request.new(env)
+    end
 
-      def validate_access_token(access_token, scopes)
-        Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes)
-      end
+    def validate_access_token(access_token, scopes)
+      Oauth2::AccessTokenValidationService.validate(access_token, scopes: scopes)
     end
+  end
 
-    module ClassMethods
-      # Installs the doorkeeper guard on the whole Grape API endpoint.
-      #
-      # Arguments:
-      #
-      #   scopes: (optional) scopes required for this guard.
-      #           Defaults to empty array.
-      #
-      def guard_all!(scopes: [])
-        before do
-          guard! scopes: scopes
-        end
+  module ClassMethods
+    # Installs the doorkeeper guard on the whole Grape API endpoint.
+    #
+    # Arguments:
+    #
+    #   scopes: (optional) scopes required for this guard.
+    #           Defaults to empty array.
+    #
+    def guard_all!(scopes: [])
+      before do
+        guard! scopes: scopes
       end
+    end
 
-      private
-      def install_error_responders(base)
-        error_classes = [ MissingTokenError, TokenNotFoundError,
-                          ExpiredError, RevokedError, InsufficientScopeError]
+    private
+    def install_error_responders(base)
+      error_classes = [ MissingTokenError, TokenNotFoundError,
+                        ExpiredError, RevokedError, InsufficientScopeError]
 
-        base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
-      end
+      base.send :rescue_from, *error_classes, oauth2_bearer_token_error_handler
+    end
 
-      def oauth2_bearer_token_error_handler
-        Proc.new do |e|
-          response =
-              case e
-                when MissingTokenError
-                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
-
-                when TokenNotFoundError
-                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-                      :invalid_token,
-                      "Bad Access Token.")
-
-                when ExpiredError
-                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-                      :invalid_token,
-                      "Token is expired. You can either do re-authorization or token refresh.")
-
-                when RevokedError
-                  Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
-                      :invalid_token,
-                      "Token was revoked. You have to re-authorize from the user.")
-
-                when InsufficientScopeError
-                  # FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2)
-                  # does not include WWW-Authenticate header, which breaks the standard.
-                  Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
-                      :insufficient_scope,
-                      Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
-                      { scope: e.scopes })
-              end
-
-          response.finish
-        end
+    def oauth2_bearer_token_error_handler
+      Proc.new do |e|
+        response =
+          case e
+          when MissingTokenError
+            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new
+
+          when TokenNotFoundError
+            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+              :invalid_token,
+              "Bad Access Token.")
+
+          when ExpiredError
+            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+              :invalid_token,
+              "Token is expired. You can either do re-authorization or token refresh.")
+
+          when RevokedError
+            Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(
+              :invalid_token,
+              "Token was revoked. You have to re-authorize from the user.")
+
+          when InsufficientScopeError
+            # FIXME: ForbiddenError (inherited from Bearer::Forbidden of Rack::Oauth2)
+            # does not include WWW-Authenticate header, which breaks the standard.
+            Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(
+              :insufficient_scope,
+              Rack::OAuth2::Server::Resource::ErrorMethods::DEFAULT_DESCRIPTION[:insufficient_scope],
+              { scope: e.scopes })
+          end
+
+        response.finish
       end
     end
+  end
 
-    #
-    # Exceptions
-    #
+  #
+  # Exceptions
+  #
 
-    class MissingTokenError < StandardError; end
+  class MissingTokenError < StandardError; end
 
-    class TokenNotFoundError < StandardError; end
+  class TokenNotFoundError < StandardError; end
 
-    class ExpiredError < StandardError; end
+  class ExpiredError < StandardError; end
 
-    class RevokedError < StandardError; end
+  class RevokedError < StandardError; end
 
-    class InsufficientScopeError < StandardError
-      attr_reader :scopes
-      def initialize(scopes)
-        @scopes = scopes
-      end
+  class InsufficientScopeError < StandardError
+    attr_reader :scopes
+    def initialize(scopes)
+      @scopes = scopes
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/ci/api/api.rb b/lib/ci/api/api.rb
index 7cd8b6fbae2..353c4ddebf8 100644
--- a/lib/ci/api/api.rb
+++ b/lib/ci/api/api.rb
@@ -3,7 +3,7 @@ Dir["#{Rails.root}/lib/ci/api/*.rb"].each {|file| require file}
 module Ci
   module API
     class API < Grape::API
-      include ::API::APIGuard
+      include APIGuard
       version 'v1', using: :path
 
       rescue_from ActiveRecord::RecordNotFound do