WordPress.org
Get WordPress

Plugin Directory

Changeset 2749723


Ignore:
Timestamp:
06/29/2022 02:43:01 PM (4 years ago)
Author:
CommonNinja
Message:

redirect fix

File:
1 edited

Legend:

Unmodified
Added
Removed

  • common-ninja-audio-player-for-woocommerce/trunk/commonninja/commonninja.init.php

    r2746858 r2749723  
    3838
    3939    $cn_getRedirectUrl = function () use ($cn_getEncodedUrl) {
    40         $url = sanitize_url($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
    41         $url = substr($url, "&", true) ?: $url;
     40        $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? "https://" : "http://";
     41        $url = sanitize_url($protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
     42        $encodedUrl = $cn_getEncodedUrl($url);
    4243        return $cn_getEncodedUrl($url);
    4344    };
    … …  
    4950    $cn_generatePluginUrl = function ($token) use ($cn_plugin_config, $cn_getRedirectUrl, $cn_getStoreUrl) {
    5051        $base_url = 'https://integrations.commoninja.com/integrations/woocommerce/';
    51 
    52         $query_params = !$token ? 'redirectUrl=http://' . $cn_getRedirectUrl() : 'token=' . $token;
    53 
    54         return $base_url . $cn_plugin_config['cn_app_id'] . '/oauth/authenticate?store_url=' . $cn_getStoreUrl() . "&" . $query_params;
     52        $query_params = !$token ? 'redirectUrl=' . $cn_getRedirectUrl() : 'token=' . $token;
     53        $final_url = $base_url . $cn_plugin_config['cn_app_id'] . '/oauth/authenticate?store_url=' . $cn_getStoreUrl() . "&" . $query_params;
     54        return $final_url;
    5555    };
    5656
Note: See TracChangeset for help on using the changeset viewer.