Please do give SAML Jackson a try, we've married SAML with OAuth2.0 - https://github.com/boxyhq/jackson