Skip to content

DX-2244 Removed URL Encoding for Media Functions #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 28, 2021
Merged

DX-2244 Removed URL Encoding for Media Functions #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c081d14
DX-2244 Removed URL Encoding for Media Functions
ckoegel Sep 27, 2021
4f3f3e1
updated gitignore
ckoegel Sep 27, 2021
a414fdd
changed filename for media test
ckoegel Sep 27, 2021
01d0996
test url
ckoegel Sep 27, 2021
e60ae3c
filename
ckoegel Sep 27, 2021
32a3882
retry test
ckoegel Sep 27, 2021
bba5a49
filename
ckoegel Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
vendor
composer.lock
.phpunit.result.cache
composer.phar
21 changes: 12 additions & 9 deletions src/Messaging/Controllers/APIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,10 @@ public function getMedia(

//process optional query parameters
$_queryBuilder = APIHelper::appendUrlWithTemplateParameters($_queryBuilder, array (
'accountId' => $accountId,
'mediaId' => $mediaId,
));
'accountId' => $accountId,
'mediaId' => $mediaId,
), false
);

//validate and preprocess url
$_queryUrl = APIHelper::cleanUrl($this->config->getBaseUri(Servers::MESSAGINGDEFAULT) . $_queryBuilder);
Expand Down Expand Up @@ -232,9 +233,10 @@ public function uploadMedia(

//process optional query parameters
$_queryBuilder = APIHelper::appendUrlWithTemplateParameters($_queryBuilder, array (
'accountId' => $accountId,
'mediaId' => $mediaId,
));
'accountId' => $accountId,
'mediaId' => $mediaId,
), false
);

//validate and preprocess url
$_queryUrl = APIHelper::cleanUrl($this->config->getBaseUri(Servers::MESSAGINGDEFAULT) . $_queryBuilder);
Expand Down Expand Up @@ -325,9 +327,10 @@ public function deleteMedia(

//process optional query parameters
$_queryBuilder = APIHelper::appendUrlWithTemplateParameters($_queryBuilder, array (
'accountId' => $accountId,
'mediaId' => $mediaId,
));
'accountId' => $accountId,
'mediaId' => $mediaId,
), false
);

//validate and preprocess url
$_queryUrl = APIHelper::cleanUrl($this->config->getBaseUri(Servers::MESSAGINGDEFAULT) . $_queryBuilder);
Expand Down
5 changes: 4 additions & 1 deletion tests/ApiTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,17 @@ public function testCreateMessageInvalidPhoneNumber() {
public function testUploadDownloadMedia() {
//constants

$mediaFileName = "php_monitoring";
$mediaFileName = "php-monitoring";
$mediaFile = "12345"; //todo: confirm binary string?
//media upload
$this->bandwidthClient->getMessaging()->getClient()->uploadMedia(getenv("BW_ACCOUNT_ID"), $mediaFileName, $mediaFile);

//media download
$downloadedMediaFile = $this->bandwidthClient->getMessaging()->getClient()->getMedia(getenv("BW_ACCOUNT_ID"), $mediaFileName)->getResult();

//media delete
$deleteMedaiFile = $this->bandwidthClient->getMessaging()->getClient()->deleteMedia(getenv("BW_ACCOUNT_ID"), $mediaFileName);

//validate that response is the same
$this->assertEquals($downloadedMediaFile, $mediaFile);
}
Expand Down