Generate API secret in wallet --here mode (#2547)

mimblewimble · Feb 9, 2019 · d8605a4 · d8605a4
1 parent 49ca8eb
commit d8605a4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/config/src/config.rs b/config/src/config.rs
@@ -46,7 +46,7 @@ const GRIN_HOME: &'static str = ".grin";
 const GRIN_CHAIN_DIR: &'static str = "chain_data";
 /// Wallet data directory
 pub const GRIN_WALLET_DIR: &'static str = "wallet_data";
-const API_SECRET_FILE_NAME: &'static str = ".api_secret";
+pub const API_SECRET_FILE_NAME: &'static str = ".api_secret";
 
 fn get_grin_path(chain_type: &global::ChainTypes) -> Result<PathBuf, ConfigError> {
 	// Check if grin dir exists
@@ -79,7 +79,7 @@ fn check_config_current_dir(path: &str) -> Option<PathBuf> {
 }
 
 /// Create file with api secret
-fn init_api_secret(api_secret_path: &PathBuf) -> Result<(), ConfigError> {
+pub fn init_api_secret(api_secret_path: &PathBuf) -> Result<(), ConfigError> {
 	let mut api_secret_file = File::create(api_secret_path)?;
 	let api_secret: String = Alphanumeric
 		.sample_iter(&mut thread_rng())
@@ -89,8 +89,8 @@ fn init_api_secret(api_secret_path: &PathBuf) -> Result<(), ConfigError> {
 	Ok(())
 }
 
-/// // Check if file contains a secret and nothing else
-fn check_api_secret(api_secret_path: &PathBuf) -> Result<(), ConfigError> {
+/// Check if file contains a secret and nothing else
+pub fn check_api_secret(api_secret_path: &PathBuf) -> Result<(), ConfigError> {
 	let api_secret_file = File::open(api_secret_path)?;
 	let buf_reader = BufReader::new(api_secret_file);
 	let mut lines_iter = buf_reader.lines();

diff --git a/src/bin/cmd/config.rs b/src/bin/cmd/config.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /// Grin configuration file output command
-use crate::config::{GlobalConfig, GlobalWalletConfig, GRIN_WALLET_DIR};
+use crate::config::{config, GlobalConfig, GlobalWalletConfig, GRIN_WALLET_DIR};
 use crate::core::global;
 use std::env;
 
@@ -79,4 +79,12 @@ pub fn config_command_wallet(chain_type: &global::ChainTypes, file_name: &str) {
 		"File {} configured and created",
 		config_file_name.to_str().unwrap(),
 	);
+
+	let mut api_secret_path = current_dir.clone();
+	api_secret_path.push(config::API_SECRET_FILE_NAME);
+	if !api_secret_path.exists() {
+		config::init_api_secret(&api_secret_path).unwrap();
+	} else {
+		config::check_api_secret(&api_secret_path).unwrap();
+	}
 }