Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added more to install deps. Fix bug oauthconnector exports and result…

…ant github provider feature.
  • Loading branch information...
commit b6cc98f6bf1327330ac26ab63eab77ab3733fea3 1 parent c2e5ff1
@patcon authored
View
3  drupal-org.make
@@ -5,10 +5,13 @@ defaults[projects][subdir] = contrib
projects[connector][version] = 1.0-beta1
projects[ctools][version] = 1.2
+projects[diff][version] = 2.0
projects[features][version] = 1.0
projects[http_client][version] = 2.4
projects[oauth][version] = 3.0
projects[oauthconnector][version] = 1.0-beta1
+; Fixed ctools export of providers: http://drupal.org/node/1712262#comment-6391478
+projects[oauthconnector][patch][] = http://drupal.org/files/oauthconnector-fix-ctools-exportables_7.x-1.0-beta1_1712262-3.patch
projects[oauthconnector_github][type] = module
projects[oauthconnector_github][download][type] = git
View
2  drupalgithub.info
@@ -5,6 +5,8 @@ core = 7.x
dependencies[] = block
dependencies[] = dblog
+dependencies[] = diff
+dependencies[] = features
dependencies[] = oauthconnector_github
; FEATURES
View
4 modules/features/github_integration/github_integration.features.inc
@@ -9,7 +9,7 @@
*/
function github_integration_ctools_plugin_api() {
list($module, $api) = func_get_args();
- if ($module == "oauthconnector" && $api == "") {
- return array("version" => "");
+ if ($module == "oauthconnector" && $api == "oauthconnector") {
+ return array("version" => "1");
}
}
View
2  modules/features/github_integration/github_integration.info
@@ -3,6 +3,6 @@ core = 7.x
package = Features
dependencies[] = ctools
dependencies[] = oauthconnector
-features[ctools][] = oauthconnector::
+features[ctools][] = oauthconnector:oauthconnector:1
features[features_api][] = api:1
features[oauthconnector_provider][] = github
View
5 ...atures/github_integration/github_integration..inc → ...integration/github_integration.oauthconnector.inc
@@ -1,7 +1,7 @@
<?php
/**
* @file
- * github_integration..inc
+ * github_integration.oauthconnector.inc
*/
/**
@@ -12,6 +12,7 @@ function github_integration_default_oauthconnector_provider() {
$provider = new stdClass();
$provider->disabled = FALSE; /* Edit this to true to make a default provider disabled initially */
+ $provider->api_version = 1;
$provider->name = 'github';
$provider->title = 'GitHub';
$provider->url = 'https://api.github.com';
@@ -20,7 +21,7 @@ function github_integration_default_oauthconnector_provider() {
'signature method' => 'HMAC-SHA1',
'authentication realm' => '',
'request token endpoint' => '/oauth/request_token',
- 'authorization scope' => 'user,public_repo',
+ 'authorization scope' => 'public_repo',
'authorization endpoint' => 'https://github.com/login/oauth/authorize',
'access token endpoint' => 'https://github.com/login/oauth/access_token',
);
Please sign in to comment.
Something went wrong with that request. Please try again.