mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

patch

Browse source
This commit is contained in:
Tobe O 2018-12-14 01:55:36 -05:00
parent cd0f5fa51e
commit 867a899d2f
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/src/server.dart
View file

@ -11,8 +11,15 @@ typedef Future<AuthorizationTokenResponse> ExtensionGrant(
Future<String> _getParam(RequestContext req, String name, String state, Future<String> _getParam(RequestContext req, String name, String state,
{bool body: false}) async { {bool body: false}) async {
var map = body == true ? await req.parseBody() : await req.parseQuery(); Map<String, dynamic> data;
var value = map.containsKey(name) ? map[name]?.toString() : null;
if (body == true) {
data = await req.parseBody().then((_) => req.bodyAsMap);
} else {
data = req.queryParameters;
}
var value = data.containsKey(name) ? data[name]?.toString() : null;
if (value?.isNotEmpty != true) { if (value?.isNotEmpty != true) {
throw new AuthorizationException( throw new AuthorizationException(
@ -30,8 +37,15 @@ Future<String> _getParam(RequestContext req, String name, String state,
Future<Iterable<String>> _getScopes(RequestContext req, Future<Iterable<String>> _getScopes(RequestContext req,
{bool body: false}) async { {bool body: false}) async {
var map = body == true ? await req.parseBody() : await req.parseQuery(); Map<String, dynamic> data;
return map['scope']?.toString()?.split(' ') ?? [];
if (body == true) {
data = await req.parseBody().then((_) => req.bodyAsMap);
} else {
data = req.queryParameters;
}
return data['scope']?.toString()?.split(' ') ?? [];
} }
/// An OAuth2 authorization server, which issues access tokens to third parties. /// An OAuth2 authorization server, which issues access tokens to third parties.
@ -114,7 +128,7 @@ abstract class AuthorizationServer<Client, User> {
Iterable<String> scopes, Iterable<String> scopes,
RequestContext req, RequestContext req,
ResponseContext res) async { ResponseContext res) async {
var body = await req.parseBody(); var body = await req.parseBody().then((_) => req.bodyAsMap);
throw new AuthorizationException( throw new AuthorizationException(
new ErrorResponse( new ErrorResponse(
ErrorResponse.unsupportedResponseType, ErrorResponse.unsupportedResponseType,
@ -133,7 +147,7 @@ abstract class AuthorizationServer<Client, User> {
Iterable<String> scopes, Iterable<String> scopes,
RequestContext req, RequestContext req,
ResponseContext res) async { ResponseContext res) async {
var body = await req.parseBody(); var body = await req.parseBody().then((_) => req.bodyAsMap);
throw new AuthorizationException( throw new AuthorizationException(
new ErrorResponse( new ErrorResponse(
ErrorResponse.unsupportedResponseType, ErrorResponse.unsupportedResponseType,
@ -147,7 +161,7 @@ abstract class AuthorizationServer<Client, User> {
/// Performs a client credentials grant. Only use this in situations where the client is 100% trusted. /// Performs a client credentials grant. Only use this in situations where the client is 100% trusted.
Future<AuthorizationTokenResponse> clientCredentialsGrant( Future<AuthorizationTokenResponse> clientCredentialsGrant(
Client client, RequestContext req, ResponseContext res) async { Client client, RequestContext req, ResponseContext res) async {
var body = await req.parseBody(); var body = await req.parseBody().then((_) => req.bodyAsMap);
throw new AuthorizationException( throw new AuthorizationException(
new ErrorResponse( new ErrorResponse(
ErrorResponse.unsupportedResponseType, ErrorResponse.unsupportedResponseType,
@ -164,7 +178,7 @@ abstract class AuthorizationServer<Client, User> {
String state = ''; String state = '';
try { try {
var query = await req.parseQuery(); var query = req.queryParameters;
state = query['state']?.toString() ?? ''; state = query['state']?.toString() ?? '';
var responseType = await _getParam(req, 'response_type', state); var responseType = await _getParam(req, 'response_type', state);
@ -288,7 +302,7 @@ abstract class AuthorizationServer<Client, User> {
try { try {
AuthorizationTokenResponse response; AuthorizationTokenResponse response;
var body = await req.parseBody(); var body = await req.parseBody().then((_) => req.bodyAsMap);
state = body['state']?.toString() ?? ''; state = body['state']?.toString() ?? '';

2
test/password_test.dart
View file

@ -121,7 +121,7 @@ class _AuthorizationServer
orElse: () => null); orElse: () => null);
if (user == null) { if (user == null) {
var body = await req.parseBody(); var body = await req.parseBody().then((_) => req.bodyAsMap);
throw new AuthorizationException( throw new AuthorizationException(
new ErrorResponse( new ErrorResponse(
ErrorResponse.accessDenied, ErrorResponse.accessDenied,