Romain/portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'production'

Browse Source 
fix passport bug with cookies

See merge request Romulus21/portal!60
This commit is contained in:
Romain Delanoë
2020-07-28 07:23:31 +00:00
parent 2b6f468f08 783f9c14fc
commit 226288bd71
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -14,7 +14,7 @@
"guzzlehttp/guzzle": "^6.5", "guzzlehttp/guzzle": "^6.5",
"intervention/image": "^2.5", "intervention/image": "^2.5",
"laravel/framework": "^7.0", "laravel/framework": "^7.0",
"laravel/passport": "^8.4", "laravel/passport": "^9.3",
"laravel/tinker": "^2.0", "laravel/tinker": "^2.0",
"laravel/ui": "^2.0" "laravel/ui": "^2.0"
}, },

48
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "2c4223d87e78990cf94811823ed227a9", "content-hash": "a45926d2c7834e2317faa380e750e44f",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
@@ -1233,33 +1233,33 @@
}, },
{ {
"name": "laravel/passport", "name": "laravel/passport",
"version": "v8.5.0", "version": "v9.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/passport.git", "url": "https://github.com/laravel/passport.git",
"reference": "6affa6ed600c5f8909385fbae7cf6f8af3db2d39" "reference": "192fe387c1c173c12f82784e2a1b51be8bd1bf45"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/passport/zipball/6affa6ed600c5f8909385fbae7cf6f8af3db2d39", "url": "https://api.github.com/repos/laravel/passport/zipball/192fe387c1c173c12f82784e2a1b51be8bd1bf45",
"reference": "6affa6ed600c5f8909385fbae7cf6f8af3db2d39", "reference": "192fe387c1c173c12f82784e2a1b51be8bd1bf45",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"firebase/php-jwt": "^3.0|^4.0|^5.0", "firebase/php-jwt": "^5.0",
"guzzlehttp/guzzle": "^6.0", "guzzlehttp/guzzle": "^6.0|^7.0",
"illuminate/auth": "^6.0|^7.0", "illuminate/auth": "^6.18.31|^7.22.4",
"illuminate/console": "^6.0|^7.0", "illuminate/console": "^6.18.31|^7.22.4",
"illuminate/container": "^6.0|^7.0", "illuminate/container": "^6.18.31|^7.22.4",
"illuminate/contracts": "^6.0|^7.0", "illuminate/contracts": "^6.18.31|^7.22.4",
"illuminate/cookie": "^6.0|^7.0", "illuminate/cookie": "^6.18.31|^7.22.4",
"illuminate/database": "^6.0|^7.0", "illuminate/database": "^6.18.31|^7.22.4",
"illuminate/encryption": "^6.0|^7.0", "illuminate/encryption": "^6.18.31|^7.22.4",
"illuminate/http": "^6.0|^7.0", "illuminate/http": "^6.18.31|^7.22.4",
"illuminate/support": "^6.0|^7.0", "illuminate/support": "^6.18.31|^7.22.4",
"laminas/laminas-diactoros": "^2.2", "laminas/laminas-diactoros": "^2.2",
"league/oauth2-server": "^8.0", "league/oauth2-server": "^8.1",
"nyholm/psr7": "^1.0", "nyholm/psr7": "^1.0",
"php": "^7.2", "php": "^7.2",
"phpseclib/phpseclib": "^2.0", "phpseclib/phpseclib": "^2.0",
@@ -1273,7 +1273,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "8.x-dev" "dev-master": "9.x-dev"
}, },
"laravel": { "laravel": {
"providers": [ "providers": [
@@ -1302,7 +1302,7 @@
"oauth", "oauth",
"passport" "passport"
], ],
"time": "2020-05-05T14:25:53+00:00" "time": "2020-07-27T18:34:39+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
@@ -1899,16 +1899,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.36.1", "version": "2.37.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "ee7378a36cc62952100e718bcc58be4c7210e55f" "reference": "1f61206de973d67f36ce50f041c792ddac663c3e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ee7378a36cc62952100e718bcc58be4c7210e55f", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1f61206de973d67f36ce50f041c792ddac663c3e",
"reference": "ee7378a36cc62952100e718bcc58be4c7210e55f", "reference": "1f61206de973d67f36ce50f041c792ddac663c3e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1984,7 +1984,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-07-04T12:29:56+00:00" "time": "2020-07-28T06:04:54+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",