1 files changed, 10 insertions, 10 deletions
diff --git a/bin/idp b/bin/idp
index 9c2ff1df..eca046c2 100755
--- a/bin/idp
+++ b/bin/idp
@@ -5,6 +5,7 @@ require "bundler/inline"
 gemfile do
   source "https://rubygems.org"
 
+  gem "base64", "~> 0.1"
   gem "bcrypt", "~> 3.0"
   gem "csv", "~> 3.0"
   gem "declarative_policy", "~> 1.0"
@@ -14,7 +15,7 @@ gemfile do
   gem "rack", "~> 3.0"
   gem "rack-session", "~> 2.0"
   gem "rackup", "~> 2.0"
-  gem "saml-kit", "~> 1.0"
+  gem "saml-kit", "~> 1.0", git: "github.com:xlgmokha/saml-kit", branch: "main"
   gem "twirp", "~> 1.0"
   gem "warden", "~> 1.0"
   gem "webrick", "~> 1.0"
@@ -444,7 +445,6 @@ module Authz
         @all ||= []
       end
 
-      # TODO:: Look up saml_assertion
       def find_by(params)
         case params[:grant_type]
         when 'authorization_code'
@@ -483,16 +483,11 @@ module Authz
 
       def saml_assertion_grant(encoded_saml_assertion)
         xml = Base64.decode64(encoded_saml_assertion)
-        saml_response = Saml::Kit::Document.to_saml_document(xml)
-        saml_assertion = saml_response.assertion
         # TODO:: Validate signature and prevent assertion reuse
+        saml_assertion = Saml::Kit::Document.to_saml_document(xml)
 
-        user = case saml_assertion.name_id_format
-        when Saml::Kit::Namespaces::EMAIL_ADDRESS
-          ::Authn::User.find_by_email(saml_assertion.name_id)
-        when Saml::Kit::Namespaces::PERSISTENT
+        user = ::Authn::User.find_by_email(saml_assertion.name_id) ||
           ::Authn::User.find(saml_assertion.name_id)
-        end
         new(user, saml_assertion: saml_assertion)
       end
 
@@ -544,6 +539,11 @@ module Authz
           body[:id_token] = user.create_id_token.to_jwt
         end
       end
+    rescue StandardError => error
+      {
+        error: error.message,
+        error_description: error.backtrace,
+      }
     end
   end
 
@@ -582,7 +582,7 @@ module Authz
           params = request.content_type == "application/json" ? JSON.parse(request.body.read, symbolize_names: true) : Hash[URI.decode_www_form(request.body.read)].transform_keys(&:to_sym)
           grant = AuthorizationGrant.find_by(params)
 
-          return [404, { "Content-Type" => "application/json" }, [JSON.pretty_generate(error: 404, message: "Not Found")]] if grant.nil? || grant.inactive?
+          return [404, { "Content-Type" => "application/json" }, [JSON.pretty_generate(error: 404, error_description: "Not Found")]] if grant.nil? || grant.inactive?
           return [200, { "Content-Type" => "application/json" }, [JSON.pretty_generate(grant.exchange)]]
         when "/oauth/revoke" # RFC-7009
           # TODO:: Revoke the JWT token and make it ineligible for usage