Skip to content

Commit bc0192d

Browse files
committed
[yggdrasil connect] fix #237, bump version to 6.1.1
1 parent 41404e1 commit bc0192d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

plugins/yggdrasil-connect/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yggdrasil-connect",
3-
"version": "6.1.0",
3+
"version": "6.1.1",
44
"title": "Yggdrasil Connect",
55
"description": "LittleSkin\\YggdrasilConnect::config.plugin-description",
66
"author": "LittleSkin",

plugins/yggdrasil-connect/src/Controllers/AuthController.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Illuminate\Routing\Controller;
99
use Illuminate\Support\Facades\Log;
1010
use Illuminate\Support\Facades\Validator;
11+
use Illuminate\Validation\Rule;
1112
use LittleSkin\YggdrasilConnect\Exceptions\Yggdrasil\ForbiddenOperationException;
1213
use LittleSkin\YggdrasilConnect\Exceptions\Yggdrasil\IllegalArgumentException;
1314
use LittleSkin\YggdrasilConnect\Models\AccessToken;
@@ -81,10 +82,11 @@ public function authenticate(Request $request): JsonResponse
8182

8283
public function refresh(Request $request): JsonResponse
8384
{
85+
$requireProfileInfo = !($request->input('selectedProfile') === null);
8486
$validation = Validator::make($request->all(), [
85-
'selectedProfile' => ['nullable', 'required_array_keys:id,name'],
86-
'selectedProfile.id' => ['required_with:selectedProfile', 'string'],
87-
'selectedProfile.name' => ['required_with:selectedProfile', 'string'],
87+
'selectedProfile' => ['nullable'],
88+
'selectedProfile.id' => [Rule::requiredIf($requireProfileInfo), 'string'],
89+
'selectedProfile.name' => [Rule::requiredIf($requireProfileInfo), 'string'],
8890
]);
8991

9092
if ($validation->fails()) {

0 commit comments

Comments
 (0)