Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 snipe
|
cbb5b6e846 | ||
|
snipe
|
08bd39dbba | ||
|
snipe
|
430808e180 | ||
|
snipe
|
6976dc2b26 | ||
|
snipe
|
27063d5bae | ||
|
snipe
|
5be86b9dbb | ||
|
snipe
|
afc78524fc | ||
|
snipe
|
eb33a2451f | ||
|
snipe
|
891a0a0965 | ||
|
snipe
|
50f0797850 | ||
|
snipe
|
36cdf0e0be | ||
|
snipe
|
d9cc3c3ec7 | ||
|
snipe
|
069a1608de | ||
|
snipe
|
60accfd601 |
+6
-6
@@ -121,12 +121,12 @@ return [
|
||||
'notifications' => [
|
||||
|
||||
'notifications' => [
|
||||
\Spatie\Backup\Notifications\Notifications\BackupHasFailed::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFound::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\CleanupHasFailed::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\BackupWasSuccessful::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\HealthyBackupWasFound::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\CleanupWasSuccessful::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\BackupHasFailedNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFoundNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\CleanupHasFailedNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\BackupWasSuccessfulNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\HealthyBackupWasFoundNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
\Spatie\Backup\Notifications\Notifications\CleanupWasSuccessfulNotification::class => [env('MAIL_BACKUP_NOTIFICATION_DRIVER', null)],
|
||||
],
|
||||
|
||||
/*
|
||||
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
return array (
|
||||
'app_version' => 'v7.0.0',
|
||||
'full_app_version' => 'v7.0.0 - build 13553-g9fccafa3a',
|
||||
'build_version' => '13553',
|
||||
'app_version' => 'v7.0.2',
|
||||
'full_app_version' => 'v7.0.2 - build 13978-g430808e18',
|
||||
'build_version' => '13978',
|
||||
'prerelease_version' => '',
|
||||
'hash_version' => 'g9fccafa3a',
|
||||
'full_hash' => 'v7.0.0-51-g9fccafa3a',
|
||||
'hash_version' => 'g430808e18',
|
||||
'full_hash' => 'v7.0.2-12-g430808e18',
|
||||
'branch' => 'master',
|
||||
);
|
||||
@@ -287,8 +287,18 @@ return [
|
||||
'zerofill_count' => 'Length of asset tags, including zerofill',
|
||||
'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
|
||||
'oauth_title' => 'OAuth API Settings',
|
||||
'oauth_clients' => 'OAuth Clients',
|
||||
'oauth' => 'OAuth',
|
||||
'oauth_help' => 'Oauth Endpoint Settings',
|
||||
'oauth_no_clients' => 'You have not created any OAuth clients yet.',
|
||||
'oauth_secret' => 'Secret',
|
||||
'oauth_authorized_apps' => 'Authorized Applications',
|
||||
'oauth_redirect_url' => 'Redirect URL',
|
||||
'oauth_name_help' => ' Something your users will recognize and trust.',
|
||||
'oauth_scopes' => 'Scopes',
|
||||
'oauth_callback_url' => 'Your application authorization callback URL.',
|
||||
'create_client' => 'Create Client',
|
||||
'no_scopes' => 'No scopes',
|
||||
'asset_tag_title' => 'Update Asset Tag Settings',
|
||||
'barcode_title' => 'Update Barcode Settings',
|
||||
'barcodes' => 'Barcodes',
|
||||
|
||||
@@ -473,7 +473,7 @@
|
||||
</div><!-- /.box-body -->
|
||||
</div> <!-- /.box -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@endif
|
||||
|
||||
|
||||
@@ -1,79 +1,84 @@
|
||||
<div>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<div style="display: flex; justify-content: space-between; align-items: center;">
|
||||
<h2>
|
||||
OAuth Clients
|
||||
<div class="box box-default">
|
||||
|
||||
<div class="box-header">
|
||||
<h2 class="box-title">
|
||||
{{ trans('admin/settings/general.oauth_clients') }}
|
||||
</h2>
|
||||
@if($authorizationError)
|
||||
@if ($authorizationError)
|
||||
<div class="alert alert-danger">
|
||||
<p><strong>Whoops!</strong> Something went wrong!</p>
|
||||
<p>{{ trans('admin/users/message.insufficient_permissions') }}
|
||||
<br>
|
||||
{{ $authorizationError }}
|
||||
</p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<a class="button button-small"
|
||||
wire:click="$emit('openModal')"
|
||||
onclick="$('#modal-create-client').modal('show');"
|
||||
>
|
||||
Create New Client
|
||||
</a>
|
||||
<div class="box-tools pull-right">
|
||||
<a class="btn btn-primary"
|
||||
wire:click="$emit('openModal')"
|
||||
onclick="$('#modal-create-client').modal('show');">
|
||||
{{ trans('general.create') }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel-body">
|
||||
<!-- Current Clients -->
|
||||
@if($clients->count() === 0)
|
||||
<p class="m-b-none">
|
||||
You have not created any OAuth clients.
|
||||
</p>
|
||||
@endif
|
||||
<div class="box-body">
|
||||
<!-- Current Clients -->
|
||||
@if($clients->count() === 0)
|
||||
<p>
|
||||
{{ trans('admin/settings/general.oauth_no_clients') }}
|
||||
</p>
|
||||
@endif
|
||||
|
||||
@if($clients->count() > 0)
|
||||
<table class="table table-borderless m-b-none">
|
||||
@if ($clients->count() > 0)
|
||||
<table class="table table-striped snipe-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Client ID</th>
|
||||
<th>Name</th>
|
||||
<th>Secret</th>
|
||||
<th><span class="sr-only">Edit</span></th>
|
||||
<th><span class="sr-only">Delete</span></th>
|
||||
<th>{{ trans('general.id') }}</th>
|
||||
<th>{{ trans('general.name') }}</th>
|
||||
<th>{{ trans('admin/settings/general.oauth_redirect_url') }}</th>
|
||||
<th>{{ trans('admin/settings/general.oauth_secret') }}</th>
|
||||
<th><span class="sr-only">{{ trans('general.actions') }}</span></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
@foreach($clients as $client)
|
||||
<tr>
|
||||
<!-- ID -->
|
||||
<td style="vertical-align: middle;">
|
||||
<td>
|
||||
{{ $client->id }}
|
||||
</td>
|
||||
|
||||
<!-- Name -->
|
||||
<td style="vertical-align: middle;">
|
||||
<td>
|
||||
{{ $client->name }}
|
||||
</td>
|
||||
|
||||
<!-- Redirect -->
|
||||
<td>
|
||||
{{ $client->redirect }}
|
||||
</td>
|
||||
|
||||
<!-- Secret -->
|
||||
<td style="vertical-align: middle;">
|
||||
<td>
|
||||
<code>{{ $client->secret }}</code>
|
||||
</td>
|
||||
|
||||
<!-- Edit Button -->
|
||||
<td style="vertical-align: middle;">
|
||||
<a class="action-link btn"
|
||||
wire:click="editClient('{{ $client->id }}')"
|
||||
onclick="$('#modal-edit-client').modal('show');"
|
||||
>
|
||||
Edit
|
||||
</a>
|
||||
</td>
|
||||
<!-- Edit / Delete Button -->
|
||||
<td class="text-right">
|
||||
|
||||
<a class="action-link btn btn-sm btn-warning"
|
||||
wire:click="editClient('{{ $client->id }}')"
|
||||
onclick="$('#modal-edit-client').modal('show');">
|
||||
<i class="fas fa-pencil-alt" aria-hidden="true"></i><span class="sr-only">{{ trans('general.update') }}</span>
|
||||
</a>
|
||||
|
||||
<!-- Delete Button -->
|
||||
<td style="vertical-align: middle;" class="text-right">
|
||||
<a class="action-link btn btn-danger btn-sm" wire:click="deleteClient('{{ $client->id }}')">
|
||||
<i class="fas fa-trash"></i>
|
||||
<i class="fas fa-trash" aria-hidden="true"></i>
|
||||
<span class="sr-only">
|
||||
{{ trans('general.delete') }}
|
||||
</span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -82,20 +87,28 @@
|
||||
</table>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div>
|
||||
@if ($authorized_tokens->count() > 0)
|
||||
<div>
|
||||
<div class="panel panel-default">
|
||||
<h2 class="panel-heading">Authorized Applications</h2>
|
||||
<div class="box box-default">
|
||||
<div class="box-header">
|
||||
<h2>
|
||||
{{ trans('admin/settings/general.oauth_authorized_apps') }}
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<div class="panel-body">
|
||||
<div class="box-body">
|
||||
<!-- Authorized Tokens -->
|
||||
<table class="table table-borderless m-b-none">
|
||||
<table class="table table-striped snipe-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Scopes</th>
|
||||
<th><span class="sr-only">Delete</span></th>
|
||||
<th>{{ trans('general.name') }}</th>
|
||||
<th>{{ trans('admin/settings/general.oauth_scopes') }}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@@ -103,23 +116,28 @@
|
||||
@foreach($authorized_tokens as $token)
|
||||
<tr>
|
||||
<!-- Client Name -->
|
||||
<td style="vertical-align: middle;">
|
||||
<td>
|
||||
{{ $token->client->name }}
|
||||
</td>
|
||||
|
||||
<!-- Scopes -->
|
||||
<td style="vertical-align: middle;">
|
||||
<td>
|
||||
@if(!$token->scopes)
|
||||
<span class="label label-default">No Scopes</span>
|
||||
<span class="label label-default">
|
||||
{{ trans('admin/settings/general.no_scopes') }}
|
||||
</span>
|
||||
@endif
|
||||
</td>
|
||||
|
||||
<!-- Revoke Button -->
|
||||
<td style="vertical-align: middle;">
|
||||
<a class="btn btn-sm btn-danger"
|
||||
<td>
|
||||
<a class="btn btn-sm btn-danger pull-right"
|
||||
wire:click="deleteToken('{{ $token->id }}')"
|
||||
>
|
||||
<i class="fas fa-trash"></i>
|
||||
<i class="fas fa-trash" aria-hidden="true"></i>
|
||||
<span class="sr-only">
|
||||
{{ trans('general.delete') }}
|
||||
</span>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -130,8 +148,10 @@
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- Create Client Modal -->
|
||||
<div class="modal fade" id="modal-create-client" tabindex="-1" role="dialog" wire:ignore.self>
|
||||
@@ -141,7 +161,7 @@
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
|
||||
<h2 class="modal-title">
|
||||
Create Client
|
||||
{{ trans('admin/settings/general.create_client') }}
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
@@ -166,7 +186,9 @@
|
||||
<form class="form-horizontal" role="form">
|
||||
<!-- Name -->
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label" for="create-client-name">Name</label>
|
||||
<label class="col-md-3 control-label" for="create-client-name">
|
||||
{{ trans('general.name') }}
|
||||
</label>
|
||||
|
||||
<div class="col-md-7">
|
||||
<input id="create-client-name"
|
||||
@@ -175,18 +197,17 @@
|
||||
class="form-control"
|
||||
wire:model="name"
|
||||
wire:keydown.enter="createClient"
|
||||
autofocus
|
||||
>
|
||||
autofocus>
|
||||
|
||||
<span class="help-block">
|
||||
Something your users will recognize and trust.
|
||||
{{ trans('admin/settings/general.oauth_name_help') }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Redirect URL -->
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label" for="redirect">Redirect URL</label>
|
||||
<label class="col-md-3 control-label" for="redirect">{{ trans('admin/settings/general.oauth_redirect_url') }}</label>
|
||||
|
||||
<div class="col-md-7">
|
||||
<input type="text"
|
||||
@@ -198,7 +219,7 @@
|
||||
>
|
||||
|
||||
<span class="help-block">
|
||||
Your application's authorization callback URL.
|
||||
{{ trans('admin/settings/general.oauth_callback_url') }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -218,6 +239,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Edit Client Modal -->
|
||||
<div class="modal fade" id="modal-edit-client" tabindex="-1" role="dialog" wire:ignore.self>
|
||||
@@ -225,9 +248,8 @@
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
|
||||
<h4 class="modal-title">
|
||||
Edit Client
|
||||
{{ trans('general.update') }}
|
||||
</h4>
|
||||
</div>
|
||||
|
||||
@@ -268,14 +290,14 @@
|
||||
>
|
||||
|
||||
<span class="help-block">
|
||||
Something your users will recognize and trust.
|
||||
{{ trans('admin/settings/general.oauth_name_help') }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Redirect URL -->
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 control-label" for="redirect">Redirect URL</label>
|
||||
<label class="col-md-3 control-label" for="redirect">{{ trans('admin/settings/general.oauth_redirect_url') }}</label>
|
||||
|
||||
<div class="col-md-7">
|
||||
<input
|
||||
@@ -288,7 +310,7 @@
|
||||
>
|
||||
|
||||
<span class="help-block">
|
||||
Your application's authorization callback URL.
|
||||
{{ trans('admin/settings/general.oauth_callback_url') }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -330,4 +352,5 @@
|
||||
|
||||
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
</td>
|
||||
<td class="col-md-1"><i class="fas fa-barcode" aria-hidden="true"></i></td>
|
||||
<td class="col-md-10">Name</td>
|
||||
<td class="col-md-10">{{ trans('general.name') }}</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<livewire:oauth-clients />
|
||||
</div>
|
||||
@else
|
||||
<p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
|
||||
<p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
|
||||
@endif
|
||||
|
||||
@stop
|
||||
|
||||
@@ -194,8 +194,7 @@
|
||||
</div> <!-- end col-md-12 form div -->
|
||||
</div> <!-- end form group div -->
|
||||
|
||||
</div> <!-- end col-md-3 div -->
|
||||
</div> <!-- end row div -->
|
||||
|
||||
|
||||
@stop
|
||||
|
||||
|
||||
@@ -390,7 +390,7 @@
|
||||
|
||||
</div> <!-- /box -->
|
||||
</div> <!-- /.col-md-8-->
|
||||
</div> <!-- /.row-->
|
||||
|
||||
|
||||
{{ Form::close() }}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user