diff --git a/app/Library/PFMAuth.php b/app/Library/PFMAuth.php index 5127e4b4..fd77170c 100644 --- a/app/Library/PFMAuth.php +++ b/app/Library/PFMAuth.php @@ -21,6 +21,6 @@ class PFMAuth extends EloquentUserProvider { function __construct() { - parent::__construct(new NullHasher(), 'Entities\User'); + parent::__construct(new NullHasher(), 'App\User'); } } \ No newline at end of file diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 35471f6f..ac62f504 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,7 +2,13 @@ namespace App\Providers; +use App; +use Auth; +use Illuminate\Auth\Guard; use Illuminate\Support\ServiceProvider; +// use PFMAuth; +use PfmValidator; +use Validator; class AppServiceProvider extends ServiceProvider { @@ -13,7 +19,16 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { - // +/* + Auth::extend('pfm', function() { + return new Guard(new PFMAuth(), App::make('session.store')); + }); +*/ + + Validator::resolver(function($translator, $data, $rules, $messages) + { + return new PfmValidator($translator, $data, $rules, $messages); + }); } /** diff --git a/config/app.php b/config/app.php index 309de44f..92beb136 100644 --- a/config/app.php +++ b/config/app.php @@ -26,7 +26,7 @@ return [ | */ - 'url' => 'http://localhost', + 'url' => 'http://pony.fm', /* |-------------------------------------------------------------------------- @@ -78,7 +78,7 @@ return [ | */ - 'key' => env('APP_KEY', 'SomeRandomString'), + 'key' => env('APP_KEY', 'AQUSDTDK5xA04yb9eO9iwlm72NpC8e90'), 'cipher' => 'AES-256-CBC', @@ -144,6 +144,7 @@ return [ App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, +// Intouch\LaravelNewrelic\LaravelNewrelicServiceProvider::class, Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class, ], @@ -194,6 +195,8 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, +// 'Newrelic' => Intouch\LaravelNewrelic\Facades\Newrelic::class, + ], ]; diff --git a/config/poniverse.php b/config/poniverse.php new file mode 100644 index 00000000..09a5b33a --- /dev/null +++ b/config/poniverse.php @@ -0,0 +1,11 @@ + 1, + 'urls' => [ + 'api' => '', + 'auth' => '', + 'token' => '' + ], + 'client_id' => 0, + 'secret' => '' + ]; \ No newline at end of file