rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove restangular as dependency, use xmlhttprequest

Browse Source
This commit is contained in:
Mo Bitar
2017-02-25 22:19:47 -06:00
parent 2eefef7e60
commit 6af880a25c
7 changed files with 189 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gruntfile.js
View File

@@ -85,7 +85,6 @@ module.exports = function(grunt) {
'vendor/assets/bower_components/angular/angular.js', 'vendor/assets/bower_components/angular/angular.js',
'vendor/assets/bower_components/angular-ui-router/release/angular-ui-router.js', 'vendor/assets/bower_components/angular-ui-router/release/angular-ui-router.js',
'vendor/assets/bower_components/lodash/dist/lodash.min.js', 'vendor/assets/bower_components/lodash/dist/lodash.min.js',
'vendor/assets/bower_components/restangular/dist/restangular.js',
'vendor/assets/javascripts/crypto/*.js' 'vendor/assets/javascripts/crypto/*.js'
], ],
dest: 'vendor/assets/javascripts/lib.js', dest: 'vendor/assets/javascripts/lib.js',

21
app/assets/javascripts/app/app.frontend.js
View File

@@ -14,24 +14,5 @@ if(!IEOrEdge && (window.crypto && window.crypto.subtle)) {
} }
angular.module('app.frontend', [ angular.module('app.frontend', [
'ui.router', 'ui.router'
'restangular'
]) ])
.config(function (RestangularProvider, authManagerProvider) {
RestangularProvider.setDefaultHeaders({"Content-Type": "application/json"});
RestangularProvider.setFullRequestInterceptor(function(element, operation, route, url, headers, params, httpConfig) {
var token = localStorage.getItem("jwt");
if(token) {
headers = _.extend(headers, {Authorization: "Bearer " + localStorage.getItem("jwt")});
}
return {
element: element,
params: params,
headers: headers,
httpConfig: httpConfig
};
});
})

53
app/assets/javascripts/app/services/authManager.js
View File

@@ -7,11 +7,11 @@ angular.module('app.frontend')
return domain; return domain;
} }
this.$get = function($rootScope, Restangular, modelManager) { this.$get = function($rootScope, httpManager, modelManager) {
return new AuthManager($rootScope, Restangular, modelManager); return new AuthManager($rootScope, httpManager, modelManager);
} }
function AuthManager($rootScope, Restangular, modelManager) { function AuthManager($rootScope, httpManager, modelManager) {
var userData = localStorage.getItem("user"); var userData = localStorage.getItem("user");
if(userData) { if(userData) {
@@ -34,12 +34,10 @@ angular.module('app.frontend')
this.getAuthParamsForEmail = function(url, email, callback) { this.getAuthParamsForEmail = function(url, email, callback) {
var requestUrl = url + "/auth/params"; var requestUrl = url + "/auth/params";
var request = Restangular.oneUrl(requestUrl, requestUrl); httpManager.getAbsolute(requestUrl, {email: email}, function(response){
request.get({email: email}).then(function(response){ callback(response);
callback(response.plain()); }, function(response){
}) console.error("Error getting auth params", response);
.catch(function(response){
console.log("Error getting auth params", response);
callback(null); callback(null);
}) })
} }
@@ -74,17 +72,15 @@ angular.module('app.frontend')
Neeto.crypto.computeEncryptionKeysForUser(_.merge({password: password}, authParams), function(keys){ Neeto.crypto.computeEncryptionKeysForUser(_.merge({password: password}, authParams), function(keys){
var requestUrl = url + "/auth/sign_in"; var requestUrl = url + "/auth/sign_in";
var request = Restangular.oneUrl(requestUrl, requestUrl);
var params = {password: keys.pw, email: email}; var params = {password: keys.pw, email: email};
_.merge(request, params); httpManager.postAbsolute(requestUrl, params, function(response){
request.post().then(function(response){
this.handleAuthResponse(response, email, url, authParams, keys.mk, keys.pw); this.handleAuthResponse(response, email, url, authParams, keys.mk, keys.pw);
callback(response); callback(response);
}.bind(this)) }.bind(this), function(response){
.catch(function(response){ console.error("Error logging in", response);
console.log("Error logging in", response); callback(null);
callback(response.data);
}) })
}.bind(this)); }.bind(this));
}.bind(this)) }.bind(this))
} }
@@ -93,7 +89,7 @@ angular.module('app.frontend')
if(url) { if(url) {
localStorage.setItem("server", url); localStorage.setItem("server", url);
} }
localStorage.setItem("user", JSON.stringify(response.plain().user)); localStorage.setItem("user", JSON.stringify(response.user));
localStorage.setItem("auth_params", JSON.stringify(_.omit(authParams, ["pw_nonce"]))); localStorage.setItem("auth_params", JSON.stringify(_.omit(authParams, ["pw_nonce"])));
localStorage.setItem("mk", mk); localStorage.setItem("mk", mk);
localStorage.setItem("pw", pw); localStorage.setItem("pw", pw);
@@ -103,15 +99,13 @@ angular.module('app.frontend')
this.register = function(url, email, password, callback) { this.register = function(url, email, password, callback) {
Neeto.crypto.generateInitialEncryptionKeysForUser({password: password, email: email}, function(keys, authParams){ Neeto.crypto.generateInitialEncryptionKeysForUser({password: password, email: email}, function(keys, authParams){
var requestUrl = url + "/auth"; var requestUrl = url + "/auth";
var request = Restangular.oneUrl(requestUrl, requestUrl);
var params = _.merge({password: keys.pw, email: email}, authParams); var params = _.merge({password: keys.pw, email: email}, authParams);
_.merge(request, params);
request.post().then(function(response){ httpManager.postAbsolute(requestUrl, params, function(response){
this.handleAuthResponse(response, email, url, authParams, keys.mk, keys.pw); this.handleAuthResponse(response, email, url, authParams, keys.mk, keys.pw);
callback(response); callback(response);
}.bind(this)) }.bind(this), function(response){
.catch(function(response){ console.error("Registration error", response);
console.log("Registration error", response);
callback(null); callback(null);
}) })
}.bind(this)); }.bind(this));
@@ -120,23 +114,20 @@ angular.module('app.frontend')
this.changePassword = function(email, new_password, callback) { this.changePassword = function(email, new_password, callback) {
Neeto.crypto.generateInitialEncryptionKeysForUser({password: new_password, email: email}, function(keys, authParams){ Neeto.crypto.generateInitialEncryptionKeysForUser({password: new_password, email: email}, function(keys, authParams){
var requestUrl = localStorage.getItem("server") + "/auth/change_pw"; var requestUrl = localStorage.getItem("server") + "/auth/change_pw";
var request = Restangular.oneUrl(requestUrl, requestUrl);
var params = _.merge({new_password: keys.pw}, authParams); var params = _.merge({new_password: keys.pw}, authParams);
_.merge(request, params);
request.post().then(function(response){ httpManager.postAbsolute(requestUrl, params, function(response){
this.handleAuthResponse(response, email, null, authParams, keys.mk, keys.pw); this.handleAuthResponse(response, email, null, authParams, keys.mk, keys.pw);
callback(response.plain()); callback(response);
}.bind(this)) }.bind(this), function(response){
.catch(function(response){
var error = response.data; var error = response.data;
if(!error) { if(!error) {
error = {message: "Something went wrong while changing your password. Your password was not changed. Please try again."} error = {message: "Something went wrong while changing your password. Your password was not changed. Please try again."}
} }
console.log("Change pw error", response); console.error("Change pw error", response);
callback({error: error}); callback({error: error});
}) })
}.bind(this)); })
} }
this.staticifyObject = function(object) { this.staticifyObject = function(object) {

46
app/assets/javascripts/app/services/extensionManager.js
View File

@@ -1,7 +1,7 @@
class ExtensionManager { class ExtensionManager {
constructor(Restangular, modelManager, authManager, syncManager) { constructor(httpManager, modelManager, authManager, syncManager) {
this.Restangular = Restangular; this.httpManager = httpManager;
this.modelManager = modelManager; this.modelManager = modelManager;
this.authManager = authManager; this.authManager = authManager;
this.enabledRepeatActionUrls = JSON.parse(localStorage.getItem("enabledRepeatActionUrls")) || []; this.enabledRepeatActionUrls = JSON.parse(localStorage.getItem("enabledRepeatActionUrls")) || [];
@@ -77,11 +77,11 @@ class ExtensionManager {
relevant just to this item. The response extension is not saved, just displayed as a one-time thing. relevant just to this item. The response extension is not saved, just displayed as a one-time thing.
*/ */
loadExtensionInContextOfItem(extension, item, callback) { loadExtensionInContextOfItem(extension, item, callback) {
this.Restangular.oneUrl(extension.url, extension.url).customGET("", {content_type: item.content_type, item_uuid: item.uuid}).then(function(response){
var scopedExtension = new Extension(response.plain()); this.httpManager.getAbsolute(extension.url, {content_type: item.content_type, item_uuid: item.uuid}, function(response){
var scopedExtension = new Extension(response);
callback(scopedExtension); callback(scopedExtension);
}.bind(this)) }, function(response){
.catch(function(response){
console.log("Error loading extension", response); console.log("Error loading extension", response);
callback(null); callback(null);
}) })
@@ -91,14 +91,13 @@ class ExtensionManager {
Registers new extension and saves it to user's account Registers new extension and saves it to user's account
*/ */
retrieveExtensionFromServer(url, callback) { retrieveExtensionFromServer(url, callback) {
this.Restangular.oneUrl(url, url).get().then(function(response){ this.httpManager.getAbsolute(url, {}, function(response){
var ext = this.handleExtensionLoadExternalResponseItem(url, response.plain()); var ext = this.handleExtensionLoadExternalResponseItem(url, response.plain());
if(callback) { if(callback) {
callback(ext); callback(ext);
} }
}.bind(this)) }.bind(this), function(response){
.catch(function(response){ console.error("Error registering extension", response);
console.log("Error registering extension", response);
callback(null); callback(null);
}) })
} }
@@ -150,7 +149,8 @@ class ExtensionManager {
switch (action.verb) { switch (action.verb) {
case "get": { case "get": {
this.Restangular.oneUrl(action.url, action.url).get().then(function(response){
this.httpManager.getAbsolute(action.url, {}, function(response){
action.error = false; action.error = false;
var items = response.items || [response.item]; var items = response.items || [response.item];
EncryptionHelper.decryptMultipleItems(items, localStorage.getItem("mk")); EncryptionHelper.decryptMultipleItems(items, localStorage.getItem("mk"));
@@ -160,8 +160,7 @@ class ExtensionManager {
} }
this.syncManager.sync(null); this.syncManager.sync(null);
customCallback({items: items}); customCallback({items: items});
}.bind(this)) }.bind(this), function(response){
.catch(function(response){
action.error = true; action.error = true;
customCallback(null); customCallback(null);
}) })
@@ -170,13 +169,14 @@ class ExtensionManager {
} }
case "render": { case "render": {
this.Restangular.oneUrl(action.url, action.url).get().then(function(response){
this.httpManager.getAbsolute(action.url, {}, function(response){
action.error = false; action.error = false;
EncryptionHelper.decryptItem(response.item, localStorage.getItem("mk")); EncryptionHelper.decryptItem(response.item, localStorage.getItem("mk"));
var item = this.modelManager.createItem(response.item); var item = this.modelManager.createItem(response.item);
customCallback({item: item}); customCallback({item: item});
}.bind(this))
.catch(function(response){ }.bind(this), function(response){
action.error = true; action.error = true;
customCallback(null); customCallback(null);
}) })
@@ -310,19 +310,17 @@ class ExtensionManager {
} }
performPost(action, extension, params, callback) { performPost(action, extension, params, callback) {
var request = this.Restangular.oneUrl(action.url, action.url);
if(this.extensionUsesEncryptedData(extension)) {
request.auth_params = this.authManager.getAuthParams();
}
_.merge(request, params);
request.post().then(function(response){ if(this.extensionUsesEncryptedData(extension)) {
params.auth_params = this.authManager.getAuthParams();
}
this.httpManager.postAbsolute(action.url, params, function(response){
action.error = false; action.error = false;
if(callback) { if(callback) {
callback(response.plain()); callback(response.plain());
} }
}) }.bind(this), function(response){
.catch(function(response){
action.error = true; action.error = true;
console.log("Action error response:", response); console.log("Action error response:", response);
if(callback) { if(callback) {

79
app/assets/javascripts/app/services/httpManager.js Normal file
View File

@@ -0,0 +1,79 @@
class HttpManager {
setBaseUrl(baseUrl) {
this.baseUrl = baseUrl;
}
setAuthHeadersForRequest(request) {
var token = localStorage.getItem("jwt");
if(token) {
request.setRequestHeader('Authorization', 'Bearer ' + localStorage.getItem("jwt"));
}
}
postAbsolute(url, params, onsuccess, onerror) {
var xmlhttp = new XMLHttpRequest();
xmlhttp.onreadystatechange = function() {
if (xmlhttp.readyState == 4) {
console.log("on ready state", xmlhttp.readyState, "text:", xmlhttp.responseText);
var response = xmlhttp.responseText;
if(response) {
response = JSON.parse(response);
}
if(xmlhttp.status == 200){
console.log("onsuccess", response);
onsuccess(response);
} else {
console.error("onerror", response);
onerror(response)
}
}
}
xmlhttp.open("post", url, true);
this.setAuthHeadersForRequest(xmlhttp);
xmlhttp.setRequestHeader('Content-type', 'application/json');
xmlhttp.send(JSON.stringify(params));
}
getAbsolute(url, params, onsuccess, onerror) {
var formatParams = function(params) {
return "?" + Object
.keys(params)
.map(function(key){
return key+"="+params[key]
})
.join("&")
}
var xmlhttp = new XMLHttpRequest();
xmlhttp.onreadystatechange = function() {
if (xmlhttp.readyState == 4) {
var response = xmlhttp.responseText;
if(response) {
response = JSON.parse(response);
}
if(xmlhttp.status == 200){
console.log("onsuccess", response);
onsuccess(response);
} else {
console.error("onerror", response);
onerror(response)
}
}
}
console.log("getting", url + formatParams(params));
xmlhttp.open("get", url + formatParams(params), true);
this.setAuthHeadersForRequest(xmlhttp);
xmlhttp.setRequestHeader('Content-type', 'application/json');
xmlhttp.send();
}
}
angular.module('app.frontend').service('httpManager', HttpManager);

75
app/assets/javascripts/app/services/syncManager.js
View File

@@ -1,10 +1,10 @@
class SyncManager { class SyncManager {
constructor($rootScope, modelManager, authManager, dbManager, Restangular) { constructor($rootScope, modelManager, authManager, dbManager, httpManager) {
this.$rootScope = $rootScope; this.$rootScope = $rootScope;
this.httpManager = httpManager;
this.modelManager = modelManager; this.modelManager = modelManager;
this.authManager = authManager; this.authManager = authManager;
this.Restangular = Restangular;
this.dbManager = dbManager; this.dbManager = dbManager;
this.syncStatus = {}; this.syncStatus = {};
} }
@@ -161,18 +161,18 @@ class SyncManager {
this.syncStatus.current = 0; this.syncStatus.current = 0;
} }
var request = this.Restangular.oneUrl(this.syncURL, this.syncURL); var params = {};
request.limit = 150; params.limit = 150;
request.items = _.map(subItems, function(item){ params.items = _.map(subItems, function(item){
var itemParams = new ItemParams(item, localStorage.getItem("mk")); var itemParams = new ItemParams(item, localStorage.getItem("mk"));
itemParams.additionalFields = options.additionalFields; itemParams.additionalFields = options.additionalFields;
return itemParams.paramsForSync(); return itemParams.paramsForSync();
}.bind(this)); }.bind(this));
request.sync_token = this.syncToken; params.sync_token = this.syncToken;
request.cursor_token = this.cursorToken; params.cursor_token = this.cursorToken;
request.post().then(function(response) { this.httpManager.postAbsolute(this.syncURL, params, function(response){
this.modelManager.clearDirtyItems(subItems); this.modelManager.clearDirtyItems(subItems);
this.syncStatus.error = null; this.syncStatus.error = null;
@@ -211,8 +211,7 @@ class SyncManager {
this.callQueuedCallbacksAndCurrent(callback, response); this.callQueuedCallbacksAndCurrent(callback, response);
} }
}.bind(this)) }.bind(this), function(response){
.catch(function(response){
console.log("Sync error: ", response); console.log("Sync error: ", response);
var error = response.data ? response.data.error : {message: "Could not connect to server."}; var error = response.data ? response.data.error : {message: "Could not connect to server."};
@@ -223,7 +222,61 @@ class SyncManager {
this.$rootScope.$broadcast("sync:error", error); this.$rootScope.$broadcast("sync:error", error);
this.callQueuedCallbacksAndCurrent(callback, {error: "Sync error"}); this.callQueuedCallbacksAndCurrent(callback, {error: "Sync error"});
}.bind(this)) }.bind(this));
//
// request.post().then(function(response) {
// this.modelManager.clearDirtyItems(subItems);
// this.syncStatus.error = null;
//
// this.$rootScope.$broadcast("sync:updated_token", this.syncToken);
//
// var retrieved = this.handleItemsResponse(response.retrieved_items, null);
//
// // merge only metadata for saved items
// // we write saved items to disk now because it clears their dirty status then saves
// // if we saved items before completion, we had have to save them as dirty and save them again on success as clean
// var omitFields = ["content", "auth_hash"];
// var saved = this.handleItemsResponse(response.saved_items, omitFields);
//
// this.handleUnsavedItemsResponse(response.unsaved)
//
// this.writeItemsToLocalStorage(saved, false, null);
// this.writeItemsToLocalStorage(retrieved, false, null);
//
// this.syncStatus.syncOpInProgress = false;
// this.syncStatus.current += subItems.length;
//
// // set the sync token at the end, so that if any errors happen above, you can resync
// this.syncToken = response.sync_token;
// this.cursorToken = response.cursor_token;
//
// if(this.cursorToken || this.syncStatus.needsMoreSync) {
// setTimeout(function () {
// this.sync(callback, options);
// }.bind(this), 10); // wait 10ms to allow UI to update
// } else if(this.repeatOnCompletion) {
// this.repeatOnCompletion = false;
// setTimeout(function () {
// this.sync(callback, options);
// }.bind(this), 10); // wait 10ms to allow UI to update
// } else {
// this.callQueuedCallbacksAndCurrent(callback, response);
// }
//
// }.bind(this))
// .catch(function(response){
// console.log("Sync error: ", response);
// var error = response.data ? response.data.error : {message: "Could not connect to server."};
//
// this.syncStatus.syncOpInProgress = false;
// this.syncStatus.error = error;
// this.writeItemsToLocalStorage(allDirtyItems, false, null);
//
// this.$rootScope.$broadcast("sync:error", error);
//
// this.callQueuedCallbacksAndCurrent(callback, {error: "Sync error"});
// }.bind(this))
} }
handleUnsavedItemsResponse(unsaved) { handleUnsavedItemsResponse(unsaved) {

2
bower.json
View File

@@ -9,7 +9,7 @@
"dependencies": { "dependencies": {
"angular": "1.6.1", "angular": "1.6.1",
"angular-ui-router": "^0.3.2", "angular-ui-router": "^0.3.2",
"restangular": "^1.6.1" "lodash" : "^4.17.4"
}, },
"resolutions": { "resolutions": {
"angular": "1.6.1" "angular": "1.6.1"