Skip to content

Commit 992e90c

Browse files
JLiscomJLiscom
committed
Fixed tokens never timing out serverside and Remove token
1 parent e6e6ca6 commit 992e90c

File tree

3 files changed

+50
-37
lines changed

3 files changed

+50
-37
lines changed

‎OpenNote/openNote/controllers/listController.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
/**
77
* Control
88
*/
9-
openNote.controller("listController", function($scope, $rootScope, folderFactory, $timeout) {
9+
openNote.controller("listController", function( $scope,
10+
$rootScope,
11+
folderFactory,
12+
$timeout) {
1013
$scope.data = new folderFactory();
1114

1215
/**
@@ -80,7 +83,6 @@ openNote.controller("listController", function($scope, $rootScope, folderFactory
8083

8184
sourceFolder.__proto__=folderType.__proto__;//Cast this object as a resources
8285

83-
8486
sourceFolder.parrentFolderID=destID;
8587
sourceFolder.$update().then(function(){//wait for a response
8688
//fire off an event to tell everyone we just modified a folder
@@ -94,7 +96,6 @@ openNote.controller("listController", function($scope, $rootScope, folderFactory
9496
$rootScope.$emit("reloadListView", {}); //refresh either way
9597
//event.source.nodeScope.$$apply = false;
9698
//TODO if they cancel reset list instead of re pulling it
97-
9899
});
99100
}
100101
}
@@ -105,7 +106,8 @@ openNote.controller("listController", function($scope, $rootScope, folderFactory
105106
*/
106107
var increaseTreeBuffer = function(){
107108
if($scope.treeBuffer<=100) {
108-
$scope.treeBuffer++;
109+
//console.log(
110+
$scope.treeBuffer++;//);
109111
$timeout(increaseTreeBuffer, 100);
110112
}
111113
else

‎OpenNote/openNote/openNote.js‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ openNote.run(function ( $rootScope,
2929
$rootScope.serverConfig=config;
3030
}); //attach server config to root scope
3131

32-
if (isLoggedInOrIsOnLoginScreen())//Initial entry if not logged in
33-
forceLogin();
34-
else//Initial entry after if logged in
35-
if($location.path()!="/" && !$rootScope.showMenu && !$rootScope.showSideBar)//make sure we only fade in/run once
36-
$rootScope.$emit("init");
32+
//Authentication and authorization enforcer
33+
if (isLoggedInOrIsOnLoginScreen())//Initial entry if not logged in
34+
forceLogin(event);
35+
else//Initial entry after if logged in
36+
if($location.path()!="/" && !$rootScope.showMenu && !$rootScope.showSideBar)//make sure we only fade in/run once
37+
$rootScope.$emit("init");
3738

3839
});
3940

@@ -47,8 +48,10 @@ openNote.run(function ( $rootScope,
4748
/**
4849
* Force user to login
4950
*/
50-
var forceLogin = function(){
51-
event.preventDefault();
51+
var forceLogin = function(event){
52+
if(event!=null)
53+
event.preventDefault();
54+
5255
$location.path("/");
5356
}
5457

@@ -58,9 +61,9 @@ openNote.run(function ( $rootScope,
5861
$rootScope.$on("init",function(){
5962
userService.useAPITokenHeader();//use token
6063

61-
$rootScope.$on("$viewContentLoaded",function(){//wait for page to load before requesting list view
64+
/*$rootScope.$on("$viewContentLoaded",function(){//wait for page to load before requesting list view
6265
$rootScope.$emit("reloadListView"); //send an event to tell the list view to reload
63-
});
66+
});*/
6467

6568
$rootScope.showMenu=true;
6669
$rootScope.showSideBar=true;
@@ -75,18 +78,24 @@ openNote.run(function ( $rootScope,
7578
* Log out function
7679
*/
7780
$rootScope.logOut = function(){
78-
userService.destroyTokenHeader();
79-
window.location.href='#/';
80-
$rootScope.showMenu=false;
81-
$rootScope.showSideBar=false;
82-
}
81+
$rootScope.$emit("logOut");
82+
};
8383

8484
//Check for updates
8585
$http.get(config.getUpdateURL()).then(
8686
function(response){//Successful
8787
if(response.data.version!=config.getVersion())
8888
alertify.log("<a href='"+response.data.updateURL+"' target='_blank'>"+response.data.updateText+"</a>", "", 0);
89-
}
90-
);
89+
});
90+
});
91+
92+
/**
93+
* Handle logOut event
94+
*/
95+
$rootScope.$on("logOut",function(){
96+
userService.destroyTokenHeader();
97+
window.location.href='#/';
98+
$rootScope.showMenu=false;
99+
$rootScope.showSideBar=false;
91100
})
92101
});

‎OpenNote/openNote/services/userService.js‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ openNote.service("userService", function ($http, $q, config) {
2323
* Stop using a token
2424
*/
2525
this.destroyTokenHeader = function(){
26+
$http.delete(config.servicePath() +"/token/");//have the server delete it
27+
2628
delete sessionStorage.apiToken;
2729
document.cookie = "token=; path=/; expires=Thu, 01 Jan 1970 00:00:01 GMT;";
2830
}
@@ -35,7 +37,7 @@ openNote.service("userService", function ($http, $q, config) {
3537
var tokenObject = this.getAPITokenObject();
3638
if(tokenObject!=null){
3739
var tokenTime = tokenObject.expires.replace(" ","T");//convert to ISO-8601 date and time
38-
return new Date().getTime()< Date.parse(tokenTime);
40+
return new Date().getTime()< Date.parse(tokenTime);//UTC time
3941
}
4042

4143
return false;
@@ -57,20 +59,20 @@ openNote.service("userService", function ($http, $q, config) {
5759
* @return - true if available, false if not
5860
*/
5961
this.isAvailable = function(userName){
60-
return $http.get(config.servicePath() +"/user/"+userName).then(function(responce){
61-
throw "Error"; // Weirdly if we get a 2xx value its a failure
62-
},function(response){
63-
switch(response.status){
64-
case 302://we found it so its not available
65-
return false;
66-
67-
case 404://could not find it so its available
68-
return true;
69-
70-
default://there was a error
71-
throw "Error";
72-
};
73-
});
62+
return $http.get(config.servicePath() +"/user/"+userName).then(function(response){
63+
throw "Error"; // Weirdly if we get a 2xx value its a failure
64+
},function(response){
65+
switch(response.status){
66+
case 302://we found it so its not available
67+
return false;
68+
69+
case 404://could not find it so its available
70+
return true;
71+
72+
default://there was a error
73+
throw "Error";
74+
};
75+
});
7476
};
7577

7678
/**
@@ -86,7 +88,7 @@ openNote.service("userService", function ($http, $q, config) {
8688
if(response.status==200){
8789

8890
if(response.data.token==null)
89-
throw "Invalid responce from server";
91+
throw "Invalid response from server";
9092

9193
sessionStorage.apiToken=angular.toJson(response.data);
9294
self.useAPITokenHeader();//used by the resources implicitly
@@ -111,7 +113,7 @@ openNote.service("userService", function ($http, $q, config) {
111113
if(response.status==200){
112114

113115
if(response.data.token==null)
114-
throw "Invalid responce from server";
116+
throw "Invalid response from server";
115117

116118
sessionStorage.apiToken=angular.toJson(response.data);
117119
self.useAPITokenHeader();//used by the resources implicitly

0 commit comments

Comments
 (0)