Added callback_url and create validation method
This commit is contained in:
parent
c972c0029d
commit
eb3366dc08
|
@ -80,10 +80,44 @@ class WC_Auth {
|
||||||
return add_query_arg( array(
|
return add_query_arg( array(
|
||||||
'app_name' => wc_clean( $data['app_name'] ),
|
'app_name' => wc_clean( $data['app_name'] ),
|
||||||
'return_url' => urlencode( $data['return_url'] ),
|
'return_url' => urlencode( $data['return_url'] ),
|
||||||
|
'callback_url' => urlencode( $data['callback_url'] ),
|
||||||
'permission_type' => wc_clean( $data['permission_type'] ),
|
'permission_type' => wc_clean( $data['permission_type'] ),
|
||||||
), $url );
|
), $url );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make validation
|
||||||
|
*/
|
||||||
|
protected function make_validation() {
|
||||||
|
if ( empty( $_REQUEST['app_name'] ) ) {
|
||||||
|
throw new Exception( sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'app_name' ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( empty( $_REQUEST['return_url'] ) ) {
|
||||||
|
throw new Exception( sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'return_url' ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( false === filter_var( urldecode( $_REQUEST['return_url'] ), FILTER_VALIDATE_URL ) ) {
|
||||||
|
throw new Exception( __( 'The return_url is not a valid URL', 'woocommerce' ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( empty( $_REQUEST['callback_url'] ) ) {
|
||||||
|
throw new Exception( sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'callback_url' ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( 0 !== stripos( urldecode( $_REQUEST['callback_url'] ), 'https://' ) ) {
|
||||||
|
throw new Exception( __( 'The callback_url need to be over SSL', 'woocommerce' ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( empty( $_REQUEST['permission_type'] ) ) {
|
||||||
|
throw new Exception( sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'permission_type' ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( ! in_array( $_REQUEST['permission_type'], array( 'read', 'write', 'read_write' ) ) ) {
|
||||||
|
throw new Exception( sprintf( __( 'Invalid permission_type %s', 'woocommerce' ), wc_clean( $_REQUEST['permission_type'] ) ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle auth requests
|
* Handle auth requests
|
||||||
*
|
*
|
||||||
|
@ -103,23 +137,10 @@ class WC_Auth {
|
||||||
try {
|
try {
|
||||||
$method = strtolower( wc_clean( $wp->query_vars['wc-auth'] ) );
|
$method = strtolower( wc_clean( $wp->query_vars['wc-auth'] ) );
|
||||||
|
|
||||||
if ( empty( $_REQUEST['app_name'] ) ) {
|
$this->make_validation();
|
||||||
throw new Exception( sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'app_name' ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( empty( $_REQUEST['return_url'] ) ) {
|
// Login endpoint
|
||||||
throw new Exception( sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'return_url' ) );
|
if ( 'login' == $method && ! is_user_logged_in() ) {
|
||||||
}
|
|
||||||
|
|
||||||
if ( empty( $_REQUEST['permission_type'] ) ) {
|
|
||||||
throw new Exception( sprintf( __( 'Missing parameter %s', 'woocommerce' ), 'permission_type' ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( ! in_array( $_REQUEST['permission_type'], array( 'read', 'write', 'read_write' ) ) ) {
|
|
||||||
throw new Exception( sprintf( __( 'Invalid permission_type %s', 'woocommerce' ), wc_clean( $_REQUEST['permission_type'] ) ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( 'login' == $method && ! is_user_logged_in() ) { // Login endpoint
|
|
||||||
wc_get_template( 'auth/form-login.php', array(
|
wc_get_template( 'auth/form-login.php', array(
|
||||||
'app_name' => $_REQUEST['app_name'],
|
'app_name' => $_REQUEST['app_name'],
|
||||||
'return_url' => $_REQUEST['return_url'],
|
'return_url' => $_REQUEST['return_url'],
|
||||||
|
@ -127,6 +148,8 @@ class WC_Auth {
|
||||||
) );
|
) );
|
||||||
|
|
||||||
exit;
|
exit;
|
||||||
|
|
||||||
|
// Grant access endpoint
|
||||||
} else if ( ( 'grant_access' == $method && current_user_can( 'manage_woocommerce' ) ) || ( 'login' == $method && is_user_logged_in() ) ) {
|
} else if ( ( 'grant_access' == $method && current_user_can( 'manage_woocommerce' ) ) || ( 'login' == $method && is_user_logged_in() ) ) {
|
||||||
wc_get_template( 'auth/form-grant-access.php', array(
|
wc_get_template( 'auth/form-grant-access.php', array(
|
||||||
'app_name' => $_REQUEST['app_name'],
|
'app_name' => $_REQUEST['app_name'],
|
||||||
|
@ -137,6 +160,8 @@ class WC_Auth {
|
||||||
) );
|
) );
|
||||||
|
|
||||||
exit;
|
exit;
|
||||||
|
|
||||||
|
// Granted access endpoint
|
||||||
} else if ( 'granted_access' == $method && current_user_can( 'manage_woocommerce' ) ) {
|
} else if ( 'granted_access' == $method && current_user_can( 'manage_woocommerce' ) ) {
|
||||||
echo '@TODO';
|
echo '@TODO';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue