diff --git a/_articles/account/export-your-data.md b/_articles/account/export-your-data.md index 906ae2fa..bd13120c 100644 --- a/_articles/account/export-your-data.md +++ b/_articles/account/export-your-data.md @@ -71,6 +71,12 @@ To export your personal Vault data from a Browser Extension: 3. On the Export Vault view, choose a **File Format** (`.json`, `.csv`, or `.json (Encrypted)`). 4. Enter your **Master Password** and select **Submit**. +{% callout info %} +If you're exporting from the Vivaldi Browser Extension, you may need to popout the Browser Extension for export to work properly: + +{% image importing/browserextension-popout.png Popout a Browser Extension %} +{% endcallout %} + {% endcapture %} {{ browser_extension | markdownify}} diff --git a/_articles/getting-started/getting-started-organizations.md b/_articles/getting-started/getting-started-organizations.md index f8e64ca4..03f97676 100644 --- a/_articles/getting-started/getting-started-organizations.md +++ b/_articles/getting-started/getting-started-organizations.md @@ -93,7 +93,7 @@ As the Organization Owner, invite a new member: 1. In your Organization Vault, open the **Manage** tab and select the {% icon fa-plus %} **Invite User** button: {% image /organizations/org-people-invite.png %} -2. Enter the **Email** of your second member, which should match the email they [signed up for Bitwarden](#sign-up-for-bitwarden-again) with. You can also choose the [User Type]({{site.baseurl}}/article/user-types-access-control/#user-types) and [Access Controls]({{site.baseurl}}/article/user-types-access-control/#access-control) assigned to this user. +2. Enter the **Email** of your second member, which should match the email they [signed up for Bitwarden](#sign-up-for-bitwarden-again) with. You can also choose the [User Type]({{site.baseurl}}/article/user-types-access-control/#user-types) and [Access Controls]({{site.baseurl}}/article/user-types-access-control/#access-control) assigned to this user, including which [Collections](#get-to-know-collections) they can access. 3. Select **Save** to send the invitation to the designated email address. Once your invitation is sent, inform your new member and help them [accept the invitation](#accept). @@ -143,14 +143,16 @@ Shared items are **owned** by the Organization. This means that anyone with perm ## Share a Login -The last step on the road to secure sharing is to share a Vault item. Any existing or new [Vault item]({{site.baseurl}}/article/managing-items/#add-a-vault-item) can be shared from your Organization Vault or Personal Vault. For this guide, we'll go over sharing a new Login from your Personal Vault: +The last step on the road to secure sharing is to create a shared a Vault item. An existing [Vault item]({{site.baseurl}}/article/managing-items/#add-a-vault-item) can be shared after it's created, but for this guide, we'll focus on creating a **new** shared Login from your Personal Vault: 1. On the {% icon fa-lock %} **My Vault** page, select the {% icon fa-plus %} **Add Item** button. -2. Fill in all the relevant information for your new Login item (e.g. Username and Password). +2. Fill in all the relevant information for your new Login item (e.g. Username and Password). The item can be anything you want both yourself and the other Organization user to have access to, for example a family streaming account. 3. In the **Ownership** section at the bottom of the Add Item Panel, select your Organization to designate the item for sharing. -4. Select one or more **Collections** to share this item into. You must select *at least* one Collection. +4. Select one or more **Collections** to share this item into. Generally, users of two-person Organizations setup access for both users for all Collections. In larger or more complex Organizations, which Collection you share the item into will determine who can access it. 5. Select the **Save** button to finishing creating the shared item. +This new shared item will be accessible to both yourself and the other Organization user! As long as both users can access the Collection it's in, it will appear for both in the Organization Vault and in the **My Vault** view alongside other personal Vault items. + ## Congratulations! You've setup your new Bitwarden accounts, created an Organization, learned a bit about your Vaults, and shared an item! Nice work! diff --git a/_articles/security/emergency-access.md b/_articles/security/emergency-access.md index 125c2828..56ef412c 100644 --- a/_articles/security/emergency-access.md +++ b/_articles/security/emergency-access.md @@ -46,9 +46,9 @@ As a grantor, you can [reject](#approve-or-reject-emergency-access) an emergency ### User Access Trusted emergency contacts can be granted one of the following user access levels: -- **View**: When an emergency access request is granted, this user is granted view/read access to all items in your personal Vault. +- **View**: When an emergency access request is granted, this user is granted view/read access to all items in your personal Vault, including passwords of Login items. - {% callout success %}As the grantor, you may revoke access to a grantee with **View** access at any time.{% endcallout %} + {% callout success %}As the grantor, you may [revoke access](#revoking-access) to a grantee with **View** access at any time.{% endcallout %} - **Takeover**: When an emergency access request is granted, this user can create a Master Password for permanent read/write access to your Vault (this will **replace** your previous Master Password). Takeover disables any [Two-step Login Methods]({% link _articles/two-step-login/setup-two-step-login.md %}) enabled for the account. @@ -135,3 +135,20 @@ As the grantee, complete the following steps to access the grantor's Vault once 5. Select the option from the dropdown that corresponds with your [assigned access](#user-access): - **View** - Selecting this option will display the grantor's Vault items on this screen. - **Takeover** - Selecting this option will open the Takeover dialog box. Enter and confirm a new master password for the grantor's account. Once saved, log in to Bitwarden as normal, entering the the grantor's email address and the created Master Password. + +## Revoking Access + +The steps to take to regain exclusive access to your Vault after using Emergency Access depend on which [access level](#user-access) was granted: + +### Revoke View Access + +Trusted emergency contacts who are given **View** access will be able to view your Vault items once they are [approved](#approve-or-reject-emergency-access) and until their access is manually revoked. To manually revoke access, use the {% icon fa-cog %} **gear** dropdown to {% icon fa-times %} **Reject** access: + +{% image /features/emergency-access/ea-revoke.png Revoke Emergency Access %} + +### Revoke a Takeover + +Trusted emergency contacts who are given **Takeover** access will, once used, have created a new Master Password for your account. As a result, the only way to revoke access involves: + +1. Obtaining the new Master Password they created for your account and using it to log in the [Web Vault](https://vault.bitwarden.com){:target="\_blank"}. +2. [Changing your Master Password]({{site.baseurl}}/article/master-password/#change-your-master-password) to one that they do not know. diff --git a/images/features/emergency-access/ea-revoke.png b/images/features/emergency-access/ea-revoke.png new file mode 100644 index 00000000..f57e130f Binary files /dev/null and b/images/features/emergency-access/ea-revoke.png differ diff --git a/images/importing/browserextension-popout.png b/images/importing/browserextension-popout.png new file mode 100644 index 00000000..aa297530 Binary files /dev/null and b/images/importing/browserextension-popout.png differ