Merge branch 'release/0.0.7'

.sami.php

@@ -19,8 +19,8 @@
     'theme' => 'enhanced',
     'versions' => $versions,
     'title' => 'AuthBucket\Push API',
-    'build_dir' => __DIR__ . '/build/push/%version%',
-    'cache_dir' => __DIR__ . '/build/cache/push/%version%',
+    'build_dir' => __DIR__ . '/build/sami/%version%',
+    'cache_dir' => __DIR__ . '/build/cache/sami/%version%',
     'include_parent_data' => false,
     'default_opened_level' => 2,
 ));

README.md

@@ -32,13 +32,14 @@ Read though [Demo](http://push-php.authbucket.com/demo) for more
 information.
 
 You may also run the demo locally. Open a console and execute the
-following command to install the latest version in the push/ directory:
+following command to install the latest version in the `push-php`
+directory:
 
-    $ composer create-project authbucket/push-php push/ "~0.0"
+    $ composer create-project authbucket/push-php push-php "~0.0"
 
 Then use the PHP built-in web server to run the demo application:
 
-    $ cd push/
+    $ cd push-php
     $ php app/console server:run
 
 If you get the error
@@ -66,7 +67,7 @@ To built the documents locally, execute the following command:
 
     $ vendor/bin/sami.php update .sami.php
 
-Open `build/push/index.html` with your browser for the documents.
+Open `build/sami/index.html` with your browser for the documents.
 
 Tests
 -----

app/AppKernel.php

@@ -12,7 +12,6 @@
 use Symfony\Component\HttpFoundation\Request;
 
 $app->register(new AuthBucket\OAuth2\Provider\AuthBucketOAuth2ServiceProvider());
-$app->register(new AuthBucket\Push\Provider\AuthBucketPushServiceProvider());
 $app->register(new AuthBucket\Push\Tests\TestBundle\TestBundleServiceProvider());
 $app->register(new Silex\Provider\DoctrineServiceProvider());
 $app->register(new Silex\Provider\FormServiceProvider());
@@ -25,6 +24,10 @@
 $app->register(new Silex\Provider\UrlGeneratorServiceProvider());
 $app->register(new Silex\Provider\ValidatorServiceProvider());
 
+$provider = new AuthBucket\Push\Provider\AuthBucketPushServiceProvider();
+$app->register($provider);
+$app->mount('/', $provider);
+
 require __DIR__.'/config/config_'.$app['env'].'.php';
 require __DIR__.'/config/routing_'.$app['env'].'.php';
 

app/config/config.php

@@ -17,7 +17,3 @@
 $app['twig.path'] = array(
     __DIR__.'/../../tests/AuthBucket/Push/Tests/TestBundle/Resources/views',
 );
-
-// We simply reuse the user provider that already created for authorize firewall
-// here.
-$app['authbucket_push.user_provider'] = $app['security.user_provider.default'];

app/config/orm.php

@@ -42,7 +42,6 @@
 $app['authbucket_push.model'] = array(
     'device' => 'AuthBucket\\Push\\Tests\\TestBundle\\Entity\\Device',
     'service' => 'AuthBucket\\Push\\Tests\\TestBundle\\Entity\\Service',
-    'user' => 'AuthBucket\\Push\\Tests\\TestBundle\\Entity\\User',
 );
 
 // Add model managers from ORM.

app/config/security.php

@@ -15,10 +15,6 @@
     return new PlaintextPasswordEncoder();
 });
 
-$app['security.user_provider.default'] = $app->share(function ($app) {
-    return $app['authbucket_push.model_manager.factory']->getModelManager('user');
-});
-
 $app['security.user_provider.admin'] = $app['security.user_provider.inmemory._proto'](array(
     'admin' => array('ROLE_ADMIN', 'secrete'),
 ));
@@ -29,13 +25,17 @@
         'http' => true,
         'users' => $app['security.user_provider.admin'],
     ),
-    'push_device' => array(
-        'pattern' => '^/push/device',
+    'api_oauth2_debug' => array(
+        'pattern' => '^/api/v1.0/oauth2/debug',
+        'anonymous' => true,
+    ),
+    'api' => array(
+        'pattern' => '^/api/v1.0',
         'oauth2_resource' => array(
             'resource_type' => 'debug_endpoint',
             'scope' => array(),
             'options' => array(
-                'debug_endpoint' => '/oauth2/debug',
+                'debug_endpoint' => '/api/v1.0/oauth2/debug',
                 'cache' => false,
             ),
         ),

composer.json

@@ -31,7 +31,7 @@
     "minimum-stability": "dev",
     "name": "authbucket/push-php",
     "require": {
-        "authbucket/oauth2": "~2.1",
+        "authbucket/oauth2-php": "~2.2",
         "guzzle/guzzle": "~3.9",
         "php": ">=5.3.9",
         "symfony/http-foundation": "~2.3",