Skip to content

Commit 8fd3972

Browse files
authored
Merge pull request #10 from mirucon/chore/update_lcobucci/jwt
Update lcobucci/jwt library to 3.3
2 parents 8478c5f + cccad11 commit 8fd3972

File tree

4 files changed

+23
-30
lines changed

4 files changed

+23
-30
lines changed

laravel/embedded_analytics/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,3 @@ Explore the app to learn more about embedding Metabase charts and dashboards in
4949
- **Code**. You can find example code for embedding Metabase in [routes/web.php](routes/web.php).
5050

5151
- **View**. You can find an example view in [resources/views/welcome.blade.php](resources/views/welcome.blade.php).
52-

laravel/embedded_analytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"php": ">=5.6.4",
99
"laravel/framework": "5.4.*",
1010
"laravel/tinker": "~1.0",
11-
"lcobucci/jwt": "^3.2"
11+
"lcobucci/jwt": "^3.3"
1212
},
1313
"require-dev": {
1414
"fzaninotto/faker": "~1.4",

laravel/embedded_analytics/composer.lock

Lines changed: 9 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

laravel/embedded_analytics/routes/web.php

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Lcobucci\JWT\Builder;
1515
use Lcobucci\JWT\Signer\Hmac\Sha256;
16+
use Lcobucci\JWT\Signer\Key;
1617

1718
Route::get('/', function () {
1819

@@ -21,14 +22,13 @@
2122

2223
$signer = new Sha256();
2324
$token = (new Builder())
24-
->set('resource', [
25+
->withClaim('resource', [
2526
'dashboard' => 1
2627
])
27-
->set('params', [
28+
->withClaim('params', [
2829
'params' => (object)[]
2930
])
30-
->sign($signer, $metabaseSecretKey)
31-
->getToken();
31+
->getToken($signer, new Key($metabaseSecretKey));
3232

3333
$iframeUrl = "{$metabaseSiteUrl}/embed/dashboard/{$token}#bordered=true&titled=true";
3434

@@ -43,14 +43,13 @@
4343

4444
$signer = new Sha256();
4545
$token = (new Builder())
46-
->set('resource', [
46+
->withClaim('resource', [
4747
'dashboard' => 2
4848
])
49-
->set('params', [
49+
->withClaim('params', [
5050
'id' => $userId
5151
])
52-
->sign($signer, $metabaseSecretKey)
53-
->getToken();
52+
->getToken($signer, new Key($metabaseSecretKey));
5453

5554
$iframeUrl = "{$metabaseSiteUrl}/embed/dashboard/{$token}#bordered=true";
5655

@@ -64,14 +63,13 @@
6463

6564
$signer = new Sha256();
6665
$token = (new Builder())
67-
->set('resource', [
66+
->withClaim('resource', [
6867
'question' => 2
6968
])
70-
->set('params', [
69+
->withClaim('params', [
7170
'person_id' => $userId
7271
])
73-
->sign($signer, $metabaseSecretKey)
74-
->getToken();
72+
->getToken($signer, new Key($metabaseSecretKey));
7573

7674
$iframeUrl = "{$metabaseSiteUrl}/embed/question/{$token}#bordered=true&titled=true";
7775

@@ -86,12 +84,11 @@
8684

8785
$signer = new Sha256();
8886
$token = (new Builder())
89-
->set('resource', [
87+
->withClaim('resource', [
9088
'dashboard' => 1
9189
])
92-
->set('params', (object)[])
93-
->sign($signer, $metabaseSecretKey)
94-
->getToken();
90+
->withClaim('params', (object)[])
91+
->getToken($signer, new Key($metabaseSecretKey));
9592

9693
$iframeUrl = "{$metabaseSiteUrl}/embed/dashboard/{$token}#bordered=true&titled=true";
9794

0 commit comments

Comments
 (0)