Merge pull request #20 from resolutionsystems/feature/addingOptionalS…

…TSARN

Feature/adding optional stsarn

Gruntfile.js

@@ -19,7 +19,7 @@ module.exports = function(grunt) {
 		connect: {
 			server: {
 				options: {
-					port: 80,
+					port: 3080,
 					keepalive: true
 				}
 			}
@@ -67,4 +67,4 @@ module.exports = function(grunt) {
 			process.exit();
 		}, 1000);
 	});
-};
+};

README.md

@@ -45,8 +45,9 @@ Get a working local development version of the app
 3. Install submodule (```git submodule init && git submodule update```)
 4. Run ```npm install -g grunt-cli```
 5. Run ```npm install```
-6. Run ```grunt``` (or ```sudo grunt```)
-7. Start your chrome with ```--disable-web-security``` and open http://localhost
+6. Run ```./node_modules/.bin/bower install```
+7. Run ```grunt``` (or ```sudo grunt```)
+8. Start your chrome with ```--disable-web-security``` and open http://localhost:3080/
 
 When something nice is created:
 

app/SimpleDb.js

@@ -4,6 +4,11 @@
 Ext.define('SdbNavigator.SimpleDb', {
 	singleton: true,
 	boxUsage: 0.0,
+	signer: null,
+
+	resetConnection: function () {
+		this.signer = null;
+	},
 
 	getQueryParts: function (query) {
 		// select output_list from domain_name [where expression] [sort_instructions] [limit limit]
@@ -111,12 +116,20 @@ Ext.define('SdbNavigator.SimpleDb', {
 
 	doQuery: function (method, params, callback) {
 		var host, signer, self = this;
+		var _this = this;
+
 		host = Ext.getCmp('region').getValue();
-		signer = new AWSV2Signer(Ext.getCmp('awsAccessKey').getValue(), Ext.getCmp('awsSecretKey').getValue());
 
-		Ext.Ajax.request({
-			url: 'https://' + host,
-			params: signer.sign(Ext.merge(
+		if (this.signer == null) {
+			this.signer = new AWSV2Signer(
+				Ext.getCmp('awsAccessKey').getValue(),
+				Ext.getCmp('awsSecretKey').getValue(),
+				Ext.getCmp('awsStsArn').getValue()
+			);
+		}
+
+		this.signer.asyncSign(
+			Ext.merge(
 				params,
 				{
 					Version: '2009-04-15'
@@ -125,7 +138,19 @@ Ext.define('SdbNavigator.SimpleDb', {
 				"verb": method,
 				"host": host,
 				"uriPath": "/"
-			}),
+			},
+            function(signedParams) {
+                _this.doQuery2(method, params, callback, signedParams);
+            }
+		);
+	},
+
+	doQuery2: function(method, params, callback, signedParams) {
+		var self = this;
+		var host = Ext.getCmp('region').getValue();
+		Ext.Ajax.request({
+			url: 'https://' + host,
+			params: signedParams,
 			method: method,
 			success: function (response) {
 				var lastBoxUsage = parseFloat(Ext.DomQuery.selectValue('BoxUsage', response.responseXML));
@@ -150,4 +175,4 @@ Ext.define('SdbNavigator.SimpleDb', {
 			disableCaching: false
 		});
 	}
-});
+});

app/controller/Settings.js

@@ -19,6 +19,7 @@ Ext.define('SdbNavigator.controller.Settings', {
 
 			'#settingsPanel #connectButton': {
 				click: function(button) {
+					SdbNavigator.SimpleDb.resetConnection();
 					this.listDomains(button.up('#settingsPanel'));
 				}
 			},

app/view/SettingsPanel.js

@@ -52,6 +52,7 @@ Ext.define('SdbNavigator.view.SettingsPanel', {
 	},
 	items: [
 		{
+			flex: 0.7,
 			items: [
 				{
 					xtype: 'label',
@@ -76,6 +77,7 @@ Ext.define('SdbNavigator.view.SettingsPanel', {
 			]
 		},
 		{
+			flex: 0.7,
 			items: [
 				{
 					xtype: 'label',
@@ -101,6 +103,32 @@ Ext.define('SdbNavigator.view.SettingsPanel', {
 			]
 		},
 		{
+			flex: 1.5,
+			items: [
+				{
+					xtype: 'label',
+					text: 'STS ARN (Optional)',
+					forId: 'awsStsArn'
+				},
+				{
+					id: 'awsStsArn',
+					xtype: 'textfield',
+					anchor: '100%',
+					allowBlank: true,
+					stateful: true,
+					stateId: 'awsStsArn',
+					stateEvents: ['change'],
+					applyState: function (state) {
+						this.setValue(state.value);
+					},
+					getState: function () {
+						return { value: this.getValue() };
+					}
+				}
+			]
+		},
+		{
+			flex: 0.6,
 			items: [
 				{
 					xtype: 'label',
@@ -136,6 +164,7 @@ Ext.define('SdbNavigator.view.SettingsPanel', {
 			]
 		},
 		{
+			flex: 0.5,
 			items: [
 				{
 					xtype: 'label',
@@ -152,6 +181,7 @@ Ext.define('SdbNavigator.view.SettingsPanel', {
 			]
 		},
 		{
+			flex: 0.35,
 			bodyPadding: '19 4',
 			items: [
 				{
@@ -163,4 +193,4 @@ Ext.define('SdbNavigator.view.SettingsPanel', {
 			]
 		}
 	]
-});
+});