updated oauth2 support into a single config
updated oauth2 support into a single config