Add support for apikey based logins

README.md

@@ -66,6 +66,7 @@ configuration options:
 
 * `email`: The email address to use as the account name when logging into the
   Bitwarden server. Required.
+* `client_id`: Client ID part of the API key. Defaults to regular login process if unset.
 * `sso_id`: The SSO organization ID. Defaults to regular login process if unset.
 * `base_url`: The URL of the Bitwarden server to use. Defaults to the official
   server at `https://api.bitwarden.com/` if unset.
@@ -95,6 +96,18 @@ between by using the `RBW_PROFILE` environment variable. Setting it to a name
 switch between several different vaults - each will use its own separate
 configuration, local vault, and agent.
 
+### Auth methods
+
+Currently `rbw` supports three login strategies, listed by order of priority:
+1. `apikey`, requires you to provide `client_id` and `client_secret`. Will be enabled
+  when a `client_id` value is set in the config file
+2. `SSO` (Enterprise Single Sign-On). Will be enabled when a `sso_id` value is set in
+  the config file. (Note: due to the current implementation, if your account is secured with 2FA
+  you'll be required to go through the browser flow twice. You'll be prompted for the 2FA code
+  after the first run)
+3. `email&password`, regular auth method, uses the same credentials as Bitwarden's Web Vault.
+  That's most likely what you want to use
+
 ## Usage
 
 Commands can generally be used directly, and will handle logging in or

src/actions.rs

@@ -7,14 +7,19 @@ pub async fn register(
     let (client, config) = api_client_async().await?;
 
     client
-        .register(email, &crate::config::device_id(&config).await?, &apikey)
+        .register(
+            email,
+            &crate::config::device_id_async(&config).await?,
+            &apikey,
+        )
         .await?;
 
     Ok(())
 }
 
 pub async fn login(
     email: &str,
+    apikey: Option<crate::locked::ApiKey>,
     password: crate::locked::Password,
     two_factor_token: Option<&str>,
     two_factor_provider: Option<crate::api::TwoFactorProviderType>,
@@ -42,9 +47,10 @@ pub async fn login(
     let (access_token, refresh_token, protected_key) = client
         .login(
             email,
+            apikey.as_ref(),
             config.sso_id.as_deref(),
-            &crate::config::device_id(&config).await?,
-            &identity.master_password_hash,
+            &crate::config::device_id_async(&config).await?,
+            Some(&identity.master_password_hash),
             two_factor_token,
             two_factor_provider,
         )