@@ -6,6 +6,7 @@ import { managementApi, ValidationError } from 'auth0-extension-tools';
66
77import config from './config' ;
88import logger from './logger' ;
9+ import multipartRequest from './multipartRequest' ;
910
1011
1112const getAuthorizationApiUrl = ( ) => {
@@ -136,12 +137,16 @@ const getToken = (req) => {
136137const makeRequest = ( req , path , method , payload ) =>
137138 new Promise ( ( resolve , reject ) => getToken ( req ) . then ( ( token ) => {
138139 request ( method , `https://${ config ( 'AUTH0_DOMAIN' ) } /api/v2/${ path } ` )
139- . send ( payload || { } )
140+ . query ( method === 'GET' ? payload : { } )
141+ . send ( method === 'GET' ? null : payload || { } )
140142 . set ( 'Content-Type' , 'application/json' )
141143 . set ( 'Authorization' , `Bearer ${ token } ` )
142144 . end ( ( err , res ) => {
143145 if ( err ) {
144- logger . error ( res . body ) ;
146+ if ( res && res . body ) {
147+ logger . error ( res . body ) ;
148+ }
149+
145150 return reject ( err ) ;
146151 }
147152
@@ -151,7 +156,7 @@ const makeRequest = (req, path, method, payload) =>
151156) ;
152157
153158export const getResourceServer = ( req , audience ) =>
154- makeRequest ( req , 'resource-servers' , 'GET ')
159+ multipartRequest ( req . auth0 , 'resourceServers ' )
155160 . then ( ( apis ) => {
156161 const api = apis . filter ( item => item . identifier === audience ) ;
157162 return api . length && api [ 0 ] ;
@@ -183,7 +188,7 @@ export const deleteResourceServer = req =>
183188 } ) ;
184189
185190const getGrantId = req =>
186- makeRequest ( req , 'client-grants' , 'GET' )
191+ makeRequest ( req , 'client-grants' , 'GET' , { client_id : config ( 'AUTH0_CLIENT_ID' ) , audience : 'urn:auth0-authz-api' } )
187192 . then ( grants => grants . filter ( item => ( item . client_id === config ( 'AUTH0_CLIENT_ID' ) && item . audience === 'urn:auth0-authz-api' ) ) )
188193 . then ( grants => grants [ 0 ] && grants [ 0 ] . id ) ;
189194
0 commit comments