Skip to content

Commit

Permalink
Changed the app server to ksketchweb.appspot.com, the janrain app to
Browse files Browse the repository at this point in the history
'ksketch', and used the new apikey.
  • Loading branch information
Richard C. Davis committed Nov 1, 2013
1 parent 073ff0e commit 002e840
Show file tree
Hide file tree
Showing 20 changed files with 43 additions and 40 deletions.
2 changes: 1 addition & 1 deletion app.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
application: k-sketch-test
application: ksketchweb
version: 13
runtime: python27
api_version: 1
Expand Down
6 changes: 3 additions & 3 deletions app/console.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
if (typeof window.janrain !== 'object') window.janrain = {};
if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};

janrain.settings.tokenUrl = 'http://k-sketch-test.appspot.com/user/janrain';
janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';

function isReady() { janrain.ready = true; };
if (document.addEventListener) {
Expand All @@ -73,9 +73,9 @@
e.id = 'janrainAuthWidget';

if (document.location.protocol === 'https:') {
e.src = 'https://rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
} else {
e.src = 'http://widget-cdn.rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
}

var s = document.getElementsByTagName('script')[0];
Expand Down
6 changes: 3 additions & 3 deletions app/groups.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
if (typeof window.janrain !== 'object') window.janrain = {};
if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};

janrain.settings.tokenUrl = 'http://k-sketch-test.appspot.com/user/janrain';
janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';

function isReady() { janrain.ready = true; };
if (document.addEventListener) {
Expand All @@ -73,9 +73,9 @@
e.id = 'janrainAuthWidget';

if (document.location.protocol === 'https:') {
e.src = 'https://rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
} else {
e.src = 'http://widget-cdn.rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
}

var s = document.getElementsByTagName('script')[0];
Expand Down
8 changes: 4 additions & 4 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
if (typeof window.janrain !== 'object') window.janrain = {};
if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};

janrain.settings.tokenUrl = 'http://k-sketch-test.appspot.com/user/janrain';
janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';

function isReady() { janrain.ready = true; };
if (document.addEventListener) {
Expand All @@ -74,9 +74,9 @@
e.id = 'janrainAuthWidget';

if (document.location.protocol === 'https:') {
e.src = 'https://rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
} else {
e.src = 'http://widget-cdn.rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
}

var s = document.getElementsByTagName('script')[0];
Expand All @@ -86,7 +86,7 @@
</head>

<!-- body id="ksketchapp" ng-controller="LoginController" scrolling="no" -->
<body ng-controller="IndexController" id="ksketchapp" scrolling="no">
<body ng-controller="IndexController" id="ksketchapp" scrolling="no" onunload="debugStop()">


<!-- Top Bar -->
Expand Down
4 changes: 2 additions & 2 deletions app/js/angular/console-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function ConsoleController($scope,$resource){
$scope.User = {"id": 0, "u_name" :"Anonymous User", "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};

$scope.backend_locations = [
{url : 'k-sketch-test.appspot.com', urlName : 'remote backend' },
{url : 'ksketchweb.appspot.com', urlName : 'remote backend' },
{url : 'localhost:8080', urlName : 'localhost' } ];

$scope.showdetails = false;
Expand Down Expand Up @@ -44,7 +44,7 @@ function ConsoleController($scope,$resource){

//Replace this url with your final URL from the SingPath API path.
//$scope.remote_url = "localhost:8080";
$scope.remote_url = "k-sketch-test.appspot.com";
$scope.remote_url = "ksketchweb.appspot.com";
$scope.waiting = "Ready";

//resource calls are defined here
Expand Down
4 changes: 2 additions & 2 deletions app/js/angular/groups-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function GroupsController($scope,$resource){
$scope.User = {"id": 0, "u_name" :"Anonymous User", "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};

$scope.backend_locations = [
{url : 'k-sketch-test.appspot.com', urlName : 'remote backend' },
{url : 'ksketchweb.appspot.com', urlName : 'remote backend' },
{url : 'localhost:8080', urlName : 'localhost' } ];

$scope.showdetails = false;
Expand Down Expand Up @@ -37,7 +37,7 @@ function GroupsController($scope,$resource){

//Replace this url with your final URL from the SingPath API path.
//$scope.remote_url = "localhost:8080";
$scope.remote_url = "k-sketch-test.appspot.com";
$scope.remote_url = "ksketchweb.appspot.com";
$scope.waiting = "Ready";

//resource calls are defined here
Expand Down
4 changes: 2 additions & 2 deletions app/js/angular/index-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function IndexController($scope,$resource){
$scope.User = {"id": 0, "u_name" :"Anonymous User", "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};

$scope.backend_locations = [
{url : 'k-sketch-test.appspot.com', urlName : 'remote backend' },
{url : 'ksketchweb.appspot.com', urlName : 'remote backend' },
{url : 'localhost:8080', urlName : 'localhost' } ];

$scope.showdetails = false;
Expand All @@ -24,7 +24,7 @@ function IndexController($scope,$resource){

//Replace this url with your final URL from the SingPath API path.
//$scope.remote_url = "localhost:8080";
$scope.remote_url = "k-sketch-test.appspot.com";
$scope.remote_url = "ksketchweb.appspot.com";
$scope.waiting = "Ready";

//resource calls are defined here
Expand Down
4 changes: 2 additions & 2 deletions app/js/angular/profile-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function ProfileController($scope,$resource){
$scope.profile_user = {"id": 0, "u_name" :"Anonymous User", "u_realname" :"Anonymous User", "g_hash": "", 'u_isadmin': false, 'u_isactive': false};

$scope.backend_locations = [
{url : 'k-sketch-test.appspot.com', urlName : 'remote backend' },
{url : 'ksketchweb.appspot.com', urlName : 'remote backend' },
{url : 'localhost:8080', urlName : 'localhost' } ];

$scope.showdetails = false;
Expand Down Expand Up @@ -42,7 +42,7 @@ function ProfileController($scope,$resource){

//Replace this url with your final URL from the SingPath API path.
//$scope.remote_url = "localhost:8080";
$scope.remote_url = "k-sketch-test.appspot.com";
$scope.remote_url = "ksketchweb.appspot.com";
$scope.waiting = "Ready";

//resource calls are defined here
Expand Down
4 changes: 2 additions & 2 deletions app/js/angular/search-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function SearchController($scope,$resource){
$scope.User = {"id": 0, "u_name" :"Anonymous User", "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};

$scope.backend_locations = [
{url : 'k-sketch-test.appspot.com', urlName : 'remote backend' },
{url : 'ksketchweb.appspot.com', urlName : 'remote backend' },
{url : 'localhost:8080', urlName : 'localhost' } ];

$scope.showdetails = false;
Expand All @@ -25,7 +25,7 @@ function SearchController($scope,$resource){

//Replace this url with your final URL from the SingPath API path.
//$scope.remote_url = "localhost:8080";
$scope.remote_url = "k-sketch-test.appspot.com";
$scope.remote_url = "ksketchweb.appspot.com";
$scope.waiting = "Ready";
$scope.test = "-";

Expand Down
4 changes: 2 additions & 2 deletions app/js/angular/sketch-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function SketchController($scope,$resource){
$scope.User = {"id": 0, "u_name" :"Anonymous User", "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};

$scope.backend_locations = [
{url : 'k-sketch-test.appspot.com', urlName : 'remote backend' },
{url : 'ksketchweb.appspot.com', urlName : 'remote backend' },
{url : 'localhost:8080', urlName : 'localhost' } ];

$scope.search = "";
Expand Down Expand Up @@ -47,7 +47,7 @@ function SketchController($scope,$resource){

//Replace this url with your final URL from the SingPath API path.
//$scope.remote_url = "localhost:8080";
$scope.remote_url = "k-sketch-test.appspot.com";
$scope.remote_url = "ksketchweb.appspot.com";
$scope.waiting = "Ready";

//resource calls are defined here
Expand Down
4 changes: 2 additions & 2 deletions app/js/angular/view-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function ViewController($scope,$resource){
$scope.User = {"id": 0, "u_name" :"Anonymous User", "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};

$scope.backend_locations = [
{url : 'k-sketch-test.appspot.com', urlName : 'remote backend' },
{url : 'ksketchweb.appspot.com', urlName : 'remote backend' },
{url : 'localhost:8080', urlName : 'localhost' } ];

$scope.search = "";
Expand Down Expand Up @@ -39,7 +39,7 @@ function ViewController($scope,$resource){

//Replace this url with your final URL from the SingPath API path.
//$scope.remote_url = "localhost:8080";
$scope.remote_url = "k-sketch-test.appspot.com";
$scope.remote_url = "ksketchweb.appspot.com";
$scope.waiting = "Ready";

//resource calls are defined here
Expand Down
5 changes: 4 additions & 1 deletion app/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@
$routeProvider.when('/view1', {templateUrl: 'partials/partial1.html', controller: SketchController});
$routeProvider.when('/view2', {templateUrl: 'partials/partial2.html', controller: SketchController});
$routeProvider.otherwise({redirectTo: '/view1'});
}]);*/
}]);*/
function debugStop() {
console.log("stop.");
}
6 changes: 3 additions & 3 deletions app/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
if (typeof window.janrain !== 'object') window.janrain = {};
if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};

janrain.settings.tokenUrl = 'http://k-sketch-test.appspot.com/user/janrain';
janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';

function isReady() { janrain.ready = true; };
if (document.addEventListener) {
Expand All @@ -73,9 +73,9 @@
e.id = 'janrainAuthWidget';

if (document.location.protocol === 'https:') {
e.src = 'https://rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
} else {
e.src = 'http://widget-cdn.rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
}

var s = document.getElementsByTagName('script')[0];
Expand Down
6 changes: 3 additions & 3 deletions app/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
if (typeof window.janrain !== 'object') window.janrain = {};
if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};

janrain.settings.tokenUrl = 'http://k-sketch-test.appspot.com/user/janrain';
janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';

function isReady() { janrain.ready = true; };
if (document.addEventListener) {
Expand All @@ -73,9 +73,9 @@
e.id = 'janrainAuthWidget';

if (document.location.protocol === 'https:') {
e.src = 'https://rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
} else {
e.src = 'http://widget-cdn.rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
}

var s = document.getElementsByTagName('script')[0];
Expand Down
6 changes: 3 additions & 3 deletions app/sketch.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
if (typeof window.janrain !== 'object') window.janrain = {};
if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};

janrain.settings.tokenUrl = 'http://k-sketch-test.appspot.com/user/janrain';
janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';

function isReady() { janrain.ready = true; };
if (document.addEventListener) {
Expand All @@ -74,9 +74,9 @@
e.id = 'janrainAuthWidget';

if (document.location.protocol === 'https:') {
e.src = 'https://rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
} else {
e.src = 'http://widget-cdn.rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
}

var s = document.getElementsByTagName('script')[0];
Expand Down
6 changes: 3 additions & 3 deletions app/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
if (typeof window.janrain !== 'object') window.janrain = {};
if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};

janrain.settings.tokenUrl = 'http://k-sketch-test.appspot.com/user/janrain';
janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';

function isReady() { janrain.ready = true; };
if (document.addEventListener) {
Expand All @@ -73,9 +73,9 @@
e.id = 'janrainAuthWidget';

if (document.location.protocol === 'https:') {
e.src = 'https://rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
} else {
e.src = 'http://widget-cdn.rpxnow.com/js/lib/k-sketch/engage.js';
e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
}

var s = document.getElementsByTagName('script')[0];
Expand Down
Binary file modified appengine_config.pyc
Binary file not shown.
Binary file modified backend.pyc
Binary file not shown.
4 changes: 2 additions & 2 deletions rpx.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
else:
BASE_URL = 'localhost:%s' % os.environ['SERVER_PORT']
else:
BASE_URL = 'k-sketch-test.appspot.com'
BASE_URL = 'ksketchweb.appspot.com'
LOGIN_IFRAME = '<iframe src="http://gae-sesssions-demo.rpxnow.com/openid/embed?token_url=http%3A%2F%2F' + BASE_URL + '%2Frpx_response" scrolling="no" frameBorder="no" allowtransparency="true" style="width:400px;height:240px"></iframe>'

class UTC(datetime.tzinfo):
Expand Down Expand Up @@ -257,7 +257,7 @@ def post(self):
url = 'https://rpxnow.com/api/v2/auth_info'
args = {
'format': 'json',
'apiKey': '5fa9fabfa1141896e2d4025efd640ea5c1f54776',
'apiKey': '6c8271a5a23692efa86799f3438e3ac7b0525ac0',
'token': token
}
r = urlfetch.fetch(url=url,
Expand Down
Binary file modified rpx.pyc
Binary file not shown.

0 comments on commit 002e840

Please sign in to comment.