Removed refresh token encryption temporarily
Added extra fields that had gone missing from swap request