Merge branch 'release/0.12.0'

dreamfactorysoftware · Aug 18, 2017 · 2953877 · 2953877
2 parents 5896cc0 + 25e7988
commit 2953877
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.12.0] - 2017-08-17
+### Changed
+- Reworked API doc usage and generation
+
 ## [0.11.0] - 2017-07-27
 ### Added
 - DF-1117 - Added SAML and OpenID Connect SSO support
@@ -73,7 +77,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## 0.1.0 - 2015-10-24
 First official release working with the new [dreamfactory](https://github.com/dreamfactorysoftware/dreamfactory) project.
 
-[Unreleased]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.11.0...HEAD
+[Unreleased]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.12.0...HEAD
+[0.12.0]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.11.0...0.12.0
 [0.11.0]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.10.0...0.11.0
 [0.10.0]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.9.0...0.10.0
 [0.9.0]: https://github.com/dreamfactorysoftware/df-oauth/compare/0.8.0...0.9.0

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "wiki":   "https://wiki.dreamfactory.com"
   },
   "require":     {
-    "dreamfactory/df-core":              "~0.11.0",
+    "dreamfactory/df-core":              "~0.12.0",
     "laravel/socialite":                 "~2.0",
     "socialiteproviders/microsoft-live": "^2.0",
     "socialiteproviders/twitter":        "^2.0"
@@ -38,7 +38,7 @@
   },
   "extra":       {
     "branch-alias": {
-      "dev-develop": "0.11.x-dev"
+      "dev-develop": "0.12.x-dev"
     }
   }
 }
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -1,7 +1,6 @@
 <?php
 namespace DreamFactory\Core\OAuth;
 
-use DreamFactory\Core\Components\ServiceDocBuilder;
 use DreamFactory\Core\Enums\ServiceTypeGroups;
 use DreamFactory\Core\OAuth\Models\OAuthConfig;
 use DreamFactory\Core\OAuth\Services\Bitbucket;
@@ -16,8 +15,6 @@
 
 class ServiceProvider extends \Illuminate\Support\ServiceProvider
 {
-    use ServiceDocBuilder;
-
     public function register()
     {
         // Add our service types.
@@ -29,9 +26,6 @@ public function register()
                     'description'     => 'OAuth service for supporting Facebook authentication and API access.',
                     'group'           => ServiceTypeGroups::OAUTH,
                     'config_handler'  => OAuthConfig::class,
-                    'default_api_doc' => function ($service) {
-                        return $this->buildServiceDoc($service->id, Facebook::getApiDocInfo($service));
-                    },
                     'factory'         => function ($config) {
                         return new Facebook($config);
                     },
@@ -44,9 +38,6 @@ public function register()
                     'description'     => 'OAuth service for supporting Twitter authentication and API access.',
                     'group'           => ServiceTypeGroups::OAUTH,
                     'config_handler'  => OAuthConfig::class,
-                    'default_api_doc' => function ($service) {
-                        return $this->buildServiceDoc($service->id, Twitter::getApiDocInfo($service));
-                    },
                     'factory'         => function ($config) {
                         return new Twitter($config);
                     },
@@ -59,9 +50,6 @@ public function register()
                     'description'     => 'OAuth service for supporting GitHub authentication and API access.',
                     'group'           => ServiceTypeGroups::OAUTH,
                     'config_handler'  => OAuthConfig::class,
-                    'default_api_doc' => function ($service) {
-                        return $this->buildServiceDoc($service->id, Github::getApiDocInfo($service));
-                    },
                     'factory'         => function ($config) {
                         return new Github($config);
                     },
@@ -74,9 +62,6 @@ public function register()
                     'description'     => 'OAuth service for supporting Google authentication and API access.',
                     'group'           => ServiceTypeGroups::OAUTH,
                     'config_handler'  => OAuthConfig::class,
-                    'default_api_doc' => function ($service) {
-                        return $this->buildServiceDoc($service->id, Google::getApiDocInfo($service));
-                    },
                     'factory'         => function ($config) {
                         return new Google($config);
                     },
@@ -89,9 +74,6 @@ public function register()
                     'description'     => 'OAuth service for supporting LinkedIn authentication and API access.',
                     'group'           => ServiceTypeGroups::OAUTH,
                     'config_handler'  => OAuthConfig::class,
-                    'default_api_doc' => function ($service) {
-                        return $this->buildServiceDoc($service->id, LinkedIn::getApiDocInfo($service));
-                    },
                     'factory'         => function ($config) {
                         return new LinkedIn($config);
                     },
@@ -104,9 +86,6 @@ public function register()
                     'description'     => 'OAuth service for supporting Microsoft Live authentication and API access.',
                     'group'           => ServiceTypeGroups::OAUTH,
                     'config_handler'  => OAuthConfig::class,
-                    'default_api_doc' => function ($service) {
-                        return $this->buildServiceDoc($service->id, MicrosoftLive::getApiDocInfo($service));
-                    },
                     'factory'         => function ($config) {
                         return new MicrosoftLive($config);
                     },
@@ -119,9 +98,6 @@ public function register()
                     'description'     => 'OAuth 1.0 service for supporting Bitbucket authentication and API access.',
                     'group'           => ServiceTypeGroups::OAUTH,
                     'config_handler'  => OAuthConfig::class,
-                    'default_api_doc' => function ($service) {
-                        return $this->buildServiceDoc($service->id, Bitbucket::getApiDocInfo($service));
-                    },
                     'factory'         => function ($config) {
                         return new Bitbucket($config);
                     },

diff --git a/src/Services/BaseOAuthService.php b/src/Services/BaseOAuthService.php
@@ -60,12 +60,6 @@ public function __construct($settings = [])
         $this->setProvider($config);
     }
 
-    /** @inheritdoc */
-    public function getResources($only_handlers = false)
-    {
-        return ($only_handlers) ? static::$resources : array_values(static::$resources);
-    }
-
     /**
      * Sets the OAuth service provider.
      *
@@ -92,16 +86,6 @@ public function getProvider()
         return $this->provider;
     }
 
-    /**
-     * Returns the service name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
     /**
      * Returns the default role id configured for this service.
      *