Improved login by auth token

Author: syrusakbary

Cargo.lock

@@ -50,8 +50,8 @@ tar = { version = "0.4" }
 
 [target.'cfg(target_os = "wasi")'.dependencies]
 whoami = "0.5"
-wasm-bus-reqwest = { version = "1.0", path = "../ate/wasm-bus-reqwest" }
-wasm-bus-process = { version = "1.0", path = "../ate/wasm-bus-process" }
+wasm-bus-reqwest = "1.0"
+wasm-bus-process = "1.0"
 getrandom = "0.2.3"
 tar = { package = "tar-wasi", version = "0.4" }
 serde_yaml = { version = "^0.8" }

Cargo.toml

@@ -15,7 +15,7 @@ enum Command {
 
     #[structopt(name = "login")]
     /// Logins into wapm, saving the token locally for future commands
-    Login,
+    Login(commands::LoginOpt),
 
     #[structopt(name = "logout")]
     /// Remove the token for the registry
@@ -110,7 +110,7 @@ fn main() {
         }
     }
 
-    //#[cfg(target_os = "wasi")]
+    #[cfg(target_os = "wasi")]
     {
         if let Err(e) = logging::set_up_logging(true) {
             eprintln!("Error: {}", e);
@@ -174,7 +174,7 @@ fn main() {
 
     let result = match args {
         Command::WhoAmI => commands::whoami(),
-        Command::Login => commands::login(),
+        Command::Login(login_options) => commands::login(login_options),
         Command::Logout => commands::logout(),
         Command::Config(config_options) => commands::config(config_options),
         Command::Install(install_options) => commands::install(install_options),

src/bin/wapm.rs

@@ -4,7 +4,7 @@ use crate::config;
 use crate::data::lock::lockfile::{CommandMap, ModuleMap};
 use crate::dataflow::lockfile_packages::LockfileResult;
 use prettytable::{format, Table};
-use std::{fmt::Write as _};
+use std::fmt::Write as _;
 use structopt::StructOpt;
 
 #[derive(StructOpt, Debug)]

src/commands/list.rs

@@ -3,9 +3,16 @@ use crate::graphql::execute_query;
 use rpassword_wasi as rpassword;
 use std::io::prelude::*;
 use std::io::{stdin, stdout};
+use structopt::StructOpt;
 
 use graphql_client::*;
 
+#[derive(StructOpt, Debug)]
+pub struct LoginOpt {
+    /// Provide the token
+    token: Option<String>,
+}
+
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "graphql/schema.graphql",
@@ -14,7 +21,15 @@ use graphql_client::*;
 )]
 struct LoginMutation;
 
-pub fn login() -> anyhow::Result<()> {
+pub fn login(login_options: LoginOpt) -> anyhow::Result<()> {
+    if let Some(token) = login_options.token {
+        let mut config = Config::from_file()?;
+        config.registry.token = Some(token);
+        config.save()?;
+        println!("Login for WAPM saved");
+        return Ok(());
+    }
+
     print!("Username: ");
     stdout().flush().ok().expect("Could not flush stdout");
 

src/commands/login.rs

@@ -34,7 +34,7 @@ pub use self::install::{install, InstallOpt};
 pub use self::keys::{keys, KeyOpt};
 #[cfg(feature = "full")]
 pub use self::list::{list, ListOpt};
-pub use self::login::login;
+pub use self::login::{login, LoginOpt};
 pub use self::logout::logout;
 #[cfg(feature = "full")]
 pub use self::publish::{publish, PublishOpt};

src/commands/mod.rs

@@ -34,10 +34,22 @@ pub fn save_bin_script<P: AsRef<Path>>(
     package_path: String,
     module_path: String,
 ) -> Result<(), Error> {
-    let current_dir = crate::config::Config::get_current_dir().ok().unwrap_or_else(|| std::path::PathBuf::from("/".to_string()));
+    let current_dir = crate::config::Config::get_current_dir()
+        .ok()
+        .unwrap_or_else(|| std::path::PathBuf::from("/".to_string()));
     let command_path = format!("/bin/{}.alias", command_name);
-    let package_path = current_dir.clone().join("wapm_packages").join(package_path).to_string_lossy().to_string();
-    let module_path = current_dir.clone().join("wapm_packages").join(module_path).to_string_lossy().to_string();
+    let package_path = current_dir
+        .clone()
+        .join("wapm_packages")
+        .join(package_path)
+        .to_string_lossy()
+        .to_string();
+    let module_path = current_dir
+        .clone()
+        .join("wapm_packages")
+        .join(module_path)
+        .to_string_lossy()
+        .to_string();
     let mut file = fs::OpenOptions::new()
         .create(true)
         .truncate(true)
@@ -50,7 +62,12 @@ pub fn save_bin_script<P: AsRef<Path>>(
         crate::dataflow::ManifestResult::Manifest(manifest) => {
             if let Some(ref fs) = manifest.fs {
                 for (guest_path, host_path) in fs.iter() {
-                    mappings.push(format!("{}:{}/{}", guest_path, package_path, host_path.to_string_lossy()));
+                    mappings.push(format!(
+                        "{}:{}/{}",
+                        guest_path,
+                        package_path,
+                        host_path.to_string_lossy()
+                    ));
                 }
             }
         }

src/dataflow/bin_script.rs

@@ -73,8 +73,13 @@ impl<'a> MergedLockfilePackages<'a> {
                             let module_path = format!("{}/{}", module.package_path, module.source);
                             commands.insert(name, command);
                             // save the bin script to execute this command from the terminal
-                            save_bin_script(directory, script_name, module.package_path.clone(), module_path)
-                                .map_err(|e| Error::FailedToSaveLockfile(e.to_string()))?;
+                            save_bin_script(
+                                directory,
+                                script_name,
+                                module.package_path.clone(),
+                                module_path,
+                            )
+                            .map_err(|e| Error::FailedToSaveLockfile(e.to_string()))?;
                         }
                     }
                 }

src/dataflow/merged_lockfile_packages.rs

@@ -1,5 +1,6 @@
 use graphql_client::{QueryBody, Response};
 use serde;
+use std::env;
 use std::string::ToString;
 use thiserror::Error;
 #[cfg(not(target_os = "wasi"))]
@@ -65,7 +66,10 @@ where
     let res = client
         .post(registry_url)
         .multipart(form)
-        .bearer_auth(&config.registry.token.unwrap_or_else(|| "".to_string()))
+        .bearer_auth(
+            env::var("WAPM_REGISTRY_TOKEN")
+                .unwrap_or(config.registry.token.unwrap_or_else(|| "".to_string())),
+        )
         .header(USER_AGENT, user_agent)
         .send()?;
 

src/graphql.rs

@@ -153,7 +153,8 @@ pub fn run_async_check_base() {
         }
 
         let current_wapm = std::env::current_exe().expect("Can't get current wapm executable");
-        let current_dir = crate::config::Config::get_current_dir().expect("Can't get current wapm dir");
+        let current_dir =
+            crate::config::Config::get_current_dir().expect("Can't get current wapm dir");
         std::process::Command::new(current_wapm)
             .arg("run-background-update-check")
             .current_dir(current_dir)