Skip to content

Commit fb7d8a9

Browse files
committed
Merge branch 'feature/api-key-changes' into feature/api-v1
2 parents 4c57b5e + a10db20 commit fb7d8a9

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

app/Http/Middleware/API/AuthenticateIPAccess.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ public function handle(Request $request, Closure $next)
2828
return $next($request);
2929
}
3030

31+
$find = new IP($request->ip());
3132
foreach ($model->allowed_ips as $ip) {
32-
if (Range::parse($ip)->contains(new IP($request->ip()))) {
33+
if (Range::parse($ip)->contains($find)) {
3334
return $next($request);
3435
}
3536
}

resources/lang/en/base.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
'header_sub' => 'Manage your API access keys.',
3434
'list' => 'API Keys',
3535
'create_new' => 'Create New API key',
36-
'keypair_created' => 'An API Key-Pair has been generated and is listed below.',
36+
'keypair_created' => 'An API key has been successfully generated and is listed below.',
3737
],
3838
'new' => [
3939
'header' => 'New API Key',

0 commit comments

Comments
 (0)