Skip to content

Commit

Permalink
Merge tag 'v5.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesse Denardo committed Mar 7, 2018
2 parents c2deabf + 7239e8c commit 80e6b7c
Show file tree
Hide file tree
Showing 48 changed files with 478 additions and 142 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
language: php

php:
- 5.6
- 7.0
- 7.1
- 7.2

sudo: false

before_install:
- if [[ $TRAVIS_PHP_VERSION != 7.1 ]] ; then phpenv config-rm xdebug.ini; fi
- phpenv config-rm xdebug.ini || true

install: travis_retry composer install --no-interaction --prefer-dist --no-suggest

Expand Down
24 changes: 12 additions & 12 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@
}
],
"require": {
"php": ">=5.6.4",
"php": ">=7.0",
"firebase/php-jwt": "~3.0|~4.0|~5.0",
"guzzlehttp/guzzle": "~6.0",
"illuminate/auth": "~5.4",
"illuminate/console": "~5.4",
"illuminate/container": "~5.4",
"illuminate/contracts": "~5.4",
"illuminate/database": "~5.4",
"illuminate/encryption": "~5.4",
"illuminate/http": "~5.4",
"illuminate/support": "~5.4",
"illuminate/auth": "~5.6",
"illuminate/console": "~5.6",
"illuminate/container": "~5.6",
"illuminate/contracts": "~5.6",
"illuminate/database": "~5.6",
"illuminate/encryption": "~5.6",
"illuminate/http": "~5.6",
"illuminate/support": "~5.6",
"league/oauth2-server": "^6.0",
"phpseclib/phpseclib": "^2.0",
"symfony/psr-http-message-bridge": "~1.0",
"zendframework/zend-diactoros": "~1.0"
},
"require-dev": {
"mockery/mockery": "~0.9",
"phpunit/phpunit": "~5.0"
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~6.0"
},
"autoload": {
"psr-4": {
Expand All @@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "6.0-dev"
},
"laravel": {
"providers": [
Expand Down
6 changes: 6 additions & 0 deletions phpunit.xml.dist
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
Expand All @@ -15,4 +16,9 @@
<directory suffix=".php">./tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src/</directory>
</whitelist>
</filter>
</phpunit>
12 changes: 4 additions & 8 deletions resources/assets/js/components/AuthorizedClients.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
.action-link {
cursor: pointer;
}
.m-b-none {
margin-bottom: 0;
}
</style>

<template>
<div>
<div v-if="tokens.length > 0">
<div class="panel panel-default">
<div class="panel-heading">Authorized Applications</div>
<div class="card card-default">
<div class="card-header">Authorized Applications</div>

<div class="panel-body">
<div class="card-body">
<!-- Authorized Tokens -->
<table class="table table-borderless m-b-none">
<table class="table table-borderless mb-0">
<thead>
<tr>
<th>Name</th>
Expand Down
72 changes: 34 additions & 38 deletions resources/assets/js/components/Clients.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,30 @@
.action-link {
cursor: pointer;
}
.m-b-none {
margin-bottom: 0;
}
</style>

<template>
<div>
<div class="panel panel-default">
<div class="panel-heading">
<div class="card card-default">
<div class="card-header">
<div style="display: flex; justify-content: space-between; align-items: center;">
<span>
OAuth Clients
</span>

<a class="action-link" @click="showCreateClientForm">
<a class="action-link" tabindex="-1" @click="showCreateClientForm">
Create New Client
</a>
</div>
</div>

<div class="panel-body">
<div class="card-body">
<!-- Current Clients -->
<p class="m-b-none" v-if="clients.length === 0">
<p class="mb-0" v-if="clients.length === 0">
You have not created any OAuth clients.
</p>

<table class="table table-borderless m-b-none" v-if="clients.length > 0">
<table class="table table-borderless mb-0" v-if="clients.length > 0">
<thead>
<tr>
<th>Client ID</th>
Expand Down Expand Up @@ -59,7 +55,7 @@

<!-- Edit Button -->
<td style="vertical-align: middle;">
<a class="action-link" @click="edit(client)">
<a class="action-link" tabindex="-1" @click="edit(client)">
Edit
</a>
</td>
Expand All @@ -81,17 +77,17 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button " class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

<h4 class="modal-title">
Create Client
</h4>

<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>

<div class="modal-body">
<!-- Form Errors -->
<div class="alert alert-danger" v-if="createForm.errors.length > 0">
<p><strong>Whoops!</strong> Something went wrong!</p>
<p class="mb-0"><strong>Whoops!</strong> Something went wrong!</p>
<br>
<ul>
<li v-for="error in createForm.errors">
Expand All @@ -101,30 +97,30 @@
</div>

<!-- Create Client Form -->
<form class="form-horizontal" role="form">
<form role="form">
<!-- Name -->
<div class="form-group">
<label class="col-md-3 control-label">Name</label>
<div class="form-group row">
<label class="col-md-3 col-form-label">Name</label>

<div class="col-md-7">
<div class="col-md-9">
<input id="create-client-name" type="text" class="form-control"
@keyup.enter="store" v-model="createForm.name">

<span class="help-block">
<span class="form-text text-muted">
Something your users will recognize and trust.
</span>
</div>
</div>

<!-- Redirect URL -->
<div class="form-group">
<label class="col-md-3 control-label">Redirect URL</label>
<div class="form-group row">
<label class="col-md-3 col-form-label">Redirect URL</label>

<div class="col-md-7">
<div class="col-md-9">
<input type="text" class="form-control" name="redirect"
@keyup.enter="store" v-model="createForm.redirect">

<span class="help-block">
<span class="form-text text-muted">
Your application's authorization callback URL.
</span>
</div>
Expand All @@ -134,7 +130,7 @@

<!-- Modal Actions -->
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>

<button type="button" class="btn btn-primary" @click="store">
Create
Expand All @@ -149,17 +145,17 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button " class="close" data-dismiss="modal" aria-hidden="true">&times;</button>

<h4 class="modal-title">
Edit Client
</h4>

<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>

<div class="modal-body">
<!-- Form Errors -->
<div class="alert alert-danger" v-if="editForm.errors.length > 0">
<p><strong>Whoops!</strong> Something went wrong!</p>
<p class="mb-0"><strong>Whoops!</strong> Something went wrong!</p>
<br>
<ul>
<li v-for="error in editForm.errors">
Expand All @@ -169,30 +165,30 @@
</div>

<!-- Edit Client Form -->
<form class="form-horizontal" role="form">
<form role="form">
<!-- Name -->
<div class="form-group">
<label class="col-md-3 control-label">Name</label>
<div class="form-group row">
<label class="col-md-3 col-form-label">Name</label>

<div class="col-md-7">
<div class="col-md-9">
<input id="edit-client-name" type="text" class="form-control"
@keyup.enter="update" v-model="editForm.name">

<span class="help-block">
<span class="form-text text-muted">
Something your users will recognize and trust.
</span>
</div>
</div>

<!-- Redirect URL -->
<div class="form-group">
<label class="col-md-3 control-label">Redirect URL</label>
<div class="form-group row">
<label class="col-md-3 col-form-label">Redirect URL</label>

<div class="col-md-7">
<div class="col-md-9">
<input type="text" class="form-control" name="redirect"
@keyup.enter="update" v-model="editForm.redirect">

<span class="help-block">
<span class="form-text text-muted">
Your application's authorization callback URL.
</span>
</div>
Expand All @@ -202,7 +198,7 @@

<!-- Modal Actions -->
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>

<button type="button" class="btn btn-primary" @click="update">
Save Changes
Expand Down Expand Up @@ -333,7 +329,7 @@
})
.catch(error => {
if (typeof error.response.data === 'object') {
form.errors = _.flatten(_.toArray(error.response.data));
form.errors = _.flatten(_.toArray(error.response.data.errors));
} else {
form.errors = ['Something went wrong. Please try again.'];
}
Expand Down
Loading

0 comments on commit 80e6b7c

Please sign in to comment.