Commit 1a7f2edc authored by theworldbright's avatar theworldbright
Browse files

Perform major refactoring 

- Add foreign_keys
- Remove unused classes/methods
- Fix pronto errors
- Add method to retrieve client id from name
- Remove TODO comments
- Fix unnecessary private key generation
parent e55a0b0d

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ vendor/cache/ 
config/database.yml

.rvmrc_custom

.rvmrc.local

oidc_key.pem

config/oidc_key.pem



# Mailing list stuff

config/email_offset

app/controllers/api/openid_connect/authorizations_controller.rb

+6 −8
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ module Api 
        if authorization

          authorization.destroy

        else

          raise ArgumentError, "Error while trying revoke non-existent authorization with ID #{params[:id]}"

          flash[:error] = I18n.t("api.openid_connect.authorizations.destroy.fail", id: params[:id])

        end

        redirect_to user_applications_url

      end
@@ -54,9 +54,7 @@ module Api 


      def reauthenticate

        sign_out current_user

        params_as_get_query = params.map {|key, value| key.to_s + "=" + value }.join("&")

        authorization_path_with_query = new_api_openid_connect_authorization_path + "?" + params_as_get_query

        redirect_to authorization_path_with_query

        redirect_to new_api_openid_connect_authorization_path(params)

      end



      def handle_authorization_form(auth)
@@ -125,9 +123,9 @@ module Api 
        @scopes.join(" ")

      end



      def process_authorization_consent(approvedString)

      def process_authorization_consent(approved_string)

        endpoint = Api::OpenidConnect::AuthorizationPoint::EndpointConfirmationPoint.new(

          current_user, to_boolean(approvedString))

          current_user, to_boolean(approved_string))

        handle_confirmation_endpoint_response(endpoint)

      end
@@ -166,7 +164,7 @@ module Api 


      def response_type_as_space_seperated_values

        if session[:response_type].respond_to?(:map)

          session[:response_type].map(&:to_s).join(" ")

          session[:response_type].join(" ")

        else

          session[:response_type]

        end
@@ -189,7 +187,7 @@ module Api 
      def redirect_prompt_error_display(error, error_description)

        redirect_params_hash = {error: error, error_description: error_description, state: params[:state]}

        redirect_fragment = redirect_params_hash.compact.map {|key, value| key.to_s + "=" + value }.join("&")

        redirect_to params[:redirect_uri] + "#" + redirect_fragment

        redirect_to "#{params[:redirect_uri]}##{redirect_fragment}"

      end

    end

  end

app/controllers/api/openid_connect/clients_controller.rb

+9 −0
Original line number Diff line number Diff line
@@ -15,6 +15,15 @@ module Api 
        render json: client.as_json(root: false)

      end



      def find

        client = Api::OpenidConnect::OAuthApplication.find_by(client_name: params[:client_name])

        if client

          render json: {client_id: client.client_id}

        else

          render json: {error: "Client with name #{params[:client_name]} does not exist"}

        end

      end



      private



      def http_error_page_as_json(e)

app/controllers/api/v0/users_controller.rb

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
module Api

  module V0

    class UsersController < Api::V0::BaseController

      before_action do

        require_access_token Api::OpenidConnect::Scope.find_by(name: "read")

      end



      def show

        render json: current_user

      end

    end

  end

end

app/models/api/openid_connect/authorization.rb

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ module Api 
      def self.use_code(code)

        return unless code

        find_by(code: code).tap do |auth|

          return unless auth

          next unless auth

          auth.code = nil

          auth.save

        end