vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change Github Login to use its own application/client ID so that we don't accidentally lower valid trigger tokens

Browse source
This commit is contained in:
Joseph Schorr 2014-04-01 22:49:18 -04:00
parent 6ff46cc450
commit 193824a196
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
static/js/app.js
View file

@ -839,6 +839,7 @@ quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'angu
} else {
keyService['stripePublishableKey'] = 'pk_test_uEDHANKm9CHCvVa2DLcipGRh';
keyService['githubClientId'] = 'cfbc4aca88e5c1b40679';
keyService['githubLoginClientId'] = '0e8dbe15c4c7630b5480';
keyService['githubRedirectUri'] = 'http://localhost:5000/oauth2/github/callback';
}
@ -1527,7 +1528,7 @@ quayApp.directive('signinForm', function () {
// Needed to ensure that UI work done by the started callback is finished before the location
// changes.
$timeout(function() {
var url = 'https://github.com/login/oauth/authorize?client_id=' + encodeURIComponent(KeyService.githubClientId) +
var url = 'https://github.com/login/oauth/authorize?client_id=' + encodeURIComponent(KeyService.githubLoginClientId) +
'&scope=user:email' + mixpanelDistinctIdClause;
document.location = url;
}, 250);
@ -1590,7 +1591,7 @@ quayApp.directive('signupForm', function () {
$scope.github_state_clause = '&state=' + mixpanelId;
});
$scope.githubClientId = KeyService.githubClientId;
$scope.githubClientId = KeyService.githubLoginClientId;
$scope.awaitingConfirmation = false;
$scope.registering = false;

2
static/js/controllers.js
View file

@ -1616,7 +1616,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
$scope.convertStep = 0;
$scope.org = {};
$scope.githubRedirectUri = KeyService.githubRedirectUri;
$scope.githubClientId = KeyService.githubClientId;
$scope.githubClientId = KeyService.githubLoginClientId;
$scope.authorizedApps = null;
$('.form-change').popover();