Skip to content
This repository has been archived by the owner on Nov 30, 2022. It is now read-only.

Use Util::getShopifyConfig instead of env. #846

Merged
merged 2 commits into from
Jun 24, 2021
Merged

Use Util::getShopifyConfig instead of env. #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d58285
Use Util::getShopifyConfig instead of env.
lucasmichot Jun 24, 2021
e8a71ae
Add missing import.
lucasmichot Jun 24, 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
5 changes: 3 additions & 2 deletions tests/Actions/AuthorizeShopTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Osiset\ShopifyApp\Objects\Values\ShopDomain;
use Osiset\ShopifyApp\Test\Stubs\Api as ApiStub;
use Osiset\ShopifyApp\Test\TestCase;
use Osiset\ShopifyApp\Util;

class AuthorizeShopTest extends TestCase
{
Expand All @@ -30,7 +31,7 @@ public function testNoShopShouldBeMade(): void
);

$this->assertStringContainsString(
'/admin/oauth/authorize?client_id='.env('SHOPIFY_API_KEY').'&scope=read_products%2Cwrite_products&redirect_uri=https%3A%2F%2Flocalhost%2Fauthenticate',
'/admin/oauth/authorize?client_id='.Util::getShopifyConfig('api_key').'&scope=read_products%2Cwrite_products&redirect_uri=https%3A%2F%2Flocalhost%2Fauthenticate',
$result->url
);
$this->assertFalse($result->completed);
Expand All @@ -48,7 +49,7 @@ public function testWithoutCode(): void
);

$this->assertStringContainsString(
'/admin/oauth/authorize?client_id='.env('SHOPIFY_API_KEY').'&scope=read_products%2Cwrite_products&redirect_uri=https%3A%2F%2Flocalhost%2Fauthenticate',
'/admin/oauth/authorize?client_id='.Util::getShopifyConfig('api_key').'&scope=read_products%2Cwrite_products&redirect_uri=https%3A%2F%2Flocalhost%2Fauthenticate',
$result->url
);
$this->assertFalse($result->completed);
Expand Down
20 changes: 10 additions & 10 deletions tests/Http/Middleware/AuthTokenTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public function testDenysForValidRegexValidSignatureBadBody(): void

$invalidPayload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $invalidBody);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $invalidPayload, $secret, true));

Expand Down Expand Up @@ -213,7 +213,7 @@ public function testDenysForExpiredToken(): void
$expiredBody = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now - 60,
'nbf' => $now - 120,
Expand All @@ -224,7 +224,7 @@ public function testDenysForExpiredToken(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $expiredBody);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down Expand Up @@ -265,7 +265,7 @@ public function testDenysForFutureToken(): void
$expiredBody = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now + 120,
Expand All @@ -276,7 +276,7 @@ public function testDenysForFutureToken(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $expiredBody);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down Expand Up @@ -317,7 +317,7 @@ public function testDenysForInvalidUrl(): void
$expiredBody = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://another-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -328,7 +328,7 @@ public function testDenysForInvalidUrl(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $expiredBody);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down Expand Up @@ -380,7 +380,7 @@ public function testDenysForInvalidApiKey(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $expiredBody);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down Expand Up @@ -421,7 +421,7 @@ public function testRuns(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -432,7 +432,7 @@ public function testRuns(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down
5 changes: 3 additions & 2 deletions tests/Services/ApiHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Osiset\ShopifyApp\Objects\Values\ChargeReference;
use Osiset\ShopifyApp\Test\Stubs\Api as ApiStub;
use Osiset\ShopifyApp\Test\TestCase;
use Osiset\ShopifyApp\Util;

class ApiHelperTest extends TestCase
{
Expand All @@ -39,8 +40,8 @@ public function testMake(): void
$api = $this->api->make()->getApi();

$this->assertInstanceOf(BasicShopifyAPI::class, $api);
$this->assertSame(env('SHOPIFY_API_SECRET'), $this->app['config']->get('shopify-app.api_secret'));
$this->assertSame(env('SHOPIFY_API_KEY'), $this->app['config']->get('shopify-app.api_key'));
$this->assertSame(Util::getShopifyConfig('api_secret'), $this->app['config']->get('shopify-app.api_secret'));
$this->assertSame(Util::getShopifyConfig('api_key'), $this->app['config']->get('shopify-app.api_key'));
$this->assertSame($this->app['config']->get('shopify-app.api_version'), '2020-01');
}

Expand Down
48 changes: 24 additions & 24 deletions tests/Traits/ApiControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function testApiWithToken(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -55,7 +55,7 @@ public function testApiWithToken(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand All @@ -82,7 +82,7 @@ public function testApiWithTokenJson(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -93,7 +93,7 @@ public function testApiWithTokenJson(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down Expand Up @@ -121,7 +121,7 @@ public function testApiWithExpiredToken(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now - 120,
'nbf' => $now - 180,
Expand All @@ -132,7 +132,7 @@ public function testApiWithExpiredToken(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand All @@ -159,7 +159,7 @@ public function testApiWithExpiredTokenJson(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now - 120,
'nbf' => $now - 180,
Expand All @@ -170,7 +170,7 @@ public function testApiWithExpiredTokenJson(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down Expand Up @@ -198,7 +198,7 @@ public function testApiWithMalformedToken(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -208,7 +208,7 @@ public function testApiWithMalformedToken(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand All @@ -235,7 +235,7 @@ public function testApiWithMalformedTokenJson(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -245,7 +245,7 @@ public function testApiWithMalformedTokenJson(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down Expand Up @@ -273,7 +273,7 @@ public function testApiWithDomainMismatch(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://another-shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -284,7 +284,7 @@ public function testApiWithDomainMismatch(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand All @@ -311,7 +311,7 @@ public function testApiWithDomainMismatchJson(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://another-shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -322,7 +322,7 @@ public function testApiWithDomainMismatchJson(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down Expand Up @@ -350,7 +350,7 @@ public function testApiWithInvalidTokenHeader(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -361,7 +361,7 @@ public function testApiWithInvalidTokenHeader(): void

$payload = sprintf('xxxxxx.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand All @@ -388,7 +388,7 @@ public function testApiWithInvalidTokenHeaderJson(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -399,7 +399,7 @@ public function testApiWithInvalidTokenHeaderJson(): void

$payload = sprintf('xxxxxx.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down Expand Up @@ -427,7 +427,7 @@ public function testApiGetSelf(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -438,7 +438,7 @@ public function testApiGetSelf(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand All @@ -465,7 +465,7 @@ public function testApiGetPlans(): void
$body = Util::base64UrlEncode(json_encode([
'iss' => 'https://shop-name.myshopify.com/admin',
'dest' => 'https://shop-name.myshopify.com',
'aud' => env('SHOPIFY_API_KEY'),
'aud' => Util::getShopifyConfig('api_key'),
'sub' => '123',
'exp' => $now + 60,
'nbf' => $now,
Expand All @@ -476,7 +476,7 @@ public function testApiGetPlans(): void

$payload = sprintf('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.%s', $body);

$secret = env('SHOPIFY_API_SECRET');
$secret = Util::getShopifyConfig('api_secret');

$hmac = Util::base64UrlEncode(hash_hmac('sha256', $payload, $secret, true));

Expand Down
5 changes: 3 additions & 2 deletions tests/Traits/AuthControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Osiset\ShopifyApp\Services\ShopSession;
use Osiset\ShopifyApp\Test\Stubs\Api as ApiStub;
use Osiset\ShopifyApp\Test\TestCase;
use Osiset\ShopifyApp\Util;

class AuthControllerTest extends TestCase
{
Expand Down Expand Up @@ -33,7 +34,7 @@ public function testAuthRedirectsToShopifyWhenNoCode(): void
$response->assertViewHas('shopDomain', 'example.myshopify.com');
$response->assertViewHas(
'authUrl',
'https://example.myshopify.com/admin/oauth/authorize?client_id='.env('SHOPIFY_API_KEY').'&scope=read_products%2Cwrite_products&redirect_uri=https%3A%2F%2Flocalhost%2Fauthenticate'
'https://example.myshopify.com/admin/oauth/authorize?client_id='.Util::getShopifyConfig('api_key').'&scope=read_products%2Cwrite_products&redirect_uri=https%3A%2F%2Flocalhost%2Fauthenticate'
);
}

Expand Down Expand Up @@ -98,7 +99,7 @@ public function testOauthRedirect(): void
$response = $this->call('get', '/authenticate/oauth', ['shop' => 'example.myshopify.com']);
$response->assertViewHas(
'authUrl',
'https://example.myshopify.com/admin/oauth/authorize?client_id='.env('SHOPIFY_API_KEY').'&scope=read_products%2Cwrite_products&redirect_uri=https%3A%2F%2Flocalhost%2Fauthenticate'
'https://example.myshopify.com/admin/oauth/authorize?client_id='.Util::getShopifyConfig('api_key').'&scope=read_products%2Cwrite_products&redirect_uri=https%3A%2F%2Flocalhost%2Fauthenticate'
);
}
}