From a22280130e04d1a0312dd137eec5122639bcf995 Mon Sep 17 00:00:00 2001 From: Hunter Perrin Date: Mon, 7 May 2018 20:14:40 -0700 Subject: [PATCH] Fix exception on invalid JWT token. Version bump. --- composer.json | 2 +- composer.lock | 12 ++++++------ src/HookMethods.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index ce6abbb..f57df71 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "sciactive/tilmeld-server", "description": "Nymph user and group management with access controls.", - "version": "1.0.0-beta.18", + "version": "1.0.0-beta.19", "time": "2018-05-07", "type": "library", "keywords": [ diff --git a/composer.lock b/composer.lock index dadbfbe..ec0c5cc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "160288da6a441037e43bb6f462be9f29", + "content-hash": "c52f0a2e0f806eb479dddfcfdca3d8ab", "packages": [ { "name": "lcobucci/jwt", @@ -179,16 +179,16 @@ }, { "name": "sciactive/nymph-server", - "version": "3.0.0-beta.11", + "version": "3.0.0-beta.12", "source": { "type": "git", "url": "https://github.com/sciactive/nymph-server.git", - "reference": "62d89f6e22b095ae99c16d746ff454b96c93bc7e" + "reference": "ce1e4dc4b7f03e18f041d02b8a58754cbbf69b5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sciactive/nymph-server/zipball/62d89f6e22b095ae99c16d746ff454b96c93bc7e", - "reference": "62d89f6e22b095ae99c16d746ff454b96c93bc7e", + "url": "https://api.github.com/repos/sciactive/nymph-server/zipball/ce1e4dc4b7f03e18f041d02b8a58754cbbf69b5e", + "reference": "ce1e4dc4b7f03e18f041d02b8a58754cbbf69b5e", "shasum": "" }, "require-dev": { @@ -229,7 +229,7 @@ "postgres", "postgresql" ], - "time": "2018-05-04T00:00:00+00:00" + "time": "2018-05-07T00:00:00+00:00" }, { "name": "sciactive/umailphp", diff --git a/src/HookMethods.php b/src/HookMethods.php index 3ddd98f..75aaa2d 100644 --- a/src/HookMethods.php +++ b/src/HookMethods.php @@ -27,7 +27,7 @@ public static function setup() { ) { if ($array[0]['source'] === 'pubsub') { if (isset($array[0]['token'])) { - $user = Tilmeld::extractToken($array[0]['token']) ?? null; + $user = Tilmeld::extractToken($array[0]['token']) ?: null; } else { $user = null; }