rhoconnect 3.2.1 → 3.3.1.beta2

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.2.1'
+  VERSION = '3.3.1.beta2'
 end

data/lib/rhoconnect/web-console/controllers/admins.js

@@ -10,7 +10,6 @@ App.Controllers.Admins = Backbone.Router.extend({
 	  "doc/:dbkey/:source_id"      					: "get_doc",
 	  "docselect"				   					: "server_doc",
 	  "adapter"					   					: "adapter",
-	  "settings"				   					: "settings",
 	  "users"					   					:  "users",
 	  "users/new"			       					:  "new_user",
 	  "user/:id"				   					:  "show_user",
@@ -41,7 +40,7 @@ App.Controllers.Admins = Backbone.Router.extend({
 		this.set_nav('info_home');
 		if(session.getAuthenticated() == 'true'){
 		    this.set_log('logout');
-			new App.Views.Home({model: new Source()})
+			new App.Views.Home({model: new Source(), model2: new Adapter()})
 		}
 		else
 			new App.Views.Index
@@ -98,18 +97,6 @@ App.Controllers.Admins = Backbone.Router.extend({
 			new App.Views.Index
 	},
 	
-	settings: function(){
-		var session = new Session();
-		if(session.getAuthenticated() == 'true'){
-			this.set_log('logout');
-			this.set_nav('settings');
-			//adapter = new Adapter();
-			new App.Views.Settings()
-		}
-		else
-			new App.Views.Index
-	},
-	
 	adapter: function(){
 		var session = new Session();
 		if(session.getAuthenticated() == 'true'){

data/lib/rhoconnect/web-console/models/adapter.js

@@ -15,8 +15,11 @@ var Adapter = Backbone.Model.extend({
 		var adapter_url = adapter_url;
 		$.ajax({
 			type: 'POST',
-			url: '/api/source/save_adapter',
-			data: {api_token : this.get('api_token'), adapter_url : adapter_url},
+			url: '/rc/v1/system/appserver',
+			data: {attributes : {'adapter_url' : adapter_url}},
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(model, resp){
 		  		$(".setadapter-status")[0].firstChild.className = "label label-success";
 				$(".setadapter-status")[0].firstChild.innerHTML = "success";
@@ -28,19 +31,26 @@ var Adapter = Backbone.Model.extend({
 				}
 				$(".setadapter-status")[0].firstChild.className = "label label-important";
 				$(".setadapter-status")[0].firstChild.innerHTML = "error";
+				$('#home-alert')[0].innerHTML = resp.responseText;
+		        $('#home-alert').css('display','block');
 			}
 		})
 	},
 	
 	get_adapter: function(){
 		$.ajax({
-			type: 'POST',
-			url: '/api/source/get_adapter',
-			data: {api_token : this.get('api_token')},
+			type: 'GET',
+			url: '/rc/v1/system/appserver',
+			beforeSend: function (HttpRequest) {
+			     HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
-				var r = JSON.parse(resp);
-				if(r.adapter_url)
-					$('#input_adapter').val(r.adapter_url);
+				if(resp != 'testtoken'){
+					var r = JSON.parse(resp);
+					if(r.adapter_url){
+						$('#input_adapter').val(r.adapter_url);
+					}
+				}
 			},
 			error: function(resp){
 				if(resp.status == 422){

data/lib/rhoconnect/web-console/models/client.js

@@ -12,9 +12,11 @@ var Client = Backbone.Model.extend({
 		
 	get_clients: function(user_id){
 		$.ajax({
-			type: 'POST',
-			url: '/api/client/list_clients',
-			data: {api_token : this.get('api_token'), user_id : user_id},
+			type: 'get',
+			url: '/rc/v1/users/' + user_id + '/clients',
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
 				var r = JSON.parse(resp)
 				data = ""
@@ -36,9 +38,11 @@ var Client = Backbone.Model.extend({
 	
 	list_client_docs: function(client_id,source_id){
 		$.ajax({
-			type: 'POST',
-			url: '/api/client/list_client_docs',
-			data: {api_token : this.get('api_token'), client_id : client_id, source_id : source_id},
+			type: 'GET',
+			url: '/rc/v1/clients/' + client_id + '/sources/' + source_id + '/docnames',
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
 				var r = JSON.parse(resp)
 				data = ""
@@ -60,9 +64,11 @@ var Client = Backbone.Model.extend({
 	
 	get_client_params: function(client_id){
 		$.ajax({
-			type: 'POST',
-			url: '/api/client/get_client_params',
-			data: {api_token : this.get('api_token'),client_id : client_id},
+			type: 'GET',
+			url: '/rc/v1/clients/' + client_id,
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
 				var r = JSON.parse(resp)
 				data = "";

data/lib/rhoconnect/web-console/models/doc.js

@@ -12,16 +12,14 @@ var Doc = Backbone.Model.extend({
 	},
 	
 	methodUrl: {
-      'create': '/api/admin/get_license_info'
+      'read': '/rc/v1/system/license'
     },
 
     sync: function(method, model, options) {
       if (model.methodUrl && model.methodUrl[method.toLowerCase()]) {
         options = options || {};
         options.url = model.methodUrl[method.toLowerCase()];
-	    // if(method == 'read'){
-	    // 		  options.url += "?api_token=" + this.get('api_token')
-	    // 		}
+	    options.token = this.get('api_token')
       }
       Backbone.sync(method, model, options);
     },
@@ -29,15 +27,13 @@ var Doc = Backbone.Model.extend({
 	get_doc: function(dbkey,d_type){
 		self = this;
 		var session = new Session();
-		var dt = 'hash';
-		if(dbkey.search(/token/i) > 0 || dbkey.search(/size/i) > 0 || d_type == 'string'){
-			dt = 'string';
-		}
 		this.set('dbkey',dbkey);
 		$.ajax({
-			type: 'POST',
-			url: '/api/source/get_db_doc',
-			data: {api_token : session.getApiKey, doc : dbkey, data_type : dt},
+			type: 'GET',
+			url: '/rc/v1/store/' + dbkey,
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
 				var data = ""
 				r = self.formatJson(resp)

data/lib/rhoconnect/web-console/models/session.js

@@ -20,10 +20,13 @@ var Session = Backbone.Model.extend({
 		$(".reset-status")[0].firstChild.className = "label label-warning";
 		$(".reset-status")[0].firstChild.innerHTML = "loading...";
 		$(".reset-status").css("visibility","visible");
+		var token = this.getApiKey();
 		$.ajax({
 			type: 'POST',
-			url: '/api/admin/reset',
-			data: {api_token : this.getApiKey()},
+			url: '/rc/v1/system/reset',
+			beforeSend: function (XMLHttpRequest) {
+			    XMLHttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", token);
+			},
 			success: function(){
 				$(".reset-status")[0].firstChild.className = "label label-success";
 				$(".reset-status")[0].firstChild.innerHTML = "success";

data/lib/rhoconnect/web-console/models/source.js

@@ -18,58 +18,75 @@ var Source = Backbone.Model.extend({
 		this.set('api_token', session.getApiKey())
 	},
 	
-	url: '/api/admin',
-
     methodUrl: {
-      'create': '/api/admin/get_license_info',
-	  'read'  : '/api/source/list_sources'
+	  'read'  : '/rc/v1/sources/type/'
     },
 
     sync: function(method, model, options) {
       if (model.methodUrl && model.methodUrl[method.toLowerCase()]) {
         options = options || {};
         options.url = model.methodUrl[method.toLowerCase()];
-	    if(method == 'read'){
-		  options.url += "?api_token=" + this.get('api_token') + "&partition_type=" + this.get('partition_type')
-		}
+		options.url += this.get('partition_type')
+		options.token = this.get('api_token')
       }
       Backbone.sync(method, model, options);
     },
 	
 	parse: function(resp){
-		if(resp[0] != undefined || resp.length < 1){
-			var user 		= this.get('user_id');
-			var doctype 	= this.get('doctype');
-			var client_id 	= this.get('client_id');
-			var adapters = "";
-			$.each(resp, function(index,value){
-				if(doctype == null){
-					adapters += "<tr><td colspan='2'><a href='#sources/"+value+"'>"+ value + "</a></td></tr>"
+		var user 		= this.get('user_id');
+		var doctype 	= this.get('doctype');
+		var client_id 	= this.get('client_id');
+		var adapters = "";
+		$.each(resp, function(index,value){
+			if(doctype == null){
+				adapters += "<tr><td colspan='2'><a href='#sources/"+value+"'>"+ value + "</a></td></tr>"
+			}
+			else{
+				adapters += "<tr><td colspan='2'><a href='#sources/"+value+"/"+user+"/"+doctype+"/"+client_id+"'>"+ value + "</a></td></tr>"
+			}
+		})
+		$('tr.remove-tr-user').remove();
+		$('#source-table tr:last').after(adapters);
+	},
+	
+	get_license_info: function(){
+		var session = new Session();
+		$.ajax({
+			type: 'GET',
+			url: '/rc/v1/system/license',
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
+			success: function(resp){
+				if(resp != 'testtoken'){
+					var r = JSON.parse(resp)
+					var license_text = "Licensed to &nbsp;" + r["licensee"] + 
+						"&nbsp;on&nbsp;" + r["issued"] + ", available&nbsp;" + 
+						r["available"] + "&nbsp;out of&nbsp;" + 
+						r['seats'] + "&nbsp;devices"
+					var license_footer = "Licensed to Rhomobile&nbsp;"+r['available']+"/"+r['seats']+"&nbsp;devices available"
+					$('#license').html(license_text);
+					$('#license_info').html(license_footer);
 				}
-				else{
-					adapters += "<tr><td colspan='2'><a href='#sources/"+value+"/"+user+"/"+doctype+"/"+client_id+"'>"+ value + "</a></td></tr>"
+			},
+			error: function(resp){
+				if(resp.status == 422){
+					 new App.Views.Index()
 				}
-			})
-			$('tr.remove-tr-user').remove();
-			$('#source-table tr:last').after(adapters);
-		}
-		else{
-			var license_text = "Licensed to &nbsp;" + resp["licensee"] + 
-				"&nbsp;on&nbsp;" + resp["issued"] + ", available&nbsp;" + 
-				resp["available"] + "&nbsp;out of&nbsp;" + 
-				resp['seats'] + "&nbsp;devices"
-			var license_footer = "Licensed to Rhomobile&nbsp;"+resp['available']+"/"+resp['seats']+"&nbsp;devices available"
-			$('#license').html(license_text);
-			$('#license_info').html(license_footer);
-		}
+				$('#docalert')[0].innerHTML = resp.responseText;
+		        $('#docalert').css('display','block');
+			}
+		})	
 	},
 
 	list_source_docs: function(source_id,user_id){
 		var session = new Session();
 		$.ajax({
-			type: 'POST',
-			url: '/api/source/list_source_docs',
-			data: {api_token : session.getApiKey, source_id : source_id, user_id : user_id},
+			type: 'GET',
+			url: '/rc/v1/users/' + user_id + '/sources/' + source_id + '/docnames',
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
 				var r = JSON.parse(resp)
 				var docs = "";
@@ -92,9 +109,11 @@ var Source = Backbone.Model.extend({
 	get_source_params: function(source_id,user_id){
 		var session = new Session();
 		$.ajax({
-			type: 'POST',
-			url: '/api/source/get_source_params',
-			data: {api_token : session.getApiKey, source_id : source_id, user : user_id},
+			type: 'GET',
+			url: '/rc/v1/sources/' + source_id,
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
 				var r = JSON.parse(resp)
 				var params = "";

data/lib/rhoconnect/web-console/models/user.js

@@ -13,9 +13,11 @@ var User = Backbone.Model.extend({
 	get_users: function(tble_name){
 		var tble_name = tble_name;
 		$.ajax({
-			type: 'POST',
-			url: '/api/list_users',
-			data: {api_token : this.get('api_token')},
+			type: 'GET',
+			url: '/rc/v1/users',
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
 				var r = JSON.parse(resp)
 				data = ""
@@ -48,8 +50,11 @@ var User = Backbone.Model.extend({
 	    var password = $('#new-password').val();
 		$.ajax({
 			type: 'POST',
-			url: '/api/create_user',
-			data: {api_token : this.get('api_token'), attributes : {login : login, password : password}},
+			url: '/rc/v1/users',
+			data: {attributes : {login : login, password : password}},
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
 				router.navigate("users", true);
 			},
@@ -66,9 +71,11 @@ var User = Backbone.Model.extend({
 	delete_user: function(){
 		if(confirm("Are you sure you want to delete this user?")){
 			$.ajax({
-				type: 'POST',
-				url: '/api/user/delete_user',
-				data: {api_token : this.get('api_token'), user_id : this.get('name')},
+				type: 'DELETE',
+				url: '/rc/v1/users/' + this.get('name'),
+				beforeSend: function (HttpRequest) {
+				            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+				},
 				success: function(resp){
 					router.navigate("users", true);
 				},
@@ -86,9 +93,11 @@ var User = Backbone.Model.extend({
 	
 	new_ping: function(){
 		$.ajax({
-			type: 'POST',
-			url: '/api/source/list_sources',
-			data: {api_token : this.get('api_token'), user_id : this.get('name')},
+			type: 'GET',
+			url: '/rc/v1/sources/type/user',
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", session.getApiKey());
+			},
 			success: function(resp){
 				var r = JSON.parse(resp);
 				source_list = "";

data/lib/rhoconnect/web-console/public/backbone.js

@@ -1295,7 +1295,8 @@
     'create': 'POST',
     'update': 'PUT',
     'delete': 'DELETE',
-    'read':   'POST'
+    // TODO: Rhoconnect override - we need to re-factor it properly
+    'read':   'GET'
   };
 
   // Override this function to change the manner in which Backbone persists
@@ -1338,7 +1339,10 @@
       params.contentType = 'application/x-www-form-urlencoded';
       params.data = params.data ? {model: params.data} : {};
     }
-
+	// TODO: Rhoconnect override - we need to re-factor it properly
+	params.beforeSend = function(xhr) {
+      xhr.setRequestHeader('X-RhoConnect-API-TOKEN', options.token);
+    };
     // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
     // And an `X-HTTP-Method-Override` header.
     if (Backbone.emulateHTTP) {
@@ -1346,6 +1350,8 @@
         if (Backbone.emulateJSON) params.data._method = type;
         params.type = 'POST';
         params.beforeSend = function(xhr) {
+		  // TODO: Rhoconnect override - we need to re-factor it properly
+		  xhr.setRequestHeader('X-RhoConnect-API-TOKEN', options.token);
           xhr.setRequestHeader('X-HTTP-Method-Override', type);
         };
       }

data/lib/rhoconnect/web-console/templates/index.erb

@@ -2,7 +2,14 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>RhoConnect Console</title>
-	
+	<style type="text/css">
+		a.disable_link {
+			color:#CCC;
+		}
+		a.disable_link:hover {
+			color:#CCC;
+		}
+	</style>
 	<link rel="stylesheet" href='public/bootstrap.css' type="text/css" media="screen" />
     <!-- <script language="javascript" type="text/javascript" src='application.js'></script> -->
     <script language="javascript" type="text/javascript" src='public/jquery-1.7.1.min.js'></script>
@@ -60,10 +67,9 @@
 					<li id='info_home'><a href='#'>Home</a></li>
 					<li id='server_doc'><a href='#docselect'>Server Doc</a></li>
 					<li id='users'><a href='#users'>Users</a></li>
-					<li id='settings'><a href='#settings'>Settings</a></li>
-					<% if Rhoconnect.stats == true%>
-						<li id='stats'><a href='#stats'>Statistics</a></li>
-					<% end %>
+					<% link = Rhoconnect.stats == true ? '#stats' : '#'%>
+					<% l_klass = Rhoconnect.stats == true ? '' : 'disable_link'%>
+					<li id='stats'><a class='<%=l_klass%>' href='<%=link%>'>Statistics</a></li>
 				</ul>
 			</div>
 			<div class='span12' style='margin-left:0'>

data/lib/rhoconnect/web-console/views/doc.js

@@ -14,15 +14,18 @@ App.Views.Doc = Backbone.View.extend({
 		dbkey = this.model.get('dbkey');
 		var dt   = 'hash';
 		var data = [];
+		token = this.model.get('api_token');
  		if(dbkey.search(/token/i) > 0 || dbkey.search(/size/i) > 0){
- 			dt = 'string';
 			data = '';
 		}
 		var self = this;
 		$.ajax({
 			type: 'POST',
-			url: '/api/source/set_db_doc',
-			data: {api_token : this.model.get('api_token'), doc : dbkey, data : data, data_type : dt},
+			url: '/rc/v1/store/' + dbkey,
+			data: {data : data},
+			beforeSend: function (HttpRequest) {
+			            HttpRequest.setRequestHeader("X-RhoConnect-API-TOKEN", token);
+			},
 			success: function(){
 				data = "<tr><th colspan=3><h3 style='display:inline'>Data</h3><div class='pull-right'>" + 
 						"<a class='btn btn-danger'>clear document</a></div></th></tr>" +
@@ -46,11 +49,6 @@ App.Views.Doc = Backbone.View.extend({
         $('#secondary-nav').css('display','block');
 		out  = "<div class='page-header well'><h2>Document&nbsp;"+dbkey+"</h2></div>";
 		out += "<div id='docalert' class='alert alert-error' style='display:none'></div>";
-	    out += "<form class='form-horizontal' action='#doc/upload?#{@back_params}' method='post' enctype='multipart/form-data'>";
-		out += "<input type='hidden' name='doc' value='"+dbkey+"'/>";
-	    out += "<input type='text' name='string' value='' placeholder='Upload token string' class='input-xlarge'/>";
-	    out += "<input type='submit' value='Submit' class='btn btn-primary' style='margin-left:10px'>";
-	    out += "</form>";
 		out += "<form 'string_s' class='form-horizontal'>";
 		out += "<input type='text' name='data' value='' class='input-xlarge' placeholder='Upload string'/>";
 		out += "<input type='submit' value='Submit' class='btn btn-primary' style='margin-left:10px'>";