First working version

.dockerignore

@@ -0,0 +1,22 @@
+# Local build artifacts
+target
+
+# Data folder
+data
+
+# IDE files
+.vscode
+.idea
+*.iml
+
+# Git and Docker files
+.git
+.gitignore
+.gitmodules
+Dockerfile
+docker-compose.yml
+.dockerignore
+
+# Documentation
+*.md
+

.env

@@ -0,0 +1,13 @@
+# DATABASE_URL=data/db.sqlite3
+# PRIVATE_RSA_KEY=data/private_rsa_key.der
+# PUBLIC_RSA_KEY=data/public_rsa_key.der
+# ICON_CACHE_FOLDER=data/icon_cache
+# ATTACHMENTS_FOLDER=data/attachments
+
+# true for yes, anything else for no
+SIGNUPS_ALLOWED=true
+
+# ROCKET_ENV=production
+# ROCKET_ADDRESS=0.0.0.0 # Enable this to test mobile app
+# ROCKET_PORT=8000
+# ROCKET_TLS={certs="/path/to/certs.pem",key="/path/to/key.pem"}

.gitignore

@@ -0,0 +1,13 @@
+# Local build artifacts
+target
+
+# Data folder
+data
+
+# IDE files
+.vscode
+.idea
+*.iml
+
+# Environment file
+# .env

Cargo.toml

@@ -0,0 +1,62 @@
+[package]
+name = "bitwarden_rs"
+version = "0.1.0"
+authors = ["Daniel García <dani-garcia@users.noreply.github.com>"]
+
+[dependencies]
+
+# Test framework, similar to rspec
+stainless = "0.1.12"
+
+# Web framework for nightly with a focus on ease-of-use, expressibility, and speed.
+rocket = { version = "0.3.6", features = ["tls"] }
+rocket_codegen = "0.3.6"
+rocket_contrib = "0.3.6"
+
+# HTTP client
+reqwest = "0.8.4"
+
+# multipart/form-data support
+multipart = "0.13.6"
+
+# A generic serialization/deserialization framework
+serde = "1.0.27"
+serde_derive = "1.0.27"
+serde_json = "1.0.9"
+
+# A safe, extensible ORM and Query builder
+# If tables need more than 16 columns, add feature "large-tables"
+diesel = { version = "1.1.1", features = ["sqlite", "chrono"] }
+diesel_migrations = {version = "1.1.0", features = ["sqlite"] }
+
+# A generic connection pool
+r2d2 = "0.8.2"
+r2d2-diesel = "1.0.0"
+
+# Crypto library
+ring = { version = "0.11.0", features = ["rsa_signing"]}
+
+# UUID generation
+uuid = { version = "0.5.1", features = ["v4"] }
+
+# Date and time library for Rust
+chrono = "0.4.0"
+time = "0.1.39"
+
+# TOTP library
+oath = "0.10.2"
+
+# Data encoding library
+data-encoding = "2.1.1"
+
+# JWT library
+jsonwebtoken = "4.0.0"
+
+# A `dotenv` implementation for Rust
+dotenv = { version = "0.10.1", default-features = false }
+
+# Lazy static macro
+lazy_static = "1.0.0"
+
+[patch.crates-io]
+jsonwebtoken = { path = "libs/jsonwebtoken" } # Make jwt use ring 0.11, to match rocket

Dockerfile

@@ -0,0 +1,62 @@
+# Using multistage build: 
+# 	https://docs.docker.com/develop/develop-images/multistage-build/
+# 	https://whitfin.io/speeding-up-rust-docker-builds/
+########################## BUILD IMAGE  ##########################
+# We need to use the Rust build image, because
+# we need the Rust compiler and Cargo tooling
+FROM rustlang/rust:nightly as build
+
+# Install the database libraries, in this case just sqlite3
+RUN apt-get update && \
+	apt-get install -y sqlite3
+
+# Install the diesel_cli tool, to manage migrations
+# RUN cargo install diesel_cli --no-default-features --features sqlite
+	
+# Creates a dummy project used to grab dependencies
+RUN USER=root cargo new --bin app
+WORKDIR /app
+
+# Copies over *only* your manifests and vendored dependencies
+COPY ./Cargo.* ./
+COPY ./_libs ./_libs
+
+# Builds your dependencies and removes the
+# dummy project, except the target folder
+RUN cargo build --release
+RUN find . -not -path "./target*" -delete
+
+# Copies the complete project
+# To avoid copying unneeded files, use .dockerignore
+COPY . .
+
+# Builds again, this time it'll just be
+# your actual source files being built
+RUN cargo build --release
+
+######################## RUNTIME IMAGE  ########################
+# Create a new stage with a minimal image
+# because we already have a binary built
+FROM debian:stretch-slim
+
+# Install needed libraries
+RUN apt-get update && \
+ 	apt-get install -y sqlite3 openssl libssl-dev
+
+RUN mkdir /data
+VOLUME /data
+EXPOSE 80
+
+# Copies the files from the context (migrations, web-vault, ...)
+# and the binary from the "build" stage to the current stage
+
+# TODO Only needs web-vault and .env
+# COPY . .
+COPY .env .
+COPY web-vault ./web-vault
+COPY --from=build app/target/release/bitwarden_rs .
+
+# Configures the startup!
+# Use production to disable Rocket logging
+#CMD ROCKET_ENV=production ./bitwarden_rs
+CMD ROCKET_ENV=staging ./bitwarden_rs

README.md

@@ -0,0 +1,97 @@
+## Easy setup (Docker)
+Install Docker to your system and then, from the project root, run:
+```
+# Build the docker image:
+docker build -t dani/bitwarden_rs .
+
+# Run the docker image with a docker volume:
+docker volume create bw_data
+docker run --name bitwarden_rs -it --init --rm --mount source=bw_data,target=/data -p 8000:80 dani/bitwarden_rs
+
+# OR, Run the docker image with a host bind, where <absolute_path> is the absolute path to a folder in the host:
+docker run --name bitwarden_rs -it --init --rm --mount type=bind,source=<absolute_path>,target=/data -p 8000:80 dani/bitwarden_rs
+```
+
+## How to compile bitwarden_rs
+Install `rust nightly`, in Windows the recommended way is through `rustup`.
+
+Install the `sqlite3`, and `openssl` libraries, in Windows the best option is Microsoft's `vcpkg`,
+on other systems use their respective package managers.
+
+Then run:
+```
+cargo run
+# or
+cargo build
+```
+
+## How to update the web-vault used
+Install `node.js` and either `yarn` or `npm` (usually included with node)
+Clone the web-vault outside the project:
+```
+git clone https://github.com/bitwarden/web.git web-vault
+```
+
+Modify `web-vault/settings.json` to look like this:
+```json
+{
+  "appSettings": {
+    "apiUri": "/api",
+    "identityUri": "/identity",
+    "iconsUri": "/icons",
+    "stripeKey": "",
+    "braintreeKey": ""
+  }
+}
+```
+
+Then, run the following from the `web-vault` dir:
+```
+# With yarn (recommended)
+yarn
+yarn gulp dist:selfHosted
+
+# With npm
+npm install
+npx gulp dist:selfHosted
+```
+
+Finally copy the contents of the `web-vault/dist` folder into the `bitwarden_rs/web-vault` folder.
+
+## How to create the RSA signing key for JWT
+Generate the RSA key:
+```
+openssl genrsa -out data/private_rsa_key.pem
+```
+
+Convert the generated key to .DER:
+```
+openssl rsa -in data/private_rsa_key.pem -outform DER -out data/private_rsa_key.der
+```
+
+And generate the public key:
+```
+openssl rsa -in data/private_rsa_key.der -inform DER -RSAPublicKey_out -outform DER -out data/public_rsa_key.der
+```
+
+## How to recreate database schemas
+Install diesel-cli with cargo:
+```
+cargo install diesel_cli --no-default-features --features sqlite
+```
+
+Make sure that the correct path to the database is in the `.env` file.
+
+If you want to modify the schemas, create a new migration with:
+```
+diesel migration generate <name>
+```
+
+Modify the *.sql files, making sure that any changes are reverted
+in the down.sql file.
+
+Apply the migrations and save the generated schemas as follows:
+```
+diesel migration redo
+diesel print-schema > src/db/schema.rs
+```

docker-compose.yml

@@ -0,0 +1,10 @@
+## Docker Compose file, experimental and untested
+# Run 'docker compose up' to start the service
+version: '3'
+services:
+  web:
+    build: .
+    ports:
+     - "8000:80"
+    volumes:
+     - ./data:/data

libs/jsonwebtoken/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "jsonwebtoken"
+version = "4.0.0"
+authors = ["Vincent Prouillet <prouillet.vincent@gmail.com>"]
+license = "MIT"
+readme = "README.md"
+description = "Create and parse JWT in a strongly typed way."
+homepage = "https://github.com/Keats/rust-jwt"
+repository = "https://github.com/Keats/rust-jwt"
+keywords = ["jwt", "web", "api", "token", "json"]
+
+[dependencies]
+error-chain = { version = "0.11", default-features = false }
+serde_json = "1.0"
+serde_derive = "1.0"
+serde = "1.0"
+ring = { version = "0.11.0", features = ["rsa_signing", "dev_urandom_fallback"] }
+base64 = "0.8"
+untrusted = "0.5"
+chrono = "0.4"

libs/jsonwebtoken/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Vincent Prouillet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

libs/jsonwebtoken/src/crypto.rs

@@ -0,0 +1,120 @@
+use std::sync::Arc;
+
+use base64;
+use ring::{rand, digest, hmac, signature};
+use ring::constant_time::verify_slices_are_equal;
+use untrusted;
+
+use errors::{Result, ErrorKind};
+
+
+/// The algorithms supported for signing/verifying
+#[derive(Debug, PartialEq, Copy, Clone, Serialize, Deserialize)]
+pub enum Algorithm {
+    /// HMAC using SHA-256
+    HS256,
+    /// HMAC using SHA-384
+    HS384,
+    /// HMAC using SHA-512
+    HS512,
+
+    /// RSASSA-PKCS1-v1_5 using SHA-256
+    RS256,
+    /// RSASSA-PKCS1-v1_5 using SHA-384
+    RS384,
+    /// RSASSA-PKCS1-v1_5 using SHA-512
+    RS512,
+}
+
+/// The actual HS signing + encoding
+fn sign_hmac(alg: &'static digest::Algorithm, key: &[u8], signing_input: &str) -> Result<String> {
+    let signing_key = hmac::SigningKey::new(alg, key);
+    let digest = hmac::sign(&signing_key, signing_input.as_bytes());
+
+    Ok(
+        base64::encode_config::<hmac::Signature>(&digest, base64::URL_SAFE_NO_PAD)
+    )
+}
+
+/// The actual RSA signing + encoding
+/// Taken from Ring doc https://briansmith.org/rustdoc/ring/signature/index.html
+fn sign_rsa(alg: Algorithm, key: &[u8], signing_input: &str) -> Result<String> {
+    let ring_alg = match alg {
+        Algorithm::RS256 => &signature::RSA_PKCS1_SHA256,
+        Algorithm::RS384 => &signature::RSA_PKCS1_SHA384,
+        Algorithm::RS512 => &signature::RSA_PKCS1_SHA512,
+        _ => unreachable!(),
+    };
+
+    let key_pair = Arc::new(
+        signature::RSAKeyPair::from_der(untrusted::Input::from(key))
+            .map_err(|_| ErrorKind::InvalidKey)?
+    );
+    let mut signing_state = signature::RSASigningState::new(key_pair)
+        .map_err(|_| ErrorKind::InvalidKey)?;
+    let mut signature = vec![0; signing_state.key_pair().public_modulus_len()];
+    let rng = rand::SystemRandom::new();
+    signing_state.sign(ring_alg, &rng, signing_input.as_bytes(), &mut signature)
+        .map_err(|_| ErrorKind::InvalidKey)?;
+
+    Ok(
+        base64::encode_config::<[u8]>(&signature, base64::URL_SAFE_NO_PAD)
+    )
+}
+
+/// Take the payload of a JWT, sign it using the algorithm given and return
+/// the base64 url safe encoded of the result.
+///
+/// Only use this function if you want to do something other than JWT.
+pub fn sign(signing_input: &str, key: &[u8], algorithm: Algorithm) -> Result<String> {
+    match algorithm {
+        Algorithm::HS256 => sign_hmac(&digest::SHA256, key, signing_input),
+        Algorithm::HS384 => sign_hmac(&digest::SHA384, key, signing_input),
+        Algorithm::HS512 => sign_hmac(&digest::SHA512, key, signing_input),
+
+        Algorithm::RS256 | Algorithm::RS384 | Algorithm::RS512 => sign_rsa(algorithm, key, signing_input),
+//        TODO: if PKCS1 is made prublic, remove the line above and uncomment below
+//        Algorithm::RS256 => sign_rsa(&signature::RSA_PKCS1_SHA256, key, signing_input),
+//        Algorithm::RS384 => sign_rsa(&signature::RSA_PKCS1_SHA384, key, signing_input),
+//        Algorithm::RS512 => sign_rsa(&signature::RSA_PKCS1_SHA512, key, signing_input),
+    }
+}
+
+/// See Ring RSA docs for more details
+fn verify_rsa(alg: &signature::RSAParameters, signature: &str, signing_input: &str, key: &[u8]) -> Result<bool> {
+    let signature_bytes = base64::decode_config(signature, base64::URL_SAFE_NO_PAD)?;
+    let public_key_der = untrusted::Input::from(key);
+    let message = untrusted::Input::from(signing_input.as_bytes());
+    let expected_signature = untrusted::Input::from(signature_bytes.as_slice());
+
+    let res = signature::verify(alg, public_key_der, message, expected_signature);
+
+    Ok(res.is_ok())
+}
+
+/// Compares the signature given with a re-computed signature for HMAC or using the public key
+/// for RSA.
+///
+/// Only use this function if you want to do something other than JWT.
+///
+/// `signature` is the signature part of a jwt (text after the second '.')
+///
+/// `signing_input` is base64(header) + "." + base64(claims)
+pub fn verify(signature: &str, signing_input: &str, key: &[u8], algorithm: Algorithm) -> Result<bool> {
+    match algorithm {
+        Algorithm::HS256 | Algorithm::HS384 | Algorithm::HS512 => {
+            // we just re-sign the data with the key and compare if they are equal
+            let signed = sign(signing_input, key, algorithm)?;
+            Ok(verify_slices_are_equal(signature.as_ref(), signed.as_ref()).is_ok())
+        },
+        Algorithm::RS256 => verify_rsa(&signature::RSA_PKCS1_2048_8192_SHA256, signature, signing_input, key),
+        Algorithm::RS384 => verify_rsa(&signature::RSA_PKCS1_2048_8192_SHA384, signature, signing_input, key),
+        Algorithm::RS512 => verify_rsa(&signature::RSA_PKCS1_2048_8192_SHA512, signature, signing_input, key),
+    }
+}
+
+impl Default for Algorithm {
+    fn default() -> Self {
+        Algorithm::HS256
+    }
+}

libs/jsonwebtoken/src/errors.rs

@@ -0,0 +1,68 @@
+use base64;
+use serde_json;
+use ring;
+
+error_chain! {
+    errors {
+        /// When a token doesn't have a valid JWT shape
+        InvalidToken {
+            description("invalid token")
+            display("Invalid token")
+        }
+        /// When the signature doesn't match
+        InvalidSignature {
+            description("invalid signature")
+            display("Invalid signature")
+        }
+        /// When the secret given is not a valid RSA key
+        InvalidKey {
+            description("invalid key")
+            display("Invalid Key")
+        }
+
+        // Validation error
+
+        /// When a token’s `exp` claim indicates that it has expired
+        ExpiredSignature {
+            description("expired signature")
+            display("Expired Signature")
+        }
+        /// When a token’s `iss` claim does not match the expected issuer
+        InvalidIssuer {
+            description("invalid issuer")
+            display("Invalid Issuer")
+        }
+        /// When a token’s `aud` claim does not match one of the expected audience values
+        InvalidAudience {
+            description("invalid audience")
+            display("Invalid Audience")
+        }
+        /// When a token’s `aud` claim does not match one of the expected audience values
+        InvalidSubject {
+            description("invalid subject")
+            display("Invalid Subject")
+        }
+        /// When a token’s `iat` claim is in the future
+        InvalidIssuedAt {
+            description("invalid issued at")
+            display("Invalid Issued At")
+        }
+        /// When a token’s nbf claim represents a time in the future
+        ImmatureSignature {
+            description("immature signature")
+            display("Immature Signature")
+        }
+        /// When the algorithm in the header doesn't match the one passed to `decode`
+        InvalidAlgorithm {
+            description("Invalid algorithm")
+            display("Invalid Algorithm")
+        }
+    }
+
+    foreign_links {
+        Unspecified(ring::error::Unspecified) #[doc = "An error happened while signing/verifying a token with RSA"];
+        Base64(base64::DecodeError) #[doc = "An error happened while decoding some base64 text"];
+        Json(serde_json::Error) #[doc = "An error happened while serializing/deserializing JSON"];
+        Utf8(::std::string::FromUtf8Error) #[doc = "An error happened while trying to convert the result of base64 decoding to a String"];
+    }
+}

libs/jsonwebtoken/src/header.rs

@@ -0,0 +1,64 @@
+use crypto::Algorithm;
+
+
+/// A basic JWT header, the alg defaults to HS256 and typ is automatically
+/// set to `JWT`. All the other fields are optional.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct Header {
+    /// The type of JWS: it can only be "JWT" here
+    ///
+    /// Defined in [RFC7515#4.1.9](https://tools.ietf.org/html/rfc7515#section-4.1.9).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub typ: Option<String>,
+    /// The algorithm used
+    ///
+    /// Defined in [RFC7515#4.1.1](https://tools.ietf.org/html/rfc7515#section-4.1.1).
+    pub alg: Algorithm,
+    /// Content type
+    ///
+    /// Defined in [RFC7519#5.2](https://tools.ietf.org/html/rfc7519#section-5.2).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cty: Option<String>,
+    /// JSON Key URL
+    ///
+    /// Defined in [RFC7515#4.1.2](https://tools.ietf.org/html/rfc7515#section-4.1.2).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub jku: Option<String>,
+    /// Key ID
+    ///
+    /// Defined in [RFC7515#4.1.4](https://tools.ietf.org/html/rfc7515#section-4.1.4).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub kid: Option<String>,
+    /// X.509 URL
+    ///
+    /// Defined in [RFC7515#4.1.5](https://tools.ietf.org/html/rfc7515#section-4.1.5).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub x5u: Option<String>,
+    /// X.509 certificate thumbprint
+    ///
+    /// Defined in [RFC7515#4.1.7](https://tools.ietf.org/html/rfc7515#section-4.1.7).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub x5t: Option<String>,
+}
+
+impl Header {
+    /// Returns a JWT header with the algorithm given
+    pub fn new(algorithm: Algorithm) -> Header {
+        Header {
+            typ: Some("JWT".to_string()),
+            alg: algorithm,
+            cty: None,
+            jku: None,
+            kid: None,
+            x5u: None,
+            x5t: None,
+        }
+    }
+}
+
+impl Default for Header {
+    /// Returns a JWT header using the default Algorithm, HS256
+    fn default() -> Self {
+        Header::new(Algorithm::default())
+    }
+}

libs/jsonwebtoken/src/lib.rs

@@ -0,0 +1,140 @@
+//! Create and parses JWT (JSON Web Tokens)
+//!
+//! Documentation:  [stable](https://docs.rs/jsonwebtoken/)
+#![recursion_limit = "300"]
+#![deny(missing_docs)]
+
+#[macro_use]
+extern crate error_chain;
+#[macro_use]
+extern crate serde_derive;
+extern crate serde_json;
+extern crate serde;
+extern crate base64;
+extern crate ring;
+extern crate untrusted;
+extern crate chrono;
+
+/// All the errors, generated using error-chain
+pub mod errors;
+mod header;
+mod crypto;
+mod serialization;
+mod validation;
+
+pub use header::Header;
+pub use crypto::{
+    Algorithm,
+    sign,
+    verify,
+};
+pub use validation::Validation;
+pub use serialization::TokenData;
+
+
+use serde::de::DeserializeOwned;
+use serde::ser::Serialize;
+
+use errors::{Result, ErrorKind};
+use serialization::{from_jwt_part, from_jwt_part_claims, to_jwt_part};
+use validation::{validate};
+
+
+/// Encode the header and claims given and sign the payload using the algorithm from the header and the key
+///
+/// ```rust,ignore
+/// #[macro_use]
+/// extern crate serde_derive;
+/// use jsonwebtoken::{encode, Algorithm, Header};
+///
+/// /// #[derive(Debug, Serialize, Deserialize)]
+/// struct Claims {
+///    sub: String,
+///    company: String
+/// }
+///
+/// let my_claims = Claims {
+///     sub: "b@b.com".to_owned(),
+///     company: "ACME".to_owned()
+/// };
+///
+/// // my_claims is a struct that implements Serialize
+/// // This will create a JWT using HS256 as algorithm
+/// let token = encode(&Header::default(), &my_claims, "secret".as_ref()).unwrap();
+/// ```
+pub fn encode<T: Serialize>(header: &Header, claims: &T, key: &[u8]) -> Result<String> {
+    let encoded_header = to_jwt_part(&header)?;
+    let encoded_claims = to_jwt_part(&claims)?;
+    let signing_input = [encoded_header.as_ref(), encoded_claims.as_ref()].join(".");
+    let signature = sign(&*signing_input, key.as_ref(), header.alg)?;
+
+    Ok([signing_input, signature].join("."))
+}
+
+/// Used in decode: takes the result of a rsplit and ensure we only get 2 parts
+/// Errors if we don't
+macro_rules! expect_two {
+    ($iter:expr) => {{
+        let mut i = $iter;
+        match (i.next(), i.next(), i.next()) {
+            (Some(first), Some(second), None) => (first, second),
+            _ => return Err(ErrorKind::InvalidToken.into())
+        }
+    }}
+}
+
+/// Decode a token into a struct containing 2 fields: `claims` and `header`.
+///
+/// If the token or its signature is invalid or the claims fail validation, it will return an error.
+///
+/// ```rust,ignore
+/// #[macro_use]
+/// extern crate serde_derive;
+/// use jsonwebtoken::{decode, Validation, Algorithm};
+///
+/// #[derive(Debug, Serialize, Deserialize)]
+/// struct Claims {
+///    sub: String,
+///    company: String
+/// }
+///
+/// let token = "a.jwt.token".to_string();
+/// // Claims is a struct that implements Deserialize
+/// let token_data = decode::<Claims>(&token, "secret", &Validation::new(Algorithm::HS256));
+/// ```
+pub fn decode<T: DeserializeOwned>(token: &str, key: &[u8], validation: &Validation) -> Result<TokenData<T>> {
+    let (signature, signing_input) = expect_two!(token.rsplitn(2, '.'));
+    let (claims, header) = expect_two!(signing_input.rsplitn(2, '.'));
+    let header: Header = from_jwt_part(header)?;
+
+    if !verify(signature, signing_input, key, header.alg)? {
+        return Err(ErrorKind::InvalidSignature.into());
+    }
+
+    if !validation.algorithms.contains(&header.alg) {
+        return Err(ErrorKind::InvalidAlgorithm.into());
+    }
+
+    let (decoded_claims, claims_map): (T, _)  = from_jwt_part_claims(claims)?;
+
+    validate(&claims_map, validation)?;
+
+    Ok(TokenData { header: header, claims: decoded_claims })
+}
+
+/// Decode a token and return the Header. This is not doing any kind of validation: it is meant to be
+/// used when you don't know which `alg` the token is using and want to find out.
+///
+/// If the token has an invalid format, it will return an error.
+///
+/// ```rust,ignore
+/// use jsonwebtoken::decode_header;
+///
+/// let token = "a.jwt.token".to_string();
+/// let header = decode_header(&token);
+/// ```
+pub fn decode_header(token: &str) -> Result<Header> {
+    let (_, signing_input) = expect_two!(token.rsplitn(2, '.'));
+    let (_, header) = expect_two!(signing_input.rsplitn(2, '.'));
+    from_jwt_part(header)
+}

libs/jsonwebtoken/src/serialization.rs

@@ -0,0 +1,42 @@
+use base64;
+use serde::de::DeserializeOwned;
+use serde::ser::Serialize;
+use serde_json::{from_str, to_string, Value};
+use serde_json::map::Map;
+
+use errors::{Result};
+use header::Header;
+
+
+/// The return type of a successful call to decode
+#[derive(Debug)]
+pub struct TokenData<T> {
+    /// The decoded JWT header
+    pub header: Header,
+    /// The decoded JWT claims
+    pub claims: T
+}
+
+/// Serializes to JSON and encodes to base64
+pub fn to_jwt_part<T: Serialize>(input: &T) -> Result<String> {
+    let encoded = to_string(input)?;
+    Ok(base64::encode_config(encoded.as_bytes(), base64::URL_SAFE_NO_PAD))
+}
+
+/// Decodes from base64 and deserializes from JSON to a struct
+pub fn from_jwt_part<B: AsRef<str>, T: DeserializeOwned>(encoded: B) -> Result<T> {
+    let decoded = base64::decode_config(encoded.as_ref(), base64::URL_SAFE_NO_PAD)?;
+    let s = String::from_utf8(decoded)?;
+
+    Ok(from_str(&s)?)
+}
+
+/// Decodes from base64 and deserializes from JSON to a struct AND a hashmap
+pub fn from_jwt_part_claims<B: AsRef<str>, T: DeserializeOwned>(encoded: B) -> Result<(T, Map<String, Value>)> {
+    let decoded = base64::decode_config(encoded.as_ref(), base64::URL_SAFE_NO_PAD)?;
+    let s = String::from_utf8(decoded)?;
+
+    let claims: T = from_str(&s)?;
+    let map: Map<_,_> = from_str(&s)?;
+    Ok((claims, map))
+}

libs/jsonwebtoken/src/validation.rs

@@ -0,0 +1,377 @@
+use chrono::Utc;
+use serde::ser::Serialize;
+use serde_json::{Value, from_value, to_value};
+use serde_json::map::Map;
+
+use errors::{Result, ErrorKind};
+use crypto::Algorithm;
+
+
+/// Contains the various validations that are applied after decoding a token.
+///
+/// All time validation happen on UTC timestamps.
+///
+/// ```rust
+/// use jsonwebtoken::Validation;
+///
+/// // Default value
+/// let validation = Validation::default();
+///
+/// // Changing one parameter
+/// let mut validation = Validation {leeway: 60, ..Default::default()};
+///
+/// // Setting audience
+/// let mut validation = Validation::default();
+/// validation.set_audience(&"Me"); // string
+/// validation.set_audience(&["Me", "You"]); // array of strings
+/// ```
+#[derive(Debug, Clone, PartialEq)]
+pub struct Validation {
+    /// Add some leeway (in seconds) to the `exp`, `iat` and `nbf` validation to
+    /// account for clock skew.
+    ///
+    /// Defaults to `0`.
+    pub leeway: i64,
+    /// Whether to validate the `exp` field.
+    ///
+    /// It will return an error if the time in the `exp` field is past.
+    ///
+    /// Defaults to `true`.
+    pub validate_exp: bool,
+    /// Whether to validate the `iat` field.
+    ///
+    /// It will return an error if the time in the `iat` field is in the future.
+    ///
+    /// Defaults to `true`.
+    pub validate_iat: bool,
+    /// Whether to validate the `nbf` field.
+    ///
+    /// It will return an error if the current timestamp is before the time in the `nbf` field.
+    ///
+    /// Defaults to `true`.
+    pub validate_nbf: bool,
+    /// If it contains a value, the validation will check that the `aud` field is the same as the
+    /// one provided and will error otherwise.
+    /// Since `aud` can be either a String or a Vec<String> in the JWT spec, you will need to use
+    /// the [set_audience](struct.Validation.html#method.set_audience) method to set it.
+    ///
+    /// Defaults to `None`.
+    pub aud: Option<Value>,
+    /// If it contains a value, the validation will check that the `iss` field is the same as the
+    /// one provided and will error otherwise.
+    ///
+    /// Defaults to `None`.
+    pub iss: Option<String>,
+    /// If it contains a value, the validation will check that the `sub` field is the same as the
+    /// one provided and will error otherwise.
+    ///
+    /// Defaults to `None`.
+    pub sub: Option<String>,
+    /// If it contains a value, the validation will check that the `alg` of the header is contained
+    /// in the ones provided and will error otherwise.
+    ///
+    /// Defaults to `vec![Algorithm::HS256]`.
+    pub algorithms: Vec<Algorithm>,
+}
+
+impl Validation {
+    /// Create a default validation setup allowing the given alg
+    pub fn new(alg: Algorithm) -> Validation {
+        let mut validation = Validation::default();
+        validation.algorithms = vec![alg];
+        validation
+    }
+
+    /// Since `aud` can be either a String or an array of String in the JWT spec, this method will take
+    /// care of serializing the value.
+    pub fn set_audience<T: Serialize>(&mut self, audience: &T) {
+        self.aud = Some(to_value(audience).unwrap());
+    }
+}
+
+impl Default for Validation {
+    fn default() -> Validation {
+        Validation {
+            leeway: 0,
+
+            validate_exp: true,
+            validate_iat: true,
+            validate_nbf: true,
+
+            iss: None,
+            sub: None,
+            aud: None,
+
+            algorithms: vec![Algorithm::HS256],
+        }
+    }
+}
+
+
+
+pub fn validate(claims: &Map<String, Value>, options: &Validation) -> Result<()> {
+    let now = Utc::now().timestamp();
+
+    if let Some(iat) = claims.get("iat") {
+        if options.validate_iat && from_value::<i64>(iat.clone())? > now + options.leeway {
+            return Err(ErrorKind::InvalidIssuedAt.into());
+        }
+    }
+
+    if let Some(exp) = claims.get("exp") {
+        if options.validate_exp && from_value::<i64>(exp.clone())? < now - options.leeway {
+            return Err(ErrorKind::ExpiredSignature.into());
+        }
+    }
+
+    if let Some(nbf) = claims.get("nbf") {
+        if options.validate_nbf && from_value::<i64>(nbf.clone())? > now + options.leeway {
+            return Err(ErrorKind::ImmatureSignature.into());
+        }
+    }
+
+    if let Some(iss) = claims.get("iss") {
+        if let Some(ref correct_iss) = options.iss {
+            if from_value::<String>(iss.clone())? != *correct_iss {
+                return Err(ErrorKind::InvalidIssuer.into());
+            }
+        }
+    }
+
+    if let Some(sub) = claims.get("sub") {
+        if let Some(ref correct_sub) = options.sub {
+            if from_value::<String>(sub.clone())? != *correct_sub {
+                return Err(ErrorKind::InvalidSubject.into());
+            }
+        }
+    }
+
+    if let Some(aud) = claims.get("aud") {
+        if let Some(ref correct_aud) = options.aud {
+            if aud != correct_aud {
+                return Err(ErrorKind::InvalidAudience.into());
+            }
+        }
+    }
+
+    Ok(())
+}
+
+
+#[cfg(test)]
+mod tests {
+    use serde_json::{to_value};
+    use serde_json::map::Map;
+    use chrono::Utc;
+
+    use super::{validate, Validation};
+
+    use errors::ErrorKind;
+
+    #[test]
+    fn iat_in_past_ok() {
+        let mut claims = Map::new();
+        claims.insert("iat".to_string(), to_value(Utc::now().timestamp() - 10000).unwrap());
+        let res = validate(&claims, &Validation::default());
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn iat_in_future_fails() {
+        let mut claims = Map::new();
+        claims.insert("iat".to_string(), to_value(Utc::now().timestamp() + 100000).unwrap());
+        let res = validate(&claims, &Validation::default());
+        assert!(res.is_err());
+
+        match res.unwrap_err().kind() {
+            &ErrorKind::InvalidIssuedAt => (),
+            _ => assert!(false),
+        };
+    }
+
+    #[test]
+    fn iat_in_future_but_in_leeway_ok() {
+        let mut claims = Map::new();
+        claims.insert("iat".to_string(), to_value(Utc::now().timestamp() + 50).unwrap());
+        let validation = Validation {
+            leeway: 1000 * 60,
+            ..Default::default()
+        };
+        let res = validate(&claims, &validation);
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn exp_in_future_ok() {
+        let mut claims = Map::new();
+        claims.insert("exp".to_string(), to_value(Utc::now().timestamp() + 10000).unwrap());
+        let res = validate(&claims, &Validation::default());
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn exp_in_past_fails() {
+        let mut claims = Map::new();
+        claims.insert("exp".to_string(), to_value(Utc::now().timestamp() - 100000).unwrap());
+        let res = validate(&claims, &Validation::default());
+        assert!(res.is_err());
+
+        match res.unwrap_err().kind() {
+            &ErrorKind::ExpiredSignature => (),
+            _ => assert!(false),
+        };
+    }
+
+    #[test]
+    fn exp_in_past_but_in_leeway_ok() {
+        let mut claims = Map::new();
+        claims.insert("exp".to_string(), to_value(Utc::now().timestamp() - 500).unwrap());
+        let validation = Validation {
+            leeway: 1000 * 60,
+            ..Default::default()
+        };
+        let res = validate(&claims, &validation);
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn nbf_in_past_ok() {
+        let mut claims = Map::new();
+        claims.insert("nbf".to_string(), to_value(Utc::now().timestamp() - 10000).unwrap());
+        let res = validate(&claims, &Validation::default());
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn nbf_in_future_fails() {
+        let mut claims = Map::new();
+        claims.insert("nbf".to_string(), to_value(Utc::now().timestamp() + 100000).unwrap());
+        let res = validate(&claims, &Validation::default());
+        assert!(res.is_err());
+
+        match res.unwrap_err().kind() {
+            &ErrorKind::ImmatureSignature => (),
+            _ => assert!(false),
+        };
+    }
+
+    #[test]
+    fn nbf_in_future_but_in_leeway_ok() {
+        let mut claims = Map::new();
+        claims.insert("nbf".to_string(), to_value(Utc::now().timestamp() + 500).unwrap());
+        let validation = Validation {
+            leeway: 1000 * 60,
+            ..Default::default()
+        };
+        let res = validate(&claims, &validation);
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn iss_ok() {
+        let mut claims = Map::new();
+        claims.insert("iss".to_string(), to_value("Keats").unwrap());
+        let validation = Validation {
+            iss: Some("Keats".to_string()),
+            ..Default::default()
+        };
+        let res = validate(&claims, &validation);
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn iss_not_matching_fails() {
+        let mut claims = Map::new();
+        claims.insert("iss".to_string(), to_value("Hacked").unwrap());
+        let validation = Validation {
+            iss: Some("Keats".to_string()),
+            ..Default::default()
+        };
+        let res = validate(&claims, &validation);
+        assert!(res.is_err());
+
+        match res.unwrap_err().kind() {
+            &ErrorKind::InvalidIssuer => (),
+            _ => assert!(false),
+        };
+    }
+
+    #[test]
+    fn sub_ok() {
+        let mut claims = Map::new();
+        claims.insert("sub".to_string(), to_value("Keats").unwrap());
+        let validation = Validation {
+            sub: Some("Keats".to_string()),
+            ..Default::default()
+        };
+        let res = validate(&claims, &validation);
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn sub_not_matching_fails() {
+        let mut claims = Map::new();
+        claims.insert("sub".to_string(), to_value("Hacked").unwrap());
+        let validation = Validation {
+            sub: Some("Keats".to_string()),
+            ..Default::default()
+        };
+        let res = validate(&claims, &validation);
+        assert!(res.is_err());
+
+        match res.unwrap_err().kind() {
+            &ErrorKind::InvalidSubject => (),
+            _ => assert!(false),
+        };
+    }
+
+    #[test]
+    fn aud_string_ok() {
+        let mut claims = Map::new();
+        claims.insert("aud".to_string(), to_value("Everyone").unwrap());
+        let mut validation = Validation::default();
+        validation.set_audience(&"Everyone");
+        let res = validate(&claims, &validation);
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn aud_array_of_string_ok() {
+        let mut claims = Map::new();
+        claims.insert("aud".to_string(), to_value(["UserA", "UserB"]).unwrap());
+        let mut validation = Validation::default();
+        validation.set_audience(&["UserA", "UserB"]);
+        let res = validate(&claims, &validation);
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn aud_type_mismatch_fails() {
+        let mut claims = Map::new();
+        claims.insert("aud".to_string(), to_value("Everyone").unwrap());
+        let mut validation = Validation::default();
+        validation.set_audience(&["UserA", "UserB"]);
+        let res = validate(&claims, &validation);
+        assert!(res.is_err());
+
+        match res.unwrap_err().kind() {
+            &ErrorKind::InvalidAudience => (),
+            _ => assert!(false),
+        };
+    }
+
+    #[test]
+    fn aud_correct_type_not_matching_fails() {
+        let mut claims = Map::new();
+        claims.insert("aud".to_string(), to_value("Everyone").unwrap());
+        let mut validation = Validation::default();
+        validation.set_audience(&"None");
+        let res = validate(&claims, &validation);
+        assert!(res.is_err());
+
+        match res.unwrap_err().kind() {
+            &ErrorKind::InvalidAudience => (),
+            _ => assert!(false),
+        };
+    }
+}

migrations/2018-01-14-171611_create_tables/down.sql

@@ -0,0 +1,7 @@
+DROP TABLE users;
+
+DROP TABLE devices;
+
+DROP TABLE ciphers;
+
+DROP TABLE folders;

migrations/2018-01-14-171611_create_tables/up.sql

@@ -0,0 +1,50 @@
+CREATE TABLE users (
+  uuid                TEXT        NOT NULL PRIMARY KEY,
+  created_at          DATETIME    NOT NULL,
+  updated_at          DATETIME    NOT NULL,
+  email               TEXT UNIQUE NOT NULL,
+  name                TEXT        NOT NULL,
+  password_hash       BLOB        NOT NULL,
+  salt                BLOB        NOT NULL,
+  password_iterations INTEGER     NOT NULL,
+  password_hint       TEXT,
+  key                 TEXT        NOT NULL,
+  private_key         TEXT,
+  public_key          TEXT,
+  totp_secret         TEXT,
+  totp_recover        TEXT,
+  security_stamp      TEXT        NOT NULL
+);
+
+CREATE TABLE devices (
+  uuid          TEXT        NOT NULL PRIMARY KEY,
+  created_at    DATETIME    NOT NULL,
+  updated_at    DATETIME    NOT NULL,
+  user_uuid     TEXT        NOT NULL REFERENCES users (uuid),
+  name          TEXT        NOT NULL,
+  type          INTEGER     NOT NULL,
+  push_token    TEXT UNIQUE,
+  refresh_token TEXT UNIQUE NOT NULL
+);
+
+CREATE TABLE ciphers (
+  uuid              TEXT     NOT NULL PRIMARY KEY,
+  created_at        DATETIME NOT NULL,
+  updated_at        DATETIME NOT NULL,
+  user_uuid         TEXT     NOT NULL REFERENCES users (uuid),
+  folder_uuid       TEXT REFERENCES folders (uuid),
+  organization_uuid TEXT,
+  type              INTEGER  NOT NULL,
+  data              TEXT     NOT NULL,
+  favorite          BOOLEAN  NOT NULL,
+  attachments       BLOB
+);
+
+CREATE TABLE folders (
+  uuid       TEXT     NOT NULL PRIMARY KEY,
+  created_at DATETIME NOT NULL,
+  updated_at DATETIME NOT NULL,
+  user_uuid  TEXT     NOT NULL REFERENCES users (uuid),
+  name       TEXT     NOT NULL
+);
+  

src/api/core/accounts.rs

@@ -0,0 +1,149 @@
+use rocket::Route;
+use rocket::response::status::BadRequest;
+
+use rocket_contrib::{Json, Value};
+
+use db::DbConn;
+use db::models::*;
+use util;
+
+use auth::Headers;
+
+use CONFIG;
+
+#[derive(Deserialize, Debug)]
+#[allow(non_snake_case)]
+struct RegisterData {
+    email: String,
+    key: String,
+    keys: Option<KeysData>,
+    masterPasswordHash: String,
+    masterPasswordHint: Option<String>,
+    name: Option<String>,
+}
+
+#[derive(Deserialize, Debug)]
+#[allow(non_snake_case)]
+struct KeysData {
+    encryptedPrivateKey: String,
+    publicKey: String,
+}
+
+#[post("/accounts/register", data = "<data>")]
+fn register(data: Json<RegisterData>, conn: DbConn) -> Result<(), BadRequest<Json>> {
+    if CONFIG.signups_allowed {
+        err!(format!("Signups not allowed"))
+    }
+    println!("DEBUG - {:#?}", data);
+
+    if let Some(_) = User::find_by_mail(&data.email, &conn) {
+        err!("Email already exists")
+    }
+
+    let mut user = User::new(data.email.clone(),
+                             data.key.clone(),
+                             data.masterPasswordHash.clone());
+
+    // Add extra fields if present
+    if let Some(name) = data.name.clone() {
+        user.name = name;
+    }
+
+    if let Some(hint) = data.masterPasswordHint.clone() {
+        user.password_hint = Some(hint);
+    }
+
+    if let Some(ref keys) = data.keys {
+        user.private_key = Some(keys.encryptedPrivateKey.clone());
+        user.public_key = Some(keys.publicKey.clone());
+    }
+
+    user.save(&conn);
+
+    Ok(())
+}
+
+#[get("/accounts/profile")]
+fn profile(headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    Ok(Json(headers.user.to_json()))
+}
+
+#[post("/accounts/keys", data = "<data>")]
+fn post_keys(data: Json<KeysData>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let mut user = headers.user;
+
+    user.private_key = Some(data.encryptedPrivateKey.clone());
+    user.public_key = Some(data.publicKey.clone());
+
+    user.save(&conn);
+
+    Ok(Json(user.to_json()))
+}
+
+#[post("/accounts/password", data = "<data>")]
+fn post_password(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let key = data["key"].as_str().unwrap();
+    let password_hash = data["masterPasswordHash"].as_str().unwrap();
+    let new_password_hash = data["newMasterPasswordHash"].as_str().unwrap();
+
+    let mut user = headers.user;
+
+    if !user.check_valid_password(password_hash) {
+        err!("Invalid password")
+    }
+
+    user.set_password(new_password_hash);
+    user.key = key.to_string();
+
+    user.save(&conn);
+
+    Ok(Json(json!({})))
+}
+
+#[post("/accounts/security-stamp", data = "<data>")]
+fn post_sstamp(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let password_hash = data["masterPasswordHash"].as_str().unwrap();
+
+    let mut user = headers.user;
+
+    if !user.check_valid_password(password_hash) {
+        err!("Invalid password")
+    }
+
+    user.reset_security_stamp();
+
+    Ok(Json(json!({})))
+}
+
+#[post("/accounts/email-token", data = "<data>")]
+fn post_email(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    println!("{:#?}", data);
+    let password_hash = data["masterPasswordHash"].as_str().unwrap();
+
+    let mut user = headers.user;
+
+    if !user.check_valid_password(password_hash) {
+        err!("Invalid password")
+    }
+
+    err!("Not implemented")
+}
+
+#[post("/accounts/delete", data = "<data>")]
+fn delete_account(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let password_hash = data["masterPasswordHash"].as_str().unwrap();
+
+    let mut user = headers.user;
+
+    if !user.check_valid_password(password_hash) {
+        err!("Invalid password")
+    }
+
+    err!("Not implemented")
+}
+
+#[get("/accounts/revision-date")]
+fn revision_date(headers: Headers, conn: DbConn) -> Result<String, BadRequest<Json>> {
+    let revision_date = headers.user.updated_at.timestamp();
+    Ok(revision_date.to_string())
+}

src/api/core/ciphers.rs

@@ -0,0 +1,251 @@
+use std::io::{Cursor, Read};
+
+use rocket::{Route, Data};
+use rocket::http::ContentType;
+use rocket::response::status::BadRequest;
+
+use rocket_contrib::{Json, Value};
+
+use multipart::server::Multipart;
+
+use db::DbConn;
+use db::models::*;
+use util;
+
+use auth::Headers;
+
+#[get("/sync")]
+fn sync(headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let user = headers.user;
+
+    let folders = Folder::find_by_user(&user.uuid, &conn);
+    let folders_json: Vec<Value> = folders.iter().map(|c| c.to_json()).collect();
+
+    let ciphers = Cipher::find_by_user(&user.uuid, &conn);
+    let ciphers_json: Vec<Value> = ciphers.iter().map(|c| c.to_json()).collect();
+
+    Ok(Json(json!({
+        "Profile": user.to_json(),
+        "Folders": folders_json,
+        "Ciphers": ciphers_json,
+        "Domains": {
+            "EquivalentDomains": [],
+            "GlobalEquivalentDomains": [],
+            "Object": "domains",
+        },
+        "Object": "sync"
+    })))
+}
+
+
+#[get("/ciphers")]
+fn get_ciphers(headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let ciphers = Cipher::find_by_user(&headers.user.uuid, &conn);
+
+    let ciphers_json: Vec<Value> = ciphers.iter().map(|c| c.to_json()).collect();
+
+    Ok(Json(json!({
+      "Data": ciphers_json,
+      "Object": "list",
+    })))
+}
+
+#[get("/ciphers/<uuid>")]
+fn get_cipher(uuid: String, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let cipher = match Cipher::find_by_uuid(&uuid, &conn) {
+        Some(cipher) => cipher,
+        None => err!("Cipher doesn't exist")
+    };
+
+    if cipher.user_uuid != headers.user.uuid {
+        err!("Cipher is now owned by user")
+    }
+
+    Ok(Json(cipher.to_json()))
+}
+
+#[derive(Deserialize, Debug)]
+#[allow(non_snake_case)]
+struct CipherData {
+    #[serde(rename = "type")]
+    type_: i32,
+    folderId: Option<String>,
+    organizationId: Option<String>,
+    name: Option<String>,
+    notes: Option<String>,
+    favorite: Option<bool>,
+    login: Option<Value>,
+    card: Option<Value>,
+    fields: Option<Vec<Value>>,
+}
+
+#[post("/ciphers", data = "<data>")]
+fn post_ciphers(data: Json<CipherData>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let mut cipher = Cipher::new(headers.user.uuid.clone(),
+                                 data.type_,
+                                 data.favorite.unwrap_or(false));
+
+    if let Some(ref folder_id) = data.folderId {
+        // TODO: Validate folder is owned by user
+        cipher.folder_uuid = Some(folder_id.clone());
+    }
+
+    if let Some(ref org_id) = data.organizationId {
+        cipher.organization_uuid = Some(org_id.clone());
+    }
+
+    cipher.data = match value_from_data(&data) {
+        Ok(value) => {
+            use serde_json;
+            println!("--- {:?}", serde_json::to_string(&value));
+            println!("--- {:?}", value.to_string());
+
+            value.to_string()
+        }
+        Err(msg) => err!(msg)
+    };
+
+    cipher.save(&conn);
+
+    Ok(Json(cipher.to_json()))
+}
+
+fn value_from_data(data: &CipherData) -> Result<Value, &'static str> {
+    let mut values = json!({
+        "Name": data.name,
+        "Notes": data.notes
+    });
+
+    match data.type_ {
+        1 /*Login*/ => {
+            let login_data = match data.login {
+                Some(ref login) => login.clone(),
+                None => return Err("Login data missing")
+            };
+
+            if !copy_values(&login_data, &mut values) {
+                return Err("Login data invalid");
+            }
+        }
+        3 /*Card*/ => {
+            let card_data = match data.card {
+                Some(ref card) => card.clone(),
+                None => return Err("Card data missing")
+            };
+
+            if !copy_values(&card_data, &mut values) {
+                return Err("Card data invalid");
+            }
+        }
+        _ => return Err("Unknown type")
+    }
+
+    if let Some(ref fields) = data.fields {
+        values["Fields"] = Value::Array(fields.iter().map(|f| {
+            use std::collections::BTreeMap;
+            use serde_json;
+
+            let empty_map: BTreeMap<String, Value> = BTreeMap::new();
+            let mut value = serde_json::to_value(empty_map).unwrap();
+
+            copy_values(&f, &mut value);
+
+            value
+        }).collect());
+    } else {
+        values["Fields"] = Value::Null;
+    }
+
+    Ok(values)
+}
+
+fn copy_values(from: &Value, to: &mut Value) -> bool {
+    let map = match from.as_object() {
+        Some(map) => map,
+        None => return false
+    };
+
+    for (key, val) in map {
+        to[util::upcase_first(key)] = val.clone();
+    }
+
+    true
+}
+
+#[post("/ciphers/import", data = "<data>")]
+fn post_ciphers_import(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    println!("{:#?}", data);
+    err!("Not implemented")
+}
+
+#[post("/ciphers/<uuid>/attachment", format = "multipart/form-data", data = "<data>")]
+fn post_attachment(uuid: String, data: Data, content_type: &ContentType, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    // TODO: Check if cipher exists
+
+    let mut params = content_type.params();
+    let boundary_pair = params.next().expect("No boundary provided"); // ("boundary", "----WebKitFormBoundary...")
+    let boundary = boundary_pair.1;
+
+    use data_encoding::BASE64URL;
+    use crypto;
+    use CONFIG;
+
+    // TODO: Maybe use the same format as the official server?
+    let attachment_id = BASE64URL.encode(&crypto::get_random_64());
+    let path = format!("{}/{}/{}", CONFIG.attachments_folder,
+                       headers.user.uuid, attachment_id);
+    println!("Path {:#?}", path);
+
+    let mut mp = Multipart::with_body(data.open(), boundary);
+    match mp.save().with_dir(path).into_entries() {
+        Some(entries) => {
+            println!("Entries {:#?}", entries);
+
+            let saved_file = &entries.files["data"][0]; // Only one file at a time
+            let file_name = &saved_file.filename; // This is provided by the client, don't trust it
+            let file_size = &saved_file.size;
+        }
+        None => err!("No data entries")
+    }
+
+    err!("Not implemented")
+}
+
+#[delete("/ciphers/<uuid>/attachment/<attachment_id>")]
+fn delete_attachment(uuid: String, attachment_id: String, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    if uuid != headers.user.uuid {
+        err!("Permission denied")
+    }
+
+    // Delete file
+
+    // Delete entry in cipher
+
+    err!("Not implemented")
+}
+
+#[post("/ciphers/<uuid>")]
+fn post_cipher(uuid: String, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    put_cipher(uuid, headers, conn)
+}
+
+#[put("/ciphers/<uuid>")]
+fn put_cipher(uuid: String, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> { err!("Not implemented") }
+
+#[delete("/ciphers/<uuid>")]
+fn delete_cipher(uuid: String, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> { err!("Not implemented") }
+
+#[post("/ciphers/delete", data = "<data>")]
+fn delete_all(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let password_hash = data["masterPasswordHash"].as_str().unwrap();
+
+    let user = headers.user;
+
+    if !user.check_valid_password(password_hash) {
+        err!("Invalid password")
+    }
+
+    // Cipher::delete_from_user(&conn);
+
+    err!("Not implemented")
+}

src/api/core/folders.rs

@@ -0,0 +1,102 @@
+use rocket::Route;
+use rocket::response::status::BadRequest;
+
+use rocket_contrib::{Json, Value};
+
+use db::DbConn;
+use db::models::*;
+use util;
+
+use auth::Headers;
+
+#[get("/folders")]
+fn get_folders(headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let folders = Folder::find_by_user(&headers.user.uuid, &conn);
+
+    let folders_json: Vec<Value> = folders.iter().map(|c| c.to_json()).collect();
+
+    Ok(Json(json!({
+      "Data": folders_json,
+      "Object": "list",
+    })))
+}
+
+#[get("/folders/<uuid>")]
+fn get_folder(uuid: String, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let mut folder = match Folder::find_by_uuid(&uuid, &conn) {
+        Some(folder) => folder,
+        _ => err!("Invalid folder")
+    };
+
+    if folder.user_uuid != headers.user.uuid {
+        err!("Folder belongs to another user")
+    }
+
+    Ok(Json(folder.to_json()))
+}
+
+#[post("/folders", data = "<data>")]
+fn post_folders(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let name = &data["name"].as_str();
+
+    if name.is_none() {
+        err!("Invalid name")
+    }
+
+    let folder = Folder::new(headers.user.uuid.clone(), name.unwrap().into());
+
+    folder.save(&conn);
+
+    Ok(Json(folder.to_json()))
+}
+
+#[post("/folders/<uuid>", data = "<data>")]
+fn post_folder(uuid: String, data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    put_folder(uuid, data, headers, conn)
+}
+
+#[put("/folders/<uuid>", data = "<data>")]
+fn put_folder(uuid: String, data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let mut folder = match Folder::find_by_uuid(&uuid, &conn) {
+        Some(folder) => folder,
+        _ => err!("Invalid folder")
+    };
+
+    if folder.user_uuid != headers.user.uuid {
+        err!("Folder belongs to another user")
+    }
+
+    let name = &data["name"].as_str();
+
+    if name.is_none() {
+        err!("Invalid name")
+    }
+
+    folder.name = name.unwrap().into();
+
+    folder.save(&conn);
+
+    Ok(Json(folder.to_json()))
+}
+
+#[post("/folders/<uuid>/delete", data = "<data>")]
+fn delete_folder_post(uuid: String, data: Json<Value>, headers: Headers, conn: DbConn) -> Result<(), BadRequest<Json>> {
+    // Data contains a json object with the id, but we don't need it
+    delete_folder(uuid, headers, conn)
+}
+
+#[delete("/folders/<uuid>")]
+fn delete_folder(uuid: String, headers: Headers, conn: DbConn) -> Result<(), BadRequest<Json>> {
+    let folder = match Folder::find_by_uuid(&uuid, &conn) {
+        Some(folder) => folder,
+        _ => err!("Invalid folder")
+    };
+
+    if folder.user_uuid != headers.user.uuid {
+        err!("Folder belongs to another user")
+    }
+
+    folder.delete(&conn);
+
+    Ok(())
+}

src/api/core/mod.rs

@@ -0,0 +1,100 @@
+mod accounts;
+mod ciphers;
+mod folders;
+mod two_factor;
+
+use self::accounts::*;
+use self::ciphers::*;
+use self::folders::*;
+use self::two_factor::*;
+
+pub fn routes() -> Vec<Route> {
+    routes![
+        register,
+        profile,
+        post_keys,
+        post_password,
+        post_sstamp,
+        post_email,
+        delete_account,
+        revision_date,
+
+        sync,
+
+        get_ciphers,
+        get_cipher,
+        post_ciphers,
+        post_ciphers_import,
+        post_attachment,
+        delete_attachment,
+        post_cipher,
+        put_cipher,
+        delete_cipher,
+        delete_all,
+
+        get_folders,
+        get_folder,
+        post_folders,
+        post_folder,
+        put_folder,
+        delete_folder_post,
+        delete_folder,
+
+        get_twofactor,
+        get_recover,
+        generate_authenticator,
+        activate_authenticator,
+        disable_authenticator,
+
+        get_collections,
+
+        clear_device_token,
+        put_device_token,
+
+        get_eq_domains,
+        post_eq_domains
+    ]
+}
+
+///
+/// Move this somewhere else
+///
+
+use rocket::Route;
+use rocket::response::status::BadRequest;
+
+use rocket_contrib::{Json, Value};
+
+use db::DbConn;
+use db::models::*;
+use util;
+
+use auth::Headers;
+
+
+// GET /api/collections?writeOnly=false
+#[get("/collections")]
+fn get_collections() -> Result<Json, BadRequest<Json>> {
+    Ok(Json(json!({
+        "Data": [],
+        "Object": "list"
+    })))
+}
+
+
+#[put("/devices/identifier/<uuid>/clear-token")]
+fn clear_device_token(uuid: String) -> Result<Json, BadRequest<Json>> { err!("Not implemented") }
+
+#[put("/devices/identifier/<uuid>/token")]
+fn put_device_token(uuid: String) -> Result<Json, BadRequest<Json>> { err!("Not implemented") }
+
+
+#[get("/settings/domains")]
+fn get_eq_domains() -> Result<Json, BadRequest<Json>> {
+    err!("Not implemented")
+}
+
+#[post("/settings/domains")]
+fn post_eq_domains() -> Result<Json, BadRequest<Json>> {
+    err!("Not implemented")
+}

src/api/core/two_factor.rs

@@ -0,0 +1,131 @@
+use rocket::Route;
+use rocket::response::status::BadRequest;
+
+use rocket_contrib::{Json, Value};
+
+use data_encoding::BASE32;
+
+use db::DbConn;
+use db::models::*;
+
+use util;
+use crypto;
+
+use auth::Headers;
+
+
+#[get("/two-factor")]
+fn get_twofactor(headers: Headers) -> Result<Json, BadRequest<Json>> {
+    let data = if headers.user.totp_secret.is_none() {
+        Value::Null
+    } else {
+        json!([{
+                "Enabled": true,
+                "Type": 0,
+                "Object": "twoFactorProvider"
+            }])
+    };
+
+    Ok(Json(json!({
+        "Data": data,
+        "Object": "list"
+    })))
+}
+
+#[post("/two-factor/get-recover", data = "<data>")]
+fn get_recover(data: Json<Value>, headers: Headers) -> Result<Json, BadRequest<Json>> {
+    let password_hash = data["masterPasswordHash"].as_str().unwrap();
+
+    if !headers.user.check_valid_password(password_hash) {
+        err!("Invalid password");
+    }
+
+    Ok(Json(json!({
+        "Code": headers.user.totp_recover,
+        "Object": "twoFactorRecover"
+    })))
+}
+
+#[post("/two-factor/get-authenticator", data = "<data>")]
+fn generate_authenticator(data: Json<Value>, headers: Headers) -> Result<Json, BadRequest<Json>> {
+    let password_hash = data["masterPasswordHash"].as_str().unwrap();
+
+    if !headers.user.check_valid_password(password_hash) {
+        err!("Invalid password");
+    }
+
+    let (enabled, key) = match headers.user.totp_secret {
+        Some(secret) => (true, secret),
+        _ => (false, BASE32.encode(&crypto::get_random(vec![0u8; 20])))
+    };
+
+    Ok(Json(json!({
+        "Enabled": enabled,
+        "Key": key,
+        "Object": "twoFactorAuthenticator"
+    })))
+}
+
+#[post("/two-factor/authenticator", data = "<data>")]
+fn activate_authenticator(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let password_hash = data["masterPasswordHash"].as_str().unwrap();
+
+    if !headers.user.check_valid_password(password_hash) {
+        err!("Invalid password");
+    }
+    let token = data["token"].as_str(); // 123456
+    let key = data["key"].as_str().unwrap(); // YI4SKBIXG32LOA6VFKH2NI25VU3E4QML
+
+    // Validate key as base32 and 20 bytes length
+    let decoded_key: Vec<u8> = match BASE32.decode(key.as_bytes()) {
+        Ok(decoded) => decoded,
+        _ => err!("Invalid totp secret")
+    };
+
+    if decoded_key.len() != 20 {
+        err!("Invalid key length")
+    }
+
+    // Set key in user.totp_secret
+    let mut user = headers.user;
+    user.totp_secret = Some(key.to_uppercase());
+
+    // Validate the token provided with the key
+    if !user.check_totp_code(util::parse_option_string(token)) {
+        err!("Invalid totp code")
+    }
+
+    // Generate totp_recover
+    let totp_recover = BASE32.encode(&crypto::get_random(vec![0u8; 20]));
+    user.totp_recover = Some(totp_recover);
+
+    user.save(&conn);
+
+    Ok(Json(json!({
+        "Enabled": true,
+        "Key": key,
+        "Object": "twoFactorAuthenticator"
+    })))
+}
+
+#[post("/two-factor/disable", data = "<data>")]
+fn disable_authenticator(data: Json<Value>, headers: Headers, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let _type = &data["type"];
+    let password_hash = data["masterPasswordHash"].as_str().unwrap();
+
+    if !headers.user.check_valid_password(password_hash) {
+        err!("Invalid password");
+    }
+
+    let mut user = headers.user;
+    user.totp_secret = None;
+    user.totp_recover = None;
+
+    user.save(&conn);
+
+    Ok(Json(json!({
+        "Enabled": false,
+        "Type": 0,
+        "Object": "twoFactorProvider"
+    })))
+}

src/api/icons.rs

@@ -0,0 +1,85 @@
+use std::io;
+use std::io::prelude::*;
+use std::fs::{create_dir_all, File};
+use std::path::Path;
+
+use rocket::Route;
+use rocket::response::Content;
+use rocket::http::ContentType;
+
+use reqwest;
+
+use CONFIG;
+
+pub fn routes() -> Vec<Route> {
+    routes![icon]
+}
+
+#[get("/<domain>/icon.png")]
+fn icon(domain: String) -> Content<Vec<u8>> {
+    // Validate the domain to avoid directory traversal attacks
+    if domain.contains("/") || domain.contains("..") {
+        return Content(ContentType::PNG, get_fallback_icon());
+    }
+
+    let url = format!("https://icons.bitwarden.com/{}/icon.png", domain);
+
+    // Get the icon, or fallback in case of error
+    let icon = match get_icon_cached(&domain, &url) {
+        Ok(icon) => icon,
+        Err(e) => return Content(ContentType::PNG, get_fallback_icon())
+    };
+
+    Content(ContentType::PNG, icon)
+}
+
+fn get_icon(url: &str) -> Result<Vec<u8>, reqwest::Error> {
+    let mut res = reqwest::get(url)?;
+
+    res = match res.error_for_status() {
+        Err(e) => return Err(e),
+        Ok(res) => res
+    };
+
+    let mut buffer: Vec<u8> = vec![];
+    res.copy_to(&mut buffer)?;
+
+    Ok(buffer)
+}
+
+fn get_icon_cached(key: &str, url: &str) -> io::Result<Vec<u8>> {
+    create_dir_all(&CONFIG.icon_cache_folder)?;
+    let path = &format!("{}/{}.png", CONFIG.icon_cache_folder, key);
+
+    /// Try to read the cached icon, and return it if it exists
+    match File::open(path) {
+        Ok(mut f) => {
+            let mut buffer = Vec::new();
+
+            if f.read_to_end(&mut buffer).is_ok() {
+                return Ok(buffer);
+            }
+            /* If error reading file continue */
+        }
+        Err(_) => { /* Continue */ }
+    }
+
+    println!("Downloading icon for {}...", key);
+    let icon = match get_icon(url) {
+        Ok(icon) => icon,
+        Err(_) => return Err(io::Error::new(io::ErrorKind::NotFound, ""))
+    };
+
+    /// Save the currently downloaded icon
+    match File::create(path) {
+        Ok(mut f) => { f.write_all(&icon); }
+        Err(_) => { /* Continue */ }
+    };
+
+    Ok(icon)
+}
+
+fn get_fallback_icon() -> Vec<u8> {
+    let fallback_icon = "https://raw.githubusercontent.com/bitwarden/web/master/src/images/fa-globe.png";
+    get_icon_cached("default", fallback_icon).unwrap()
+}

src/api/identity.rs

@@ -0,0 +1,225 @@
+use std::collections::HashMap;
+
+use rocket::Route;
+use rocket::request::{Form, FormItems, FromForm};
+use rocket::response::status::BadRequest;
+
+use rocket_contrib::Json;
+
+use db::DbConn;
+use db::models::*;
+use util;
+
+pub fn routes() -> Vec<Route> {
+    routes![ login]
+}
+
+#[post("/connect/token", data = "<connect_data>")]
+fn login(connect_data: Form<ConnectData>, conn: DbConn) -> Result<Json, BadRequest<Json>> {
+    let data = connect_data.get();
+    println!("{:#?}", data);
+
+    let mut device = match data.grant_type {
+        GrantType::RefreshToken => {
+            // Extract token
+            let token = data.get("refresh_token").unwrap();
+
+            // Get device by refresh token
+            match Device::find_by_refresh_token(token, &conn) {
+                Some(device) => device,
+                None => err!("Invalid refresh token")
+            }
+        }
+        GrantType::Password => {
+            // Validate scope
+            let scope = data.get("scope").unwrap();
+            if scope != "api offline_access" {
+                err!("Scope not supported")
+            }
+
+            // Get the user
+            let username = data.get("username").unwrap();
+            let user = match User::find_by_mail(username, &conn) {
+                Some(user) => user,
+                None => err!("Invalid username or password")
+            };
+
+            // Check password
+            let password = data.get("password").unwrap();
+            if !user.check_valid_password(password) {
+                err!("Invalid username or password")
+            }
+
+            /*
+            //TODO: When invalid username or password, return this with a 400 BadRequest:
+            {
+              "error": "invalid_grant",
+              "error_description": "invalid_username_or_password",
+              "ErrorModel": {
+                "Message": "Username or password is incorrect. Try again.",
+                "ValidationErrors": null,
+                "ExceptionMessage": null,
+                "ExceptionStackTrace": null,
+                "InnerExceptionMessage": null,
+                "Object": "error"
+              }
+            }
+            */
+
+            // Check if totp code is required and the value is correct
+            let totp_code = util::parse_option_string(data.get("twoFactorToken").map(String::as_ref));
+
+            if !user.check_totp_code(totp_code) {
+                // Return error 400
+                return err_json!(json!({
+                        "error" : "invalid_grant",
+                        "error_description" : "Two factor required.",
+                        "TwoFactorProviders" : [ 0 ],
+                        "TwoFactorProviders2" : { "0" : null }
+                    }));
+            }
+
+            // Let's only use the header and ignore the 'devicetype' parameter
+            // TODO Get header Device-Type
+            let device_type_num = 0;// headers.device_type;
+
+            let (device_id, device_name) = match data.get("client_id").unwrap().as_ref() {
+                "web" => { (format!("web-{}", user.uuid), String::from("web")) }
+                "browser" | "mobile" => {
+                    (
+                        data.get("deviceidentifier").unwrap().clone(),
+                        data.get("devicename").unwrap().clone(),
+                    )
+                }
+                _ => err!("Invalid client id")
+            };
+
+            // Find device or create new
+            let device = match Device::find_by_uuid(&device_id, &conn) {
+                Some(device) => {
+                    // Check if valid device
+                    if device.user_uuid != user.uuid {
+                        device.delete(&conn);
+                        err!("Device is not owned by user")
+                    }
+
+                    device
+                }
+                None => {
+                    // Create new device
+                    Device::new(device_id, user.uuid, device_name, device_type_num)
+                }
+            };
+
+
+            device
+        }
+    };
+
+    let user = User::find_by_uuid(&device.user_uuid, &conn).unwrap();
+    let (access_token, expires_in) = device.refresh_tokens(&user);
+    device.save(&conn);
+
+    // TODO: when to include :privateKey and :TwoFactorToken?
+    Ok(Json(json!({
+        "access_token": access_token,
+        "expires_in": expires_in,
+        "token_type": "Bearer",
+        "refresh_token": device.refresh_token,
+        "Key": user.key,
+        "PrivateKey": user.private_key
+    })))
+}
+
+#[derive(Debug)]
+struct ConnectData {
+    grant_type: GrantType,
+    data: HashMap<String, String>,
+}
+
+impl ConnectData {
+    fn get(&self, key: &str) -> Option<&String> {
+        self.data.get(&key.to_lowercase())
+    }
+}
+
+#[derive(Debug, Copy, Clone)]
+enum GrantType { RefreshToken, Password }
+
+
+const VALUES_REFRESH: [&str; 1] = ["refresh_token"];
+
+const VALUES_PASSWORD: [&str; 5] = ["client_id",
+    "grant_type", "password", "scope", "username"];
+
+const VALUES_DEVICE: [&str; 3] = ["deviceidentifier",
+    "devicename", "devicetype"];
+
+
+impl<'f> FromForm<'f> for ConnectData {
+    type Error = String;
+
+    fn from_form(items: &mut FormItems<'f>, strict: bool) -> Result<Self, Self::Error> {
+        let mut data = HashMap::new();
+
+        // Insert data into map
+        for (key, value) in items {
+            let decoded_key: String = match key.url_decode() {
+                Ok(decoded) => decoded,
+                Err(e) => return Err(format!("Error decoding key: {}", value)),
+            };
+
+            let decoded_value: String = match value.url_decode() {
+                Ok(decoded) => decoded,
+                Err(e) => return Err(format!("Error decoding value: {}", value)),
+            };
+
+            data.insert(decoded_key.to_lowercase(), decoded_value);
+        }
+
+        // Validate needed values
+        let grant_type =
+            match data.get("grant_type").map(|s| &s[..]) {
+                Some("refresh_token") => {
+                    // Check if refresh token is proviced
+                    if let Err(msg) = check_values(&data, &VALUES_REFRESH) {
+                        return Err(msg);
+                    }
+
+                    GrantType::RefreshToken
+                }
+                Some("password") => {
+                    // Check if basic values are provided
+                    if let Err(msg) = check_values(&data, &VALUES_PASSWORD) {
+                        return Err(msg);
+                    }
+
+                    // Check that device values are present on device
+                    match data.get("client_id").unwrap().as_ref() {
+                        "browser" | "mobile" => {
+                            if let Err(msg) = check_values(&data, &VALUES_DEVICE) {
+                                return Err(msg);
+                            }
+                        }
+                        _ => {}
+                    }
+
+                    GrantType::Password
+                }
+
+                _ => return Err(format!("Grant type not supported"))
+            };
+
+        Ok(ConnectData { grant_type, data })
+    }
+}
+
+fn check_values(map: &HashMap<String, String>, values: &[&str]) -> Result<(), String> {
+    for value in values {
+        if !map.contains_key(*value) {
+            return Err(format!("{} cannot be blank", value));
+        }
+    }
+
+    Ok(())
+}

src/api/mod.rs

@@ -0,0 +1,9 @@
+mod core;
+mod icons;
+mod identity;
+mod web;
+
+pub use self::core::routes as core_routes;
+pub use self::icons::routes as icons_routes;
+pub use self::identity::routes as identity_routes;
+pub use self::web::routes as web_routes;

src/api/web.rs

@@ -0,0 +1,43 @@
+use std::io;
+use std::path::{Path, PathBuf};
+
+use rocket::Route;
+use rocket::response::NamedFile;
+use rocket_contrib::{Json, Value};
+
+use auth::Headers;
+
+use CONFIG;
+
+pub fn routes() -> Vec<Route> {
+    routes![index, files, attachments, alive]
+}
+
+// TODO: Might want to use in memory cache: https://github.com/hgzimmerman/rocket-file-cache
+#[get("/")]
+fn index() -> io::Result<NamedFile> {
+    NamedFile::open(Path::new(&CONFIG.web_vault_folder).join("index.html"))
+}
+
+#[get("/<p..>")] // Only match this if the other routes don't match
+fn files(p: PathBuf) -> io::Result<NamedFile> {
+    NamedFile::open(Path::new(&CONFIG.web_vault_folder).join(p))
+}
+
+#[get("/attachments/<uuid>/<file..>")]
+fn attachments(uuid: String, file: PathBuf, headers: Headers) -> io::Result<NamedFile> {
+    if uuid != headers.user.uuid {
+        return Err(io::Error::new(io::ErrorKind::PermissionDenied, "Permission denied"));
+    }
+
+    NamedFile::open(Path::new(&CONFIG.attachments_folder).join(file))
+}
+
+
+#[get("/alive")]
+fn alive() -> Json<String> {
+    use util::format_date;
+    use chrono::{NaiveDateTime, Utc};
+
+    Json(format_date(&Utc::now().naive_utc()))
+}

src/auth.rs

@@ -0,0 +1,164 @@
+///
+/// JWT Handling
+///
+
+use util::read_file;
+use std::path::Path;
+use time::Duration;
+
+use jwt;
+use serde::ser::Serialize;
+use serde::de::Deserialize;
+
+use CONFIG;
+
+const JWT_ALGORITHM: jwt::Algorithm = jwt::Algorithm::RS256;
+pub const JWT_ISSUER: &'static str = "localhost:8000/identity";
+
+lazy_static! {
+    pub static ref DEFAULT_VALIDITY: Duration = Duration::hours(2);
+    static ref JWT_HEADER: jwt::Header = jwt::Header::new(JWT_ALGORITHM);
+
+    static ref PRIVATE_RSA_KEY: Vec<u8> = match read_file(&CONFIG.private_rsa_key) {
+        Ok(key) => key,
+        Err(e) => panic!("Error loading private RSA Key from {}\n Error: {}", CONFIG.private_rsa_key, e)
+    };
+
+    static ref PUBLIC_RSA_KEY: Vec<u8> = match read_file(&CONFIG.public_rsa_key) {
+        Ok(key) => key,
+        Err(e) => panic!("Error loading public RSA Key from {}\n Error: {}", CONFIG.public_rsa_key, e)
+    };
+}
+
+pub fn encode_jwt<T: Serialize>(claims: &T) -> String {
+    match jwt::encode(&JWT_HEADER, claims, &PRIVATE_RSA_KEY) {
+        Ok(token) => return token,
+        Err(e) => panic!("Error encoding jwt {}", e)
+    };
+}
+
+pub fn decode_jwt(token: &str) -> Result<JWTClaims, String> {
+    let validation = jwt::Validation {
+        leeway: 30, // 30 seconds
+        validate_exp: true,
+        validate_iat: true,
+        validate_nbf: true,
+        aud: None,
+        iss: Some(JWT_ISSUER.into()),
+        sub: None,
+        algorithms: vec![JWT_ALGORITHM],
+    };
+
+    match jwt::decode(token, &PUBLIC_RSA_KEY, &validation) {
+        Ok(decoded) => Ok(decoded.claims),
+        Err(msg) => {
+            println!("Error validating jwt - {:#?}", msg);
+            Err(msg.to_string())
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct JWTClaims {
+    // Not before
+    pub nbf: i64,
+    // Expiration time
+    pub exp: i64,
+    // Issuer
+    pub iss: String,
+    // Subject
+    pub sub: String,
+
+    pub premium: bool,
+    pub name: String,
+    pub email: String,
+    pub email_verified: bool,
+
+    // user security_stamp
+    pub sstamp: String,
+    // device uuid
+    pub device: String,
+    // [ "api", "offline_access" ]
+    pub scope: Vec<String>,
+    // [ "Application" ]
+    pub amr: Vec<String>,
+}
+
+///
+/// Bearer token authentication
+///
+
+use rocket::Outcome;
+use rocket::http::Status;
+use rocket::request::{self, Request, FromRequest};
+
+use db::DbConn;
+use db::models::{User, Device};
+
+pub struct Headers {
+    pub device_type: i32,
+    pub device: Device,
+    pub user: User,
+}
+
+impl<'a, 'r> FromRequest<'a, 'r> for Headers {
+    type Error = &'static str;
+
+    fn from_request(request: &'a Request<'r>) -> request::Outcome<Self, Self::Error> {
+        let headers = request.headers();
+
+        /// Get device type
+        let device_type = match headers.get_one("Device-Type")
+            .map(|s| s.parse::<i32>()) {
+            Some(Ok(dt)) => dt,
+            _ => return err_handler!("Device-Type is invalid or missing")
+        };
+
+        /// Get access_token
+        let access_token: &str = match request.headers().get_one("Authorization") {
+            Some(a) => {
+                let split: Option<&str> = a.rsplit("Bearer ").next();
+
+                if split.is_none() {
+                    err_handler!("No access token provided")
+                }
+
+                split.unwrap()
+            }
+            None => err_handler!("No access token provided")
+        };
+
+        /// Check JWT token is valid and get device and user from it
+        let claims: JWTClaims = match decode_jwt(access_token) {
+            Ok(claims) => claims,
+            Err(msg) => {
+                println!("Invalid claim: {}", msg);
+                err_handler!("Invalid claim")
+            }
+        };
+
+        let device_uuid = claims.device;
+        let user_uuid = claims.sub;
+
+        let conn = match request.guard::<DbConn>() {
+            Outcome::Success(conn) => conn,
+            _ => err_handler!("Error getting DB")
+        };
+
+        let device = match Device::find_by_uuid(&device_uuid, &conn) {
+            Some(device) => device,
+            None => err_handler!("Invalid device id")
+        };
+
+        let user = match User::find_by_uuid(&user_uuid, &conn) {
+            Some(user) => user,
+            None => err_handler!("Device has no user associated")
+        };
+
+        if user.security_stamp != claims.sstamp {
+            err_handler!("Invalid security stamp")
+        }
+
+        Outcome::Success(Headers { device_type, device, user })
+    }
+}

src/bin/proxy.rs

@@ -0,0 +1,168 @@
+#![feature(plugin)]
+
+#![plugin(rocket_codegen)]
+extern crate rocket;
+extern crate rocket_contrib;
+extern crate reqwest;
+
+use std::io::{self, Cursor};
+use std::str::FromStr;
+use std::path::{Path, PathBuf};
+
+use rocket::{Request, Response};
+use rocket::config::Config;
+use rocket::fairing::{Fairing, Info, Kind};
+use rocket::http;
+use rocket::response::NamedFile;
+
+use reqwest::header::{self, Headers};
+
+/**
+** These routes are here to avoid showing errors in the console,
+** redirect the body data to the fairing and show the web vault.
+**/
+
+#[get("/")]
+fn index() -> io::Result<NamedFile> {
+    NamedFile::open(Path::new("web-vault").join("index.html"))
+}
+
+#[get("/<p..>")] // Only match this if the other routes don't match
+fn get(p: PathBuf) -> io::Result<NamedFile> {
+    NamedFile::open(Path::new("web-vault").join(p))
+}
+
+#[delete("/<_p..>")]
+fn delete(_p: PathBuf) {}
+
+#[put("/<_p..>", data = "<d>")]
+fn put(_p: PathBuf, d: Vec<u8>) -> Vec<u8> { d }
+
+#[post("/<_p..>", data = "<d>")]
+fn post(_p: PathBuf, d: Vec<u8>) -> Vec<u8> { d }
+
+
+fn main() {
+    let config = Config::development().unwrap();
+
+    rocket::custom(config, false)
+        .mount("/", routes![get, put, post, delete, index])
+        .attach(ProxyFairing { client: reqwest::Client::new() })
+        .launch();
+}
+
+struct ProxyFairing {
+    client: reqwest::Client
+}
+
+impl Fairing for ProxyFairing {
+    fn info(&self) -> Info {
+        Info {
+            name: "Proxy Fairing",
+            kind: Kind::Launch | Kind::Response,
+        }
+    }
+
+    fn on_launch(&self, _rocket: &rocket::Rocket) {
+        println!("Started proxy on locahost:8000");
+    }
+
+    fn on_response(&self, req: &Request, res: &mut Response) {
+        // Prepare the data to make the request
+        // -------------------------------------
+
+        let url = {
+            let url = req.uri().as_str();
+
+            // Check if we are outside the API paths
+            if !url.starts_with("/api/")
+                && !url.starts_with("/identity/") {
+                return;
+            }
+
+            // Replace the path with the real server URL
+            url.replacen("/api/", "https://api.bitwarden.com/", 1)
+                .replacen("/identity/", "https://identity.bitwarden.com/", 1)
+        };
+
+        let host = url.split("/").collect::<Vec<_>>()[2];
+        let headers = headers_rocket_to_reqwest(req.headers(), host);
+        let method = reqwest::Method::from_str(req.method().as_str()).unwrap();
+        let body = res.body_bytes();
+
+        println!("\n\nREQ. {} {}", req.method().as_str(), url);
+        println!("HEADERS. {:#?}", headers);
+        if let Some(ref body) = body {
+            let body_string = String::from_utf8_lossy(body);
+            if !body_string.contains("<!DOCTYPE html>") {
+                println!("BODY. {:?}", body_string);
+            }
+        }
+
+
+        // Execute the request
+        // -------------------------------------
+        let mut client = self.client.request(method, &url);
+        let request_builder = client.headers(headers);
+
+        if let Some(body_vec) = body {
+            request_builder.body(body_vec);
+        }
+
+        let mut server_res = match request_builder.send() {
+            Ok(response) => response,
+            Err(e) => {
+                res.set_status(http::Status::BadRequest);
+                res.set_sized_body(Cursor::new(e.to_string()));
+                return;
+            }
+        };
+
+        // Get the response values
+        // -------------------------------------
+        let mut res_body: Vec<u8> = vec![];
+        server_res.copy_to(&mut res_body).unwrap();
+
+        let res_status = server_res.status().as_u16();
+        let mut res_headers = server_res.headers().clone();
+
+        // These headers break stuff
+        res_headers.remove::<header::TransferEncoding>();
+        res_headers.remove::<header::ContentLength>();
+
+        println!("\n\nRES. {} {}", res_status, url);
+        // Nothing interesting here
+        // println!("HEADERS. {:#?}", res_headers);
+        println!("BODY. {:?}", String::from_utf8_lossy(&res_body));
+
+        // Prepare the response
+        // -------------------------------------
+        res.set_status(http::Status::from_code(res_status).unwrap_or(http::Status::BadRequest));
+
+        headers_reqwest_to_rocket(&res_headers, res);
+        res.set_sized_body(Cursor::new(res_body));
+    }
+}
+
+fn headers_rocket_to_reqwest(headers: &http::HeaderMap, host: &str) -> Headers {
+    let mut new_headers = Headers::new();
+
+    for header in headers.iter() {
+        let name = header.name().to_string();
+
+        let value = if name.to_lowercase() != "host" {
+            header.value().to_string()
+        } else {
+            host.to_string()
+        };
+
+        new_headers.set_raw(name, value);
+    }
+    new_headers
+}
+
+fn headers_reqwest_to_rocket(headers: &Headers, res: &mut Response) {
+    for header in headers.iter() {
+        res.set_raw_header(header.name().to_string(), header.value_string());
+    }
+}

src/crypto.rs

@@ -0,0 +1,36 @@
+///
+/// PBKDF2 derivation
+///
+
+use ring::{digest, pbkdf2};
+
+static DIGEST_ALG: &digest::Algorithm = &digest::SHA256;
+const OUTPUT_LEN: usize = digest::SHA256_OUTPUT_LEN;
+
+pub fn hash_password(secret: &[u8], salt: &[u8], iterations: u32) -> Vec<u8> {
+    let mut out = vec![0u8; OUTPUT_LEN]; // Initialize array with zeros
+
+    pbkdf2::derive(DIGEST_ALG, iterations, salt, secret, &mut out);
+
+    out
+}
+
+pub fn verify_password_hash(secret: &[u8], salt: &[u8], previous: &[u8], iterations: u32) -> bool {
+    pbkdf2::verify(DIGEST_ALG, iterations, salt, secret, previous).is_ok()
+}
+
+///
+/// Random values
+///
+
+pub fn get_random_64() -> Vec<u8> {
+    get_random(vec![0u8; 64])
+}
+
+pub fn get_random(mut array: Vec<u8>) -> Vec<u8> {
+    use ring::rand::{SecureRandom, SystemRandom};
+
+    SystemRandom::new().fill(&mut array);
+
+    array
+}

src/db/mod.rs

@@ -0,0 +1,60 @@
+use std::ops::Deref;
+
+use diesel::{Connection as DieselConnection, ConnectionError};
+use diesel::sqlite::SqliteConnection;
+use r2d2;
+use r2d2_diesel::ConnectionManager;
+
+use rocket::http::Status;
+use rocket::request::{self, FromRequest};
+use rocket::{Outcome, Request, State};
+
+use CONFIG;
+
+/// An alias to the database connection used
+type Connection = SqliteConnection;
+
+/// An alias to the type for a pool of Diesel SQLite connections.
+type Pool = r2d2::Pool<ConnectionManager<Connection>>;
+
+/// Connection request guard type: a wrapper around an r2d2 pooled connection.
+pub struct DbConn(pub r2d2::PooledConnection<ConnectionManager<Connection>>);
+
+pub mod schema;
+pub mod models;
+
+/// Initializes a database pool.
+pub fn init_pool() -> Pool {
+    let manager = ConnectionManager::new(&*CONFIG.database_url);
+
+    r2d2::Pool::builder()
+        .build(manager)
+        .expect("Failed to create pool")
+}
+
+pub fn get_connection() -> Result<Connection, ConnectionError> {
+    Connection::establish(&CONFIG.database_url)
+}
+
+/// Attempts to retrieve a single connection from the managed database pool. If
+/// no pool is currently managed, fails with an `InternalServerError` status. If
+/// no connections are available, fails with a `ServiceUnavailable` status.
+impl<'a, 'r> FromRequest<'a, 'r> for DbConn {
+    type Error = ();
+
+    fn from_request(request: &'a Request<'r>) -> request::Outcome<DbConn, ()> {
+        let pool = request.guard::<State<Pool>>()?;
+        match pool.get() {
+            Ok(conn) => Outcome::Success(DbConn(conn)),
+            Err(_) => Outcome::Failure((Status::ServiceUnavailable, ()))
+        }
+    }
+}
+
+// For the convenience of using an &DbConn as a &Database.
+impl Deref for DbConn {
+    type Target = Connection;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}

src/db/models/cipher.rs

@@ -0,0 +1,112 @@
+use chrono::{NaiveDate, NaiveDateTime, Utc};
+use time::Duration;
+use serde_json::Value as JsonValue;
+
+use uuid::Uuid;
+
+#[derive(Queryable, Insertable, Identifiable)]
+#[table_name = "ciphers"]
+#[primary_key(uuid)]
+pub struct Cipher {
+    pub uuid: String,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+
+    pub user_uuid: String,
+    pub folder_uuid: Option<String>,
+    pub organization_uuid: Option<String>,
+
+    // Login = 1,
+    // SecureNote = 2,
+    // Card = 3,
+    // Identity = 4
+    pub type_: i32,
+
+    pub data: String,
+    pub favorite: bool,
+    pub attachments: Option<Vec<u8>>,
+}
+
+/// Local methods
+impl Cipher {
+    pub fn new(user_uuid: String, type_: i32, favorite: bool) -> Cipher {
+        let now = Utc::now().naive_utc();
+
+        Cipher {
+            uuid: Uuid::new_v4().to_string(),
+            created_at: now,
+            updated_at: now,
+
+            user_uuid,
+            folder_uuid: None,
+            organization_uuid: None,
+
+            type_,
+            favorite,
+
+            data: String::new(),
+            attachments: None,
+        }
+    }
+
+    pub fn to_json(&self) -> JsonValue {
+        use serde_json;
+        use util::format_date;
+
+        let data: JsonValue = serde_json::from_str(&self.data).unwrap();
+
+        json!({
+            "Id": self.uuid,
+            "Type": self.type_,
+            "RevisionDate": format_date(&self.updated_at),
+            "FolderId": self.folder_uuid,
+            "Favorite": self.favorite,
+            "OrganizationId": "",
+            "Attachments": self.attachments,
+            "OrganizationUseTotp": false,
+            "Data": data,
+            "Object": "cipher",
+            "Edit": true,
+        })
+    }
+}
+
+use diesel;
+use diesel::prelude::*;
+use db::DbConn;
+use db::schema::ciphers;
+
+/// Database methods
+impl Cipher {
+    pub fn save(&self, conn: &DbConn) -> bool {
+        // TODO: Update modified date
+
+        match diesel::replace_into(ciphers::table)
+            .values(self)
+            .execute(&**conn) {
+            Ok(1) => true, // One row inserted
+            _ => false,
+        }
+    }
+
+    pub fn delete(self, conn: &DbConn) -> bool {
+        match diesel::delete(ciphers::table.filter(
+            ciphers::uuid.eq(self.uuid)))
+            .execute(&**conn) {
+            Ok(1) => true, // One row deleted
+            _ => false,
+        }
+    }
+
+    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Cipher> {
+        ciphers::table
+            .filter(ciphers::uuid.eq(uuid))
+            .first::<Cipher>(&**conn).ok()
+    }
+
+    pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec<Cipher> {
+        ciphers::table
+            .filter(ciphers::user_uuid.eq(user_uuid))
+            .load::<Cipher>(&**conn).expect("Error loading ciphers")
+    }
+}

src/db/models/device.rs

@@ -0,0 +1,117 @@
+use chrono::{NaiveDate, NaiveDateTime, Utc};
+use time::Duration;
+use serde_json::Value as JsonValue;
+
+use uuid::Uuid;
+
+#[derive(Queryable, Insertable, Identifiable)]
+#[table_name = "devices"]
+#[primary_key(uuid)]
+pub struct Device {
+    pub uuid: String,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+
+    pub user_uuid: String,
+
+    pub name: String,
+    /// https://github.com/bitwarden/core/tree/master/src/Core/Enums
+    pub type_: i32,
+    pub push_token: Option<String>,
+
+    pub refresh_token: String,
+}
+
+/// Local methods
+impl Device {
+    pub fn new(uuid: String, user_uuid: String, name: String, type_: i32) -> Device {
+        let now = Utc::now().naive_utc();
+
+        Device {
+            uuid,
+            created_at: now,
+            updated_at: now,
+
+            user_uuid,
+            name,
+            type_,
+
+            push_token: None,
+            refresh_token: String::new(),
+        }
+    }
+
+    pub fn refresh_tokens(&mut self, user: &super::User) -> (String, i64) {
+        // If there is no refresh token, we create one
+        if self.refresh_token.is_empty() {
+            use data_encoding::BASE64URL;
+            use crypto;
+
+            self.refresh_token = BASE64URL.encode(&crypto::get_random_64());
+        }
+
+        // Update the expiration of the device and the last update date
+        let time_now = Utc::now().naive_utc();
+
+        self.updated_at = time_now;
+
+        // Create the JWT claims struct, to send to the client
+        use auth::{encode_jwt, JWTClaims, DEFAULT_VALIDITY, JWT_ISSUER};
+        let claims = JWTClaims {
+            nbf: time_now.timestamp(),
+            exp: (time_now + *DEFAULT_VALIDITY).timestamp(),
+            iss: JWT_ISSUER.to_string(),
+            sub: user.uuid.to_string(),
+            premium: true,
+            name: user.name.to_string(),
+            email: user.email.to_string(),
+            email_verified: true,
+            sstamp: user.security_stamp.to_string(),
+            device: self.uuid.to_string(),
+            scope: vec!["api".into(), "offline_access".into()],
+            amr: vec!["Application".into()],
+        };
+
+        (encode_jwt(&claims), DEFAULT_VALIDITY.num_seconds())
+    }
+}
+
+use diesel;
+use diesel::prelude::*;
+use db::DbConn;
+use db::schema::devices;
+
+/// Database methods
+impl Device {
+    pub fn save(&self, conn: &DbConn) -> bool {
+        // TODO: Update modified date
+
+        match diesel::replace_into(devices::table)
+            .values(self)
+            .execute(&**conn) {
+            Ok(1) => true, // One row inserted
+            _ => false,
+        }
+    }
+
+    pub fn delete(self, conn: &DbConn) -> bool {
+        match diesel::delete(devices::table.filter(
+            devices::uuid.eq(self.uuid)))
+            .execute(&**conn) {
+            Ok(1) => true, // One row deleted
+            _ => false,
+        }
+    }
+
+    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Device> {
+        devices::table
+            .filter(devices::uuid.eq(uuid))
+            .first::<Device>(&**conn).ok()
+    }
+
+    pub fn find_by_refresh_token(refresh_token: &str, conn: &DbConn) -> Option<Device> {
+        devices::table
+            .filter(devices::refresh_token.eq(refresh_token))
+            .first::<Device>(&**conn).ok()
+    }
+}

src/db/models/folder.rs

@@ -0,0 +1,83 @@
+use chrono::{NaiveDate, NaiveDateTime, Utc};
+use time::Duration;
+use serde_json::Value as JsonValue;
+
+use uuid::Uuid;
+
+#[derive(Queryable, Insertable, Identifiable)]
+#[table_name = "folders"]
+#[primary_key(uuid)]
+pub struct Folder {
+    pub uuid: String,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+    pub user_uuid: String,
+    pub name: String,
+}
+
+/// Local methods
+impl Folder {
+    pub fn new(user_uuid: String, name: String) -> Folder {
+        let now = Utc::now().naive_utc();
+
+        Folder {
+            uuid: Uuid::new_v4().to_string(),
+            created_at: now,
+            updated_at: now,
+
+            user_uuid,
+            name,
+        }
+    }
+
+    pub fn to_json(&self) -> JsonValue {
+        use util::format_date;
+
+        json!({
+            "Id": self.uuid,
+            "RevisionDate": format_date(&self.updated_at),
+            "Name": self.name,
+            "Object": "folder",
+        })
+    }
+}
+
+use diesel;
+use diesel::prelude::*;
+use db::DbConn;
+use db::schema::folders;
+
+/// Database methods
+impl Folder {
+    pub fn save(&self, conn: &DbConn) -> bool {
+        // TODO: Update modified date
+
+        match diesel::replace_into(folders::table)
+            .values(self)
+            .execute(&**conn) {
+            Ok(1) => true, // One row inserted
+            _ => false,
+        }
+    }
+
+    pub fn delete(self, conn: &DbConn) -> bool {
+        match diesel::delete(folders::table.filter(
+            folders::uuid.eq(self.uuid)))
+            .execute(&**conn) {
+            Ok(1) => true, // One row deleted
+            _ => false,
+        }
+    }
+
+    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Folder> {
+        folders::table
+            .filter(folders::uuid.eq(uuid))
+            .first::<Folder>(&**conn).ok()
+    }
+
+    pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec<Folder> {
+        folders::table
+            .filter(folders::user_uuid.eq(user_uuid))
+            .load::<Folder>(&**conn).expect("Error loading folders")
+    }
+}

src/db/models/mod.rs

@@ -0,0 +1,9 @@
+mod cipher;
+mod device;
+mod folder;
+mod user;
+
+pub use self::cipher::Cipher;
+pub use self::device::Device;
+pub use self::folder::Folder;
+pub use self::user::User;

src/db/models/user.rs

@@ -0,0 +1,159 @@
+use chrono::{NaiveDate, NaiveDateTime, Utc};
+use time::Duration;
+use serde_json::Value as JsonValue;
+
+use uuid::Uuid;
+
+use CONFIG;
+
+#[derive(Queryable, Insertable, Identifiable)]
+#[table_name = "users"]
+#[primary_key(uuid)]
+pub struct User {
+    pub uuid: String,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+
+    pub email: String,
+    pub name: String,
+
+    pub password_hash: Vec<u8>,
+    pub salt: Vec<u8>,
+    pub password_iterations: i32,
+    pub password_hint: Option<String>,
+
+    pub key: String,
+    pub private_key: Option<String>,
+    pub public_key: Option<String>,
+    pub totp_secret: Option<String>,
+    pub totp_recover: Option<String>,
+    pub security_stamp: String,
+}
+
+/// Local methods
+impl User {
+    pub fn new(mail: String, key: String, password: String) -> User {
+        let now = Utc::now().naive_utc();
+        let email = mail.to_lowercase();
+
+        use crypto;
+
+        let iterations = CONFIG.password_iterations;
+        let salt = crypto::get_random_64();
+        let password_hash = crypto::hash_password(password.as_bytes(), &salt, iterations as u32);
+
+        User {
+            uuid: Uuid::new_v4().to_string(),
+            created_at: now,
+            updated_at: now,
+            name: email.clone(),
+            email,
+            key,
+
+            password_hash,
+            salt,
+            password_iterations: iterations,
+
+            security_stamp: Uuid::new_v4().to_string(),
+
+            password_hint: None,
+            private_key: None,
+            public_key: None,
+            totp_secret: None,
+            totp_recover: None,
+        }
+    }
+
+    pub fn check_valid_password(&self, password: &str) -> bool {
+        use crypto;
+
+        crypto::verify_password_hash(password.as_bytes(),
+                                     &self.salt,
+                                     &self.password_hash,
+                                     self.password_iterations as u32)
+    }
+
+    pub fn set_password(&mut self, password: &str) {
+        use crypto;
+        self.password_hash = crypto::hash_password(password.as_bytes(),
+                                                   &self.salt,
+                                                   self.password_iterations as u32);
+        self.reset_security_stamp();
+    }
+
+    pub fn reset_security_stamp(&mut self) {
+        self.security_stamp = Uuid::new_v4().to_string();
+    }
+
+    pub fn check_totp_code(&self, totp_code: Option<u64>) -> bool {
+        if let Some(ref totp_secret) = self.totp_secret {
+            if let Some(code) = totp_code {
+                // Validate totp
+                use data_encoding::BASE32;
+                use oath::{totp_raw_now, HashType};
+
+                let decoded_secret = match BASE32.decode(totp_secret.as_bytes()) {
+                    Ok(s) => s,
+                    Err(e) => return false
+                };
+
+                let generated = totp_raw_now(&decoded_secret, 6, 0, 30, &HashType::SHA1);
+                generated == code
+            } else {
+                false
+            }
+        } else {
+            true
+        }
+    }
+
+    pub fn to_json(&self) -> JsonValue {
+        json!({
+            "Id": self.uuid,
+            "Name": self.name,
+            "Email": self.email,
+            "EmailVerified": true,
+            "Premium": true,
+            "MasterPasswordHint": self.password_hint,
+            "Culture": "en-US",
+            "TwoFactorEnabled": self.totp_secret.is_some(),
+            "Key": self.key,
+            "PrivateKey": self.private_key,
+            "SecurityStamp": self.security_stamp,
+            "Organizations": [],
+            "Object": "profile"
+        })
+    }
+}
+
+use diesel;
+use diesel::prelude::*;
+use db::DbConn;
+use db::schema::users;
+
+/// Database methods
+impl User {
+    pub fn save(&self, conn: &DbConn) -> bool {
+        // TODO: Update modified date
+
+        match diesel::replace_into(users::table) // Insert or update
+            .values(self)
+            .execute(&**conn) {
+            Ok(1) => true, // One row inserted
+            _ => false,
+        }
+    }
+
+    pub fn find_by_mail(mail: &str, conn: &DbConn) -> Option<User> {
+        let lower_mail = mail.to_lowercase();
+        users::table
+            .filter(users::email.eq(lower_mail))
+            .first::<User>(&**conn).ok()
+    }
+
+    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<User> {
+        users::table
+            .filter(users::uuid.eq(uuid))
+            .first::<User>(&**conn).ok()
+    }
+}

src/db/schema.rs

@@ -0,0 +1,71 @@
+table! {
+    ciphers (uuid) {
+        uuid -> Text,
+        created_at -> Timestamp,
+        updated_at -> Timestamp,
+        user_uuid -> Text,
+        folder_uuid -> Nullable<Text>,
+        organization_uuid -> Nullable<Text>,
+        #[sql_name = "type"]
+        type_ -> Integer,
+        data -> Text,
+        favorite -> Bool,
+        attachments -> Nullable<Binary>,
+    }
+}
+
+table! {
+    devices (uuid) {
+        uuid -> Text,
+        created_at -> Timestamp,
+        updated_at -> Timestamp,
+        user_uuid -> Text,
+        name -> Text,
+        #[sql_name = "type"]
+        type_ -> Integer,
+        push_token -> Nullable<Text>,
+        refresh_token -> Text,
+    }
+}
+
+table! {
+    folders (uuid) {
+        uuid -> Text,
+        created_at -> Timestamp,
+        updated_at -> Timestamp,
+        user_uuid -> Text,
+        name -> Text,
+    }
+}
+
+table! {
+    users (uuid) {
+        uuid -> Text,
+        created_at -> Timestamp,
+        updated_at -> Timestamp,
+        email -> Text,
+        name -> Text,
+        password_hash -> Binary,
+        salt -> Binary,
+        password_iterations -> Integer,
+        password_hint -> Nullable<Text>,
+        key -> Text,
+        private_key -> Nullable<Text>,
+        public_key -> Nullable<Text>,
+        totp_secret -> Nullable<Text>,
+        totp_recover -> Nullable<Text>,
+        security_stamp -> Text,
+    }
+}
+
+joinable!(ciphers -> folders (folder_uuid));
+joinable!(ciphers -> users (user_uuid));
+joinable!(devices -> users (user_uuid));
+joinable!(folders -> users (user_uuid));
+
+allow_tables_to_appear_in_same_query!(
+    ciphers,
+    devices,
+    folders,
+    users,
+);

src/main.rs

@@ -0,0 +1,151 @@
+#![allow(dead_code, unused_variables, unused, unused_mut)]
+
+#![feature(plugin, custom_derive)]
+#![cfg_attr(test, plugin(stainless))]
+#![plugin(rocket_codegen)]
+extern crate rocket;
+#[macro_use]
+extern crate rocket_contrib;
+extern crate reqwest;
+extern crate multipart;
+extern crate serde;
+#[macro_use]
+extern crate serde_derive;
+#[macro_use]
+extern crate serde_json;
+#[macro_use]
+extern crate diesel;
+#[macro_use]
+extern crate diesel_migrations;
+extern crate r2d2_diesel;
+extern crate r2d2;
+extern crate ring;
+extern crate uuid;
+extern crate chrono;
+extern crate time;
+extern crate oath;
+extern crate data_encoding;
+extern crate jsonwebtoken as jwt;
+extern crate dotenv;
+#[macro_use]
+extern crate lazy_static;
+
+
+use std::{io, env};
+
+use rocket::{Data, Request, Rocket};
+use rocket::fairing::{Fairing, Info, Kind};
+
+#[macro_use]
+mod util;
+
+#[cfg(test)]
+mod tests;
+
+mod api;
+mod db;
+mod crypto;
+mod auth;
+
+fn init_rocket() -> Rocket {
+    rocket::ignite()
+        .mount("/", api::web_routes())
+        .mount("/api", api::core_routes())
+        .mount("/identity", api::identity_routes())
+        .mount("/icons", api::icons_routes())
+        .manage(db::init_pool())
+        .attach(DebugFairing)
+}
+
+// Embed the migrations from the migrations folder into the application
+// This way, the program automatically migrates the database to the latest version
+// https://docs.rs/diesel_migrations/*/diesel_migrations/macro.embed_migrations.html
+embed_migrations!();
+
+fn main() {
+    println!("{:#?}", *CONFIG);
+
+    // Make sure the database is up to date (create if it doesn't exist, or run the migrations)
+    let connection = db::get_connection().expect("Can't conect to DB");
+    embedded_migrations::run_with_output(&connection, &mut io::stdout());
+
+    // Validate location of rsa keys
+    if !util::file_exists(&CONFIG.private_rsa_key) {
+        panic!("private_rsa_key doesn't exist");
+    }
+    if !util::file_exists(&CONFIG.public_rsa_key) {
+        panic!("public_rsa_key doesn't exist");
+    }
+
+    init_rocket().launch();
+}
+
+lazy_static! {
+    // Load the config from .env or from environment variables
+    static ref CONFIG: Config = Config::load();
+}
+
+#[derive(Debug)]
+pub struct Config {
+    database_url: String,
+    private_rsa_key: String,
+    public_rsa_key: String,
+    icon_cache_folder: String,
+    attachments_folder: String,
+    web_vault_folder: String,
+
+    signups_allowed: bool,
+    password_iterations: i32,
+}
+
+impl Config {
+    fn load() -> Self {
+        dotenv::dotenv().ok();
+
+        Config {
+            database_url: env::var("DATABASE_URL").unwrap_or("data/db.sqlite3".into()),
+            private_rsa_key: env::var("PRIVATE_RSA_KEY").unwrap_or("data/private_rsa_key.der".into()),
+            public_rsa_key: env::var("PUBLIC_RSA_KEY").unwrap_or("data/public_rsa_key.der".into()),
+            icon_cache_folder: env::var("ICON_CACHE_FOLDER").unwrap_or("data/icon_cache".into()),
+            attachments_folder: env::var("ATTACHMENTS_FOLDER").unwrap_or("data/attachments".into()),
+            web_vault_folder: env::var("WEB_VAULT_FOLDER").unwrap_or("web-vault/".into()),
+
+            signups_allowed: util::parse_option_string(env::var("SIGNUPS_ALLOWED").ok()).unwrap_or(false),
+            password_iterations: util::parse_option_string(env::var("PASSWORD_ITERATIONS").ok()).unwrap_or(100_000),
+        }
+    }
+}
+
+struct DebugFairing;
+
+impl Fairing for DebugFairing {
+    fn info(&self) -> Info {
+        Info {
+            name: "Request Debugger",
+            kind: Kind::Request,
+        }
+    }
+
+    fn on_request(&self, req: &mut Request, data: &Data) {
+        let uri_string = req.uri().to_string();
+
+        // Ignore web requests
+        if !uri_string.starts_with("/api") &&
+            !uri_string.starts_with("/identity") {
+            return;
+        }
+
+        /*
+        for header in req.headers().iter() {
+            println!("DEBUG- {:#?} {:#?}", header.name(), header.value());
+        }
+        */
+
+        /*let body_data = data.peek();
+
+        if body_data.len() > 0 {
+            println!("DEBUG- Body Complete: {}", data.peek_complete());
+            println!("DEBUG- {}", String::from_utf8_lossy(body_data));
+        }*/
+    }
+}

src/tests.rs

@@ -0,0 +1,49 @@
+use super::init_rocket;
+use rocket::local::Client;
+use rocket::http::Status;
+
+#[test]
+fn hello_world() {
+    let client = Client::new(init_rocket()).expect("valid rocket instance");
+    let mut response = client.get("/alive").dispatch();
+    assert_eq!(response.status(), Status::Ok);
+    // assert_eq!(response.body_string(), Some("Hello, world!".into()));
+}
+
+// TODO: For testing, we can use either a test_transaction, or an in-memory database
+
+// TODO: test_transaction http://docs.diesel.rs/diesel/connection/trait.Connection.html#method.begin_test_transaction
+
+// TODO: in-memory database https://github.com/diesel-rs/diesel/issues/419 (basically use ":memory:" as the connection string
+
+describe! route_tests {
+    before_each {
+        let rocket = init_rocket();
+        let client = Client::new(rocket).expect("valid rocket instance");
+    }
+
+    describe! alive {
+        before_each {
+            let mut res = client.get("/alive").dispatch();
+            let body_str = res.body().and_then(|b| b.into_string()).unwrap();
+        }
+
+        it "responds with status OK 200" {
+            assert_eq!(res.status(), Status::Ok);
+        }
+
+        it "responds with current year" {
+            assert!(body_str.contains("2018"));
+        }
+    }
+
+    describe! nested_example {
+        ignore "this is ignored" {
+            assert_eq!(1, 2);
+        }
+
+        failing "this fails" {
+            assert_eq!(1, 2);
+        }
+    }
+}

src/util.rs

@@ -0,0 +1,84 @@
+///
+/// Macros
+///
+#[macro_export]
+macro_rules! err {
+    ($expr:expr) => {{
+        err_json!(json!($expr));
+    }}
+}
+
+#[macro_export]
+macro_rules! err_json {
+    ($expr:expr) => {{
+        println!("ERROR: {}", $expr);
+        return Err($crate::rocket::response::status::BadRequest(Some($crate::rocket_contrib::Json($expr))));
+    }}
+}
+
+#[macro_export]
+macro_rules! err_handler {
+    ($expr:expr) => {{
+        println!("ERROR: {}", $expr);
+        return $crate::rocket::Outcome::Failure(($crate::rocket::http::Status::Unauthorized, $expr));
+    }}
+}
+
+///
+/// File handling
+///
+
+use std::path::Path;
+use std::io::Read;
+use std::fs::File;
+
+pub fn file_exists(path: &str) -> bool {
+    Path::new(path).exists()
+}
+
+pub fn read_file(path: &str) -> Result<Vec<u8>, String> {
+    let mut file = File::open(Path::new(path))
+        .map_err(|e| format!("Error opening file: {}", e))?;
+
+    let mut contents: Vec<u8> = Vec::new();
+
+    file.read_to_end(&mut contents)
+        .map_err(|e| format!("Error reading file: {}", e))?;
+
+    Ok(contents)
+}
+
+
+///
+/// String util methods
+///
+
+use std::str::FromStr;
+
+pub fn upcase_first(s: &str) -> String {
+    let mut c = s.chars();
+    match c.next() {
+        None => String::new(),
+        Some(f) => f.to_uppercase().collect::<String>() + c.as_str(),
+    }
+}
+
+pub fn parse_option_string<S, T>(string: Option<S>) -> Option<T> where S: Into<String>, T: FromStr {
+    if let Some(Ok(value)) = string.map(|s| s.into().parse::<T>()) {
+        Some(value)
+    } else {
+        None
+    }
+}
+
+///
+/// Date util methods
+///
+
+use chrono::NaiveDateTime;
+
+const DATETIME_FORMAT: &'static str = "%Y-%m-%dT%H:%M:%S%.6fZ";
+
+pub fn format_date(date: &NaiveDateTime) -> String {
+    date.format(DATETIME_FORMAT).to_string()
+}

web-vault/LICENSE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

web-vault/app-id.json

@@ -0,0 +1,15 @@
+{
+  "trustedFacets": [
+    {
+      "version": {
+        "major": 1,
+        "minor": 0
+      },
+      "ids": [
+        "https://vault.bitwarden.com",
+        "ios:bundle-id:com.8bit.bitwarden",
+        "android:apk-key-hash:dUGFzUzf3lmHSLBDBIv+WaFyZMI"
+      ]
+    }
+  ]
+}

web-vault/app/accounts/views/accountsLogin.html

@@ -0,0 +1,7 @@
+<div class="login-box">
+    <div class="login-logo">
+        <i class="fa fa-shield"></i> <b>bit</b>warden
+    </div>
+    <div class="login-box-body" ui-view>
+    </div>
+</div>

web-vault/app/accounts/views/accountsLoginInfo.html

@@ -0,0 +1,49 @@
+<p class="login-box-msg">Log in to access your vault.</p>
+<form name="loginForm" ng-submit="loginForm.$valid && login(model)" api-form="loginPromise">
+    <div class="callout callout-danger validation-errors" ng-show="loginForm.$errors">
+        <h4>Errors have occurred</h4>
+        <ul>
+            <li ng-repeat="e in loginForm.$errors">{{e}}</li>
+        </ul>
+    </div>
+    <div class="form-group has-feedback" show-errors>
+        <label for="email" class="sr-only">Email</label>
+        <input type="email" id="email" name="Email" class="form-control" placeholder="Email" ng-model="model.email"
+               required api-field />
+        <span class="fa fa-envelope form-control-feedback"></span>
+    </div>
+    <div class="form-group has-feedback" show-errors>
+        <label for="masterPassword" class="sr-only">Master Password</label>
+        <input type="password" id="masterPassword" name="MasterPasswordHash" class="form-control" placeholder="Master Password"
+               ng-model="model.masterPassword"
+               required api-field />
+        <span class="fa fa-lock form-control-feedback"></span>
+    </div>
+    <div class="row">
+        <div class="col-xs-7">
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" id="rememberEmail" ng-model="model.rememberEmail" /> Remember Email
+                </label>
+            </div>
+        </div>
+        <div class="col-xs-5">
+            <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="loginForm.$loading">
+                <i class="fa fa-refresh fa-spin loading-icon" ng-show="loginForm.$loading"></i>Log In
+            </button>
+        </div>
+    </div>
+    <hr />
+    <ul>
+        <li>
+            <a ui-sref="frontend.register({returnState: returnState, email: stateEmail})">
+                Create a new account
+            </a>
+        </li>
+        <li>
+            <a ui-sref="frontend.passwordHint">
+                Get master password hint
+            </a>
+        </li>
+    </ul>
+</form>

web-vault/app/accounts/views/accountsLoginTwoFactor.html

@@ -0,0 +1,167 @@
+<div ng-if="twoFactorProvider === twoFactorProviderConstants.authenticator ||
+     twoFactorProvider === twoFactorProviderConstants.email">
+    <p class="login-box-msg" ng-if="twoFactorProvider === twoFactorProviderConstants.authenticator">
+        Enter the 6 digit verification code from your authenticator app.
+    </p>
+    <div ng-if="twoFactorProvider === twoFactorProviderConstants.email" class="text-center">
+        <p class="login-box-msg">
+            Enter the 6 digit verification code that was emailed to <b>{{twoFactorEmail}}</b>.
+        </p>
+        <p>
+            Didn't get the email?
+            <a href="#" stop-click ng-click="sendEmail(true)" ng-if="twoFactorProvider === twoFactorProviderConstants.email">
+                Send it again
+            </a>
+        </p>
+    </div>
+    <form name="twoFactorForm" ng-submit="twoFactorForm.$valid && twoFactor(token)" api-form="twoFactorPromise">
+        <div class="callout callout-danger validation-errors" ng-show="twoFactorForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in twoFactorForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group has-feedback" show-errors>
+            <label for="code" class="sr-only">Code</label>
+            <input type="text" id="code" name="Code" class="form-control" placeholder="Verification code"
+                   ng-model="token" required api-field autocomplete="off" autocorrect="off" autocapitalize="off"
+                   spellcheck="false" />
+            <span class="fa fa-lock form-control-feedback"></span>
+        </div>
+        <div class="row">
+            <div class="col-xs-7">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="rememberMe" ng-model="rememberTwoFactor.checked" /> Remember Me
+                    </label>
+                </div>
+            </div>
+            <div class="col-xs-5">
+                <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="twoFactorForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon" ng-show="twoFactorForm.$loading"></i>Log In
+                </button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<div ng-if="twoFactorProvider === twoFactorProviderConstants.yubikey">
+    <p class="login-box-msg">
+        Complete logging in with YubiKey.
+    </p>
+    <form name="twoFactorForm" ng-submit="twoFactorForm.$valid && twoFactor(token)" api-form="twoFactorPromise"
+          autocomplete="off">
+        <div class="callout callout-danger validation-errors" ng-show="twoFactorForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in twoFactorForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <p>Insert your YubiKey into your computer's USB port, then touch its button.</p>
+        <p>
+            <img src="images/two-factor/yubikey.jpg" alt="" class="img-rounded img-responsive" />
+        </p>
+        <div class="form-group" show-errors>
+            <label for="code" class="sr-only">Token</label>
+            <input type="password" id="code" name="Token" class="form-control" ng-model="token"
+                   autocomplete="new-password" required api-field />
+        </div>
+        <div class="row">
+            <div class="col-xs-7">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="rememberMe" ng-model="rememberTwoFactor.checked" /> Remember Me
+                    </label>
+                </div>
+            </div>
+            <div class="col-xs-5">
+                <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="twoFactorForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon" ng-show="twoFactorForm.$loading"></i>Log In
+                </button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<div ng-if="twoFactorProvider === twoFactorProviderConstants.duo">
+    <p class="login-box-msg">
+        Complete logging in with Duo.
+    </p>
+    <form name="twoFactorForm" ng-submit="twoFactorForm.$valid && twoFactor(token)" api-form="twoFactorPromise"
+          autocomplete="off">
+        <div class="callout callout-danger validation-errors" ng-show="twoFactorForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in twoFactorForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div id="duoFrameWrapper">
+            <iframe id="duo_iframe"></iframe>
+        </div>
+        <div class="row">
+            <div class="col-xs-7">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="rememberMe" ng-model="rememberTwoFactor.checked" /> Remember Me
+                    </label>
+                </div>
+            </div>
+            <div class="col-xs-5">
+                <span ng-show="twoFactorForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon"></i> Logging in...
+                </span>
+            </div>
+        </div>
+    </form>
+</div>
+
+<div ng-if="twoFactorProvider === twoFactorProviderConstants.u2f">
+    <p class="login-box-msg">
+        Complete logging in with FIDO U2F.
+    </p>
+    <form name="twoFactorForm" api-form="twoFactorPromise" autocomplete="off">
+        <div class="callout callout-danger validation-errors" ng-show="twoFactorForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in twoFactorForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <p>Insert your Security Key into your computer's USB port. If it has a button, touch it.</p>
+        <p>
+            <img src="images/two-factor/u2fkey.jpg" alt="" class="img-rounded img-responsive" />
+        </p>
+        <div class="row">
+            <div class="col-xs-7">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" id="rememberMe" ng-model="rememberTwoFactor.checked" /> Remember Me
+                    </label>
+                </div>
+            </div>
+            <div class="col-xs-5">
+                <span ng-show="twoFactorForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon"></i> Logging in...
+                </span>
+            </div>
+        </div>
+    </form>
+</div>
+
+<div ng-if="twoFactorProvider === null">
+    <p>
+        This account has two-step login enabled, however, none of the configured two-step providers are supported by this
+        web browser.
+    </p>
+    Please use a supported web browser (such as Chrome) and/or add additional providers that are better supported
+    across web browsers (such as an authenticator app).
+</div>
+
+<hr />
+<ul>
+    <li>
+        <a stop-click href="#" ng-click="anotherMethod()">Use another two-step login method</a>
+    </li>
+    <li>
+        <a ui-sref="frontend.login.info({returnState: returnState})">Back to log in</a>
+    </li>
+</ul>

web-vault/app/accounts/views/accountsOrganizationAccept.html

@@ -0,0 +1,32 @@
+<div class="login-box">
+    <div class="login-logo">
+        <i class="fa fa-shield"></i> <b>bit</b>warden
+    </div>
+    <div class="login-box-body">
+        <div ng-show="loading">
+            Loading...
+        </div>
+        <div ng-show="accepting">
+            Accepting invitation...
+        </div>
+        <div ng-show="!loading && !accepting">
+            <p class="login-box-msg">Join {{state.params.organizationName}}</p>
+            <p class="text-center"><strong>{{state.params.email}}</strong></p>
+            <p>
+                You've been invited to join the organization listed above.
+                To accept the invitation, you need to log in or create a new bitwarden account.
+            </p>
+            <hr />
+            <div class="row">
+                <div class="col-sm-6">
+                    <a ui-sref="frontend.login.info({returnState: state, email: state.params.email})"
+                       class="btn btn-primary btn-block btn-flat">Log In</a>
+                </div>
+                <div class="col-sm-6">
+                    <a ui-sref="frontend.register({returnState: state, email: state.params.email})"
+                       class="btn btn-primary btn-block btn-flat">Create Account</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

web-vault/app/accounts/views/accountsPasswordHint.html

@@ -0,0 +1,39 @@
+<div class="login-box">
+    <div class="login-logo">
+        <i class="fa fa-shield"></i> <b>bit</b>warden
+    </div>
+    <div class="login-box-body">
+        <p class="login-box-msg">Get your master password hint.</p>
+        <div class="text-center" ng-show="success">
+            <div class="callout callout-success">
+                If your account exists ({{model.email}}) we've sent you an email with your master password hint.
+            </div>
+            <a ui-sref="frontend.login.info">Ready to log in?</a>
+        </div>
+        <form name="passwordHintForm" ng-submit="passwordHintForm.$valid && submit(model)" ng-show="!success"
+              api-form="submitPromise">
+            <div class="callout callout-danger validation-errors" ng-show="passwordHintForm.$errors">
+                <h4>Errors have occurred</h4>
+                <ul>
+                    <li ng-repeat="e in passwordHintForm.$errors">{{e}}</li>
+                </ul>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label for="email" class="sr-only">Your account email address</label>
+                <input type="email" id="email" name="Email" class="form-control" placeholder="Your account email address"
+                       ng-model="model.email" required api-field />
+                <span class="fa fa-envelope form-control-feedback"></span>
+            </div>
+            <div class="row">
+                <div class="col-xs-7">
+                    <a ui-sref="frontend.login.info">Ready to log in?</a>
+                </div>
+                <div class="col-xs-5">
+                    <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="passwordHintForm.$loading">
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="passwordHintForm.$loading"></i>Submit
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>

web-vault/app/accounts/views/accountsRecover.html

@@ -0,0 +1,56 @@
+<div class="login-box">
+    <div class="login-logo">
+        <i class="fa fa-shield"></i> <b>bit</b>warden
+    </div>
+    <div class="login-box-body">
+        <p class="login-box-msg">
+            In the event that you cannot access your account through your normal two-step login methods, you can use your
+            two-step login recovery code to disable all two-step providers on your account.
+            <a href="https://help.bitwarden.com/article/lost-two-step-device/" target="_blank">Learn more</a>
+        </p>
+        <div class="text-center" ng-show="success">
+            <div class="callout callout-success">
+                Two-step login has been successfully disabled on your account.
+            </div>
+            <a ui-sref="frontend.login.info">Ready to log in?</a>
+        </div>
+        <form name="recoverForm" ng-submit="recoverForm.$valid && submit(model)" ng-show="!success"
+              api-form="submitPromise">
+            <div class="callout callout-danger validation-errors" ng-show="recoverForm.$errors">
+                <h4>Errors have occurred</h4>
+                <ul>
+                    <li ng-repeat="e in recoverForm.$errors">{{e}}</li>
+                </ul>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label for="email" class="sr-only">Email</label>
+                <input type="email" id="email" name="Email" class="form-control" placeholder="Email" ng-model="model.email"
+                       required api-field />
+                <span class="fa fa-envelope form-control-feedback"></span>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label for="masterPassword" class="sr-only">Master Password</label>
+                <input type="password" id="masterPassword" name="MasterPasswordHash" class="form-control" placeholder="Master Password"
+                       ng-model="model.masterPassword"
+                       required api-field />
+                <span class="fa fa-lock form-control-feedback"></span>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label for="code" class="sr-only">Recovery code</label>
+                <input type="text" id="code" name="RecoveryCode" class="form-control" placeholder="Recovery code"
+                       ng-model="model.code" required api-field />
+                <span class="fa fa-key form-control-feedback"></span>
+            </div>
+            <div class="row">
+                <div class="col-xs-7">
+                    <a ui-sref="frontend.login.info">Ready to log in?</a>
+                </div>
+                <div class="col-xs-5">
+                    <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="recoverForm.$loading">
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="recoverForm.$loading"></i>Submit
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>

web-vault/app/accounts/views/accountsRecoverDelete.html

@@ -0,0 +1,39 @@
+<div class="login-box">
+    <div class="login-logo">
+        <i class="fa fa-shield"></i> <b>bit</b>warden
+    </div>
+    <div class="login-box-body">
+        <p class="login-box-msg">Enter your email address below to recover &amp; delete your bitwarden account.</p>
+        <div ng-show="success" class="text-center">
+            <div class="callout callout-success">
+                If your account exists ({{model.email}}) we've sent you an email with further instructions.
+            </div>
+            <a ui-sref="frontend.login.info">Return to log in</a>
+        </div>
+        <form name="form" ng-submit="form.$valid && submit(model)" ng-show="!success"
+              api-form="submitPromise">
+            <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+                <h4>Errors have occurred</h4>
+                <ul>
+                    <li ng-repeat="e in form.$errors">{{e}}</li>
+                </ul>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label for="email" class="sr-only">Your account email address</label>
+                <input type="email" id="email" name="Email" class="form-control" placeholder="Your account email address"
+                       ng-model="model.email" required api-field />
+                <span class="fa fa-envelope form-control-feedback"></span>
+            </div>
+            <div class="row">
+                <div class="col-xs-7">
+                    <a ui-sref="frontend.login.info">Return to log in</a>
+                </div>
+                <div class="col-xs-5">
+                    <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="form.$loading">
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>

web-vault/app/accounts/views/accountsRegister.html

@@ -0,0 +1,82 @@
+<div class="register-box">
+    <div class="register-logo">
+        <i class="fa fa-shield"></i> <b>bit</b>warden
+    </div>
+    <div class="register-box-body">
+        <p class="login-box-msg">Create a new account.</p>
+        <div class="text-center" ng-show="success">
+            <div class="callout callout-success">
+                <h4>Account Created!</h4>
+                <p>You may now log in to your new account.</p>
+            </div>
+            <a ui-sref="frontend.login.info({returnState: returnState, email: model.email})">Ready to log in?</a>
+        </div>
+        <form name="registerForm" ng-submit="registerForm.$valid && register(registerForm)" ng-show="!success"
+              api-form="registerPromise">
+            <div class="callout callout-default" ng-show="createOrg">
+                <h4>Create Organization, Step 1</h4>
+                <p>Before creating your organization, you first need to create a free personal account.</p>
+            </div>
+            <div class="callout callout-danger validation-errors" ng-show="registerForm.$errors">
+                <h4>Errors have occurred</h4>
+                <ul>
+                    <li ng-repeat="e in registerForm.$errors">{{e}}</li>
+                </ul>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label for="email" class="sr-only">Email</label>
+                <input type="email" id="email" name="Email" class="form-control" placeholder="Email" ng-model="model.email"
+                       ng-readonly="readOnlyEmail" required api-field />
+                <span class="fa fa-envelope form-control-feedback"></span>
+                <p class="help-block">You'll use your email address to log in.</p>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label for="name" class="sr-only">Your Name</label>
+                <input type="text" id="name" name="Name" class="form-control" ng-model="model.name"
+                       placeholder="Your Name" api-field>
+                <span class="fa fa-user form-control-feedback"></span>
+                <p class="help-block">What should we call you?</p>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label for="masterPassword" class="sr-only">Master Password</label>
+                <input type="password" id="masterPassword" name="MasterPasswordHash" class="form-control"
+                       ng-model="model.masterPassword" placeholder="Master Password" required api-field>
+                <span class="fa fa-lock form-control-feedback"></span>
+                <p class="help-block">The master password is the password you use to access your vault.</p>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label form="confirmMasterPassword" class="sr-only">Re-type Master Password</label>
+                <input type="password" id="confirmMasterPassword" name="ConfirmMasterPassword" class="form-control"
+                       placeholder="Re-type Master Password"
+                       ng-model="model.confirmMasterPassword" required api-field>
+                <span class="fa fa-lock form-control-feedback"></span>
+                <p class="help-block">
+                    It is very important that you do not forget your master password.
+                    There is <u>no way</u> to recover the password in the event that you forget it.
+                </p>
+            </div>
+            <div class="form-group has-feedback" show-errors>
+                <label for="hint" class="sr-only">Master Password Hint (optional)</label>
+                <input type="text" id="hint" name="MasterPasswordHint" class="form-control" ng-model="model.masterPasswordHint"
+                       placeholder="Master Password Hint (optional)" api-field>
+                <span class="fa fa-lightbulb-o form-control-feedback"></span>
+                <p class="help-block">A master password hint can help you remember your password if you forget it.</p>
+            </div>
+            <div class="row">
+                <div class="col-xs-7">
+                    <a ui-sref="frontend.login.info({returnState: returnState})">Already have an account?</a>
+                </div>
+                <div class="col-xs-5">
+                    <button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="registerForm.$loading">
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="registerForm.$loading"></i>Submit
+                    </button>
+                </div>
+            </div>
+            <hr />
+            By clicking the above "Submit" button, you are agreeing to the
+            <a href="https://bitwarden.com/terms/" target="_blank">Terms of Service</a>
+            and the
+            <a href="https://bitwarden.com/privacy/" target="_blank">Privacy Policy</a>.
+        </form>
+    </div>
+</div>

web-vault/app/accounts/views/accountsTwoFactorMethods.html

@@ -0,0 +1,25 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-key"></i> Two-step Providers</h4>
+</div>
+<div class="modal-body">
+    <div class="list-group" ng-repeat="provider in providers | orderBy: 'displayOrder'">
+        <a href="#" stop-click class="list-group-item" ng-click="choose(provider)">
+            <img alt="{{::provider.name}}" ng-src="{{'images/two-factor/' + provider.image}}" class="pull-right hidden-xs" />
+            <h4 class="list-group-item-heading">{{::provider.name}}</h4>
+            <p class="list-group-item-text">{{::provider.description}}</p>
+        </a>
+    </div>
+    <div class="list-group" style="margin-bottom: 0;">
+        <a href="https://help.bitwarden.com/article/lost-two-step-device/" target="_blank" class="list-group-item">
+            <h4 class="list-group-item-heading">Recovery Code</h4>
+            <p class="list-group-item-text">
+                Lost access to all of your two-factor providers? Use your recovery code to disable
+                all two-factor providers from your account.
+            </p>
+        </a>
+    </div>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+</div>

web-vault/app/accounts/views/accountsVerifyEmail.html

@@ -0,0 +1,8 @@
+<div class="login-box">
+    <div class="login-logo">
+        <i class="fa fa-shield"></i> <b>bit</b>warden
+    </div>
+    <div class="login-box-body">
+        Verifying email...
+    </div>
+</div>

web-vault/app/accounts/views/accountsVerifyRecoverDelete.html

@@ -0,0 +1,21 @@
+<div class="login-box">
+    <div class="login-logo">
+        <i class="fa fa-shield"></i> <b>bit</b>warden
+    </div>
+    <div class="login-box-body">
+        <div ng-if="deleting">
+            Deleting account...
+        </div>
+        <div ng-if="!deleting">
+            <div class="callout callout-warning">
+                <h4><i class="fa fa-warning fa-fw"></i> Warning</h4>
+                This will permanently delete your account. This cannot be undone.
+            </div>
+            <p>
+                You have requested to delete your bitwarden account (<b>{{email}}</b>).
+                Click the button below to confirm and proceed.
+            </p>
+            <button ng-click="delete()" class="btn btn-danger btn-block btn-flat">Delete Account</button>
+        </div>
+    </div>
+</div>

web-vault/app/organization/views/organizationBilling.html

@@ -0,0 +1,230 @@
+<section class="content-header">
+    <h1>
+        Billing
+        <small>manage your billing &amp; licensing</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="callout callout-warning" ng-if="subscription && subscription.cancelled">
+        <h4><i class="fa fa-warning"></i> Canceled</h4>
+        The subscription to this organization has been canceled.
+    </div>
+    <div class="callout callout-warning" ng-if="subscription && subscription.markedForCancel">
+        <h4><i class="fa fa-warning"></i> Pending Cancellation</h4>
+        <p>
+            The subscription to this organization has been marked for cancellation at the end of the
+            current billing period.
+        </p>
+        <button type="button" class="btn btn-default btn-flat" ng-click="reinstate()">
+            Reinstate Plan
+        </button>
+    </div>
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">Plan</h3>
+        </div>
+        <div class="box-body">
+            <div class="row">
+                <div class="col-sm-6">
+                    <dl ng-if="selfHosted">
+                        <dt>Name</dt>
+                        <dd>{{plan.name || '-'}}</dd>
+                        <dt>Expiration</dt>
+                        <dd ng-if="loading">
+                            Loading...
+                        </dd>
+                        <dd ng-if="!loading && expiration">
+                            {{expiration | date: 'medium'}}
+                        </dd>
+                        <dd ng-if="!loading && !expiration">
+                            Never expires
+                        </dd>
+                    </dl>
+                    <dl ng-if="!selfHosted">
+                        <dt>Name</dt>
+                        <dd>{{plan.name || '-'}}</dd>
+                        <dt>Total Seats</dt>
+                        <dd>{{plan.seats || '-'}}</dd>
+                    </dl>
+                </div>
+                <div class="col-sm-6" ng-if="!selfHosted">
+                    <dl>
+                        <dt>Status</dt>
+                        <dd>
+                            <span style="text-transform: capitalize;">{{(subscription && subscription.status) || '-'}}</span>
+                            <span ng-if="subscription.markedForCancel">- marked for cancellation</span>
+                        </dd>
+                        <dt>Next Charge</dt>
+                        <dd>{{nextInvoice ? ((nextInvoice.date | date: 'mediumDate') + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}</dd>
+                    </dl>
+                </div>
+            </div>
+            <div class="row" ng-if="!selfHosted && !noSubscription">
+                <div class="col-md-6">
+                    <strong>Details</strong>
+                    <div ng-show="loading">
+                        Loading...
+                    </div>
+                    <div class="table-responsive" style="margin: 0;" ng-show="!loading">
+                        <table class="table" style="margin: 0;">
+                            <tbody>
+                                <tr ng-repeat="item in subscription.items">
+                                    <td>
+                                        {{item.name}} {{item.qty > 1 ? '&times;' + item.qty : ''}}
+                                        @ {{item.amount | currency:'$'}} /{{item.interval}}
+                                    </td>
+                                    <td class="text-right">{{(item.qty * item.amount) | currency:'$'}} /{{item.interval}}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="box-footer" ng-if="!selfHosted">
+            <button type="button" class="btn btn-default btn-flat" ng-click="changePlan()">
+                Change Plan
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="cancel()"
+                    ng-if="!noSubscription && !subscription.cancelled && !subscription.markedForCancel">
+                Cancel Plan
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="reinstate()"
+                    ng-if="!noSubscription && subscription.markedForCancel">
+                Reinstate Plan
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="license()"
+                    ng-if="!subscription.cancelled">
+                Download License
+            </button>
+        </div>
+        <div class="box-footer" ng-if="selfHosted">
+            <button type="button" class="btn btn-default btn-flat" ng-click="updateLicense()">
+                Update License
+            </button>
+            <a href="https://vault.bitwarden.com" class="btn btn-default btn-flat" target="_blank">
+                Manage Billing
+            </a>
+        </div>
+    </div>
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">User Seats</h3>
+        </div>
+        <div class="box-body">
+            <div ng-show="loading">
+                Loading...
+            </div>
+            <div ng-show="!loading">
+                Your plan currently has a total of <b>{{plan.seats}}</b> seats.
+            </div>
+        </div>
+        <div class="box-footer" ng-if="!selfHosted && !noSubscription && canAdjustSeats">
+            <button type="button" class="btn btn-default btn-flat" ng-click="adjustSeats(true)">
+                Add Seats
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="adjustSeats(false)">
+                Remove Seats
+            </button>
+        </div>
+    </div>
+    <div class="box box-default" ng-if="storage && !selfHosted">
+        <div class="box-header with-border">
+            <h3 class="box-title">Storage</h3>
+        </div>
+        <div class="box-body">
+            <p>
+                Your plan has a total of {{storage.maxGb}} GB of encrypted file storage.
+                You are currently using {{storage.currentName}}.
+            </p>
+            <div class="progress" style="margin: 0;">
+                <div class="progress-bar progress-bar-info" role="progressbar"
+                     aria-valuenow="{{storage.percentage}}" aria-valuemin="0" aria-valuemax="1"
+                     style="min-width: 50px; width: {{storage.percentage}}%;">
+                    {{storage.percentage}}%
+                </div>
+            </div>
+        </div>
+        <div class="box-footer">
+            <button type="button" class="btn btn-default btn-flat" ng-click="adjustStorage(true)">
+                Add Storage
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="adjustStorage(false)">
+                Remove Storage
+            </button>
+        </div>
+    </div>
+    <div class="box box-default" ng-if="!selfHosted">
+        <div class="box-header with-border">
+            <h3 class="box-title">Payment Method</h3>
+        </div>
+        <div class="box-body">
+            <div ng-show="loading">
+                Loading...
+            </div>
+            <div ng-show="!loading && !paymentSource">
+                <i class="fa fa-credit-card"></i> No payment method on file.
+            </div>
+            <div ng-show="!loading && paymentSource">
+                <div class="callout callout-warning" ng-if="paymentSource.type === 1 && paymentSource.needsVerification">
+                    <h4><i class="fa fa-warning"></i> You must verify your bank account</h4>
+                    <p>
+                        We have made two micro-deposits to your bank account (it may take 1-2 business days to show up).
+                        Enter these amounts to verify the bank account. Failure to verify the bank account will result in a
+                        missed payment and your organization being disabled.
+                    </p>
+                    <button class="btn btn-default btn-flat" ng-click="verifyBank()">Verify Now</button>
+                </div>
+                <i class="fa" ng-class="{'fa-credit-card': paymentSource.type === 0,
+                   'fa-university': paymentSource.type === 1, 'fa-paypal fa-fw text-blue': paymentSource.type === 2}"></i>
+                {{paymentSource.description}}
+            </div>
+        </div>
+        <div class="box-footer">
+            <button type="button" class="btn btn-default btn-flat" ng-click="changePayment()">
+                {{ paymentSource ? 'Change Payment Method' : 'Add Payment Method' }}
+            </button>
+        </div>
+    </div>
+    <div class="box box-default" ng-if="!selfHosted">
+        <div class="box-header with-border">
+            <h3 class="box-title">Charges</h3>
+        </div>
+        <div class="box-body">
+            <div ng-show="loading">
+                Loading...
+            </div>
+            <div ng-show="!loading && !charges.length">
+                No charges.
+            </div>
+            <div class="table-responsive" ng-show="charges.length">
+                <table class="table">
+                    <tbody>
+                        <tr ng-repeat="charge in charges">
+                            <td style="width: 30px">
+                                <a href="#" stop-click ng-click="viewInvoice(charge)" title="Invoice">
+                                    <i class="fa fa-file-pdf-o"></i>
+                                </a>
+                            </td>
+                            <td style="width: 200px">
+                                {{charge.date | date: 'mediumDate'}}
+                            </td>
+                            <td style="min-width: 150px">
+                                {{charge.paymentSource}}
+                            </td>
+                            <td style="width: 150px; text-transform: capitalize;">
+                                {{charge.status}}
+                            </td>
+                            <td class="text-right" style="width: 150px;">
+                                {{charge.amount | currency:'$'}}
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="box-footer">
+            Note: Any charges will appear on your statement as <b>BITWARDEN</b>.
+        </div>
+    </div>
+</section>

web-vault/app/organization/views/organizationBillingAdjustSeats.html

@@ -0,0 +1,46 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-users"></i>
+        {{add ? 'Add Seats' : 'Remove Seats'}}
+    </h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-default" ng-show="add">
+            <h4><i class="fa fa-dollar"></i> Note About Charges</h4>
+            <p>
+                Adding seats to your plan will result in adjustments to your billing totals and immediately charge your
+                payment method on file. The first charge will be prorated for the remainder of the current billing cycle.
+            </p>
+        </div>
+        <div class="callout callout-default" ng-show="!add">
+            <h4><i class="fa fa-dollar"></i> Note About Charges</h4>
+            <p>
+                Removing seats will result in adjustments to your billing totals that will be prorated as credits
+                to your next billing charge.
+            </p>
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="row">
+            <div class="col-md-6">
+                <div class="form-group">
+                    <label for="seats">{{add ? 'Seats To Add' : 'Seats To Remove'}}</label>
+                    <input type="number" id="seats" name="SeatAdjustment" ng-model="seatAdjustment" class="form-control"
+                           required min="0" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationBillingChangePlan.html

@@ -0,0 +1,14 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-file-text-o"></i> Change Plan</h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        You can <a href="https://bitwarden.com/contact/" target="_blank">contact us</a>
+        if you would like to change your plan. Please ensure that you have an active payment
+        method on file.
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationBillingVerifyBank.html

@@ -0,0 +1,43 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-check-square-o"></i>
+        Verify Bank Account
+    </h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <p>
+            Enter the two micro-deposit amounts from your bank account. Both amounts will be less than $1.00 each.
+            For example, if we deposited $0.32 and $0.45 you would enter the values "32" and "45".
+        </p>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group">
+            <label for="amount1">Amount 1</label>
+            <div class="input-group">
+                <span class="input-group-addon">$ 0.</span>
+                <input type="number" id="amount1" name="Amount1" ng-model="amount1" class="form-control"
+                       required min="1" max="99" placeholder="xx" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="amount2">Amount 2</label>
+            <div class="input-group">
+                <span class="input-group-addon">$ 0.</span>
+                <input type="number" id="amount2" name="Amount2" ng-model="amount2" class="form-control"
+                       required min="1" max="99" placeholder="xx" />
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationCollections.html

@@ -0,0 +1,70 @@
+<section class="content-header">
+    <h1>
+        Collections
+        <small>control what you share</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            &nbsp;
+            <div class="box-filters hidden-xs">
+                <div class="form-group form-group-sm has-feedback has-feedback-left">
+                    <input type="text" id="filterSearch" class="form-control" placeholder="Search collections..."
+                           style="width: 200px;" ng-model="filterSearch">
+                    <span class="fa fa-search form-control-feedback text-muted" aria-hidden="true"></span>
+                </div>
+            </div>
+            <div class="box-tools">
+                <button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="add()">
+                    <i class="fa fa-fw fa-plus-circle"></i> New Collection
+                </button>
+            </div>
+        </div>
+        <div class="box-body" ng-class="{'no-padding': filteredCollections.length}">
+            <div ng-show="loading && !collections.length">
+                Loading...
+            </div>
+            <div ng-show="!filteredCollections.length && filterSearch">
+                No collections to list.
+            </div>
+            <div ng-show="!loading && !collections.length">
+                <p>There are no collections yet for your organization.</p>
+                <button type="button" ng-click="add()" class="btn btn-default btn-flat">Add a Collection</button>
+            </div>
+            <div class="table-responsive" ng-show="collections.length">
+                <table class="table table-striped table-hover table-vmiddle">
+                    <tbody>
+                        <tr ng-repeat="collection in filteredCollections = (collections | filter: (filterSearch || '') |
+                            orderBy: ['name']) track by collection.id">
+                            <td style="width: 70px;">
+                                <div class="btn-group" data-append-to="body">
+                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                        <i class="fa fa-cog"></i> <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        <li>
+                                            <a href="#" stop-click ng-click="users(collection)">
+                                                <i class="fa fa-fw fa-users"></i> Users
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="delete(collection)" class="text-red">
+                                                <i class="fa fa-fw fa-trash"></i> Delete
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </td>
+                            <td valign="middle">
+                                <a href="#" stop-click ng-click="edit(collection)">
+                                    {{collection.name}}
+                                </a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</section>

web-vault/app/organization/views/organizationCollectionsAdd.html

@@ -0,0 +1,83 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-cubes"></i> Add New Collection</h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit(model)" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-default">
+            <h4><i class="fa fa-info-circle"></i> Note</h4>
+            <p>
+                After creating the collection, you can associate a user to it by selecting a specific user on the "People" page.
+            </p>
+            <p>
+                You can associate new logins to the collection from your organization's "Vault" or by sharing an existing
+                login from "My vault".
+            </p>
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="email">Name</label>
+            <input type="text" id="name" name="Name" ng-model="model.name" class="form-control" required api-field />
+        </div>
+        <div ng-if="useGroups">
+            <h4>Group Access</h4>
+            <div ng-show="loading && !groups.length">
+                Loading groups...
+            </div>
+            <div ng-show="!loading && !groups.length">
+                <p>No groups for your organization.</p>
+            </div>
+            <div class="table-responsive" ng-show="groups.length" style="margin: 0;">
+                <table class="table table-striped table-hover" style="margin: 0;">
+                    <thead>
+                        <tr>
+                            <th style="width: 40px;">
+                                <input type="checkbox"
+                                       ng-checked="allSelected()"
+                                       ng-click="toggleGroupSelectionAll($event)">
+                            </th>
+                            <th>Name</th>
+                            <th style="width: 100px; text-align: center;">Read Only</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-repeat="group in groups | orderBy: ['name']">
+                            <td valign="middle">
+                                <input type="checkbox"
+                                       name="selectedGroups[]"
+                                       value="{{group.id}}"
+                                       ng-checked="groupSelected(group)"
+                                       ng-click="toggleGroupSelection(group.id)"
+                                       ng-disabled="group.accessAll">
+                            </td>
+                            <td valign="middle">
+                                {{group.name}}
+                                <i class="fa fa-unlock text-muted fa-fw" ng-show="group.accessAll"
+                                   title="This group can access all items"></i>
+                            </td>
+                            <td style="width: 100px; text-align: center;" valign="middle">
+                                <input type="checkbox"
+                                       name="selectedGroupsReadonly[]"
+                                       value="{{group.id}}"
+                                       ng-disabled="!groupSelected(group) || group.accessAll"
+                                       ng-checked="groupSelected(group) && selectedGroups[group.id].readOnly"
+                                       ng-click="toggleGroupReadOnlySelection(group)">
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationCollectionsEdit.html

@@ -0,0 +1,84 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-cubes"></i> Edit Collection</h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit(collection)" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-default">
+            <h4><i class="fa fa-info-circle"></i> Note</h4>
+            <p>
+                Select "Users" from the listing options to manage existing users for this collection. Associate new users by
+                editing the user's access on the "People" page.
+            </p>
+            <p>
+                You can associate new logins to the collection from your organization's "Vault" or by sharing an existing
+                login from "My vault".
+            </p>
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="email">Name</label>
+            <input type="text" id="name" name="Name" ng-model="collection.name" class="form-control" required api-field />
+        </div>
+        <div ng-if="useGroups">
+            <h4>Group Access</h4>
+            <div ng-show="loading && !groups.length">
+                Loading groups...
+            </div>
+            <div ng-show="!loading && !groups.length">
+                <p>No groups for your organization.</p>
+            </div>
+            <div class="table-responsive" ng-show="groups.length" style="margin: 0;">
+                <table class="table table-striped table-hover" style="margin: 0;">
+                    <thead>
+                        <tr>
+                            <th style="width: 40px;">
+                                <input type="checkbox"
+                                       ng-checked="allSelected()"
+                                       ng-click="toggleGroupSelectionAll($event)">
+                            </th>
+                            <th>Name</th>
+                            <th style="width: 100px; text-align: center;">Read Only</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-repeat="group in groups | orderBy: ['name']">
+                            <td valign="middle">
+                                <input type="checkbox"
+                                       name="selectedGroups[]"
+                                       value="{{group.id}}"
+                                       ng-checked="groupSelected(group)"
+                                       ng-click="toggleGroupSelection(group.id)"
+                                       ng-disabled="group.accessAll">
+                            </td>
+                            <td valign="middle">
+                                {{group.name}}
+                                <i class="fa fa-unlock text-muted fa-fw" ng-show="group.accessAll"
+                                   title="This group can access all items"></i>
+                            </td>
+                            <td style="width: 100px; text-align: center;" valign="middle">
+                                <input type="checkbox"
+                                       name="selectedGroupsReadonly[]"
+                                       value="{{group.id}}"
+                                       ng-disabled="!groupSelected(group) || group.accessAll"
+                                       ng-checked="groupSelected(group) && selectedGroups[group.id].readOnly"
+                                       ng-click="toggleGroupReadOnlySelection(group)">
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationCollectionsUsers.html

@@ -0,0 +1,64 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-users"></i> User Access <small>{{collection.name}}</small></h4>
+</div>
+<div class="modal-body">
+    <div ng-show="loading && !users.length">
+        Loading...
+    </div>
+    <div ng-show="!loading && !users.length">
+        <p>
+            No users for this collection. You can associate a new user to this collection by
+            selecting a specific user on the "People" page.
+        </p>
+    </div>
+    <div class="table-responsive" ng-show="users.length" style="margin: 0;">
+        <table class="table table-striped table-hover table-vmiddle" style="margin: 0;">
+            <tbody>
+                <tr ng-repeat="user in users | orderBy: ['email']">
+                    <td style="width: 70px;">
+                        <div class="btn-group" data-append-to=".modal">
+                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                <i class="fa fa-cog"></i> <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu">
+                                <li ng-show="!user.accessAll">
+                                    <a href="#" stop-click ng-click="remove(user)" class="text-red">
+                                        <i class="fa fa-fw fa-remove"></i> Remove
+                                    </a>
+                                </li>
+                                <li ng-show="user.accessAll">
+                                    <a href="#" stop-click>
+                                        No options...
+                                    </a>
+                                </li>
+                            </ul>
+                        </div>
+                    </td>
+                    <td style="width: 45px;">
+                        <letter-avatar data="{{user.name || user.email}}"></letter-avatar>
+                    </td>
+                    <td>
+                        {{user.email}}
+                        <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
+                    </td>
+                    <td style="width: 60px;" class="text-right">
+                        <i class="fa fa-unlock" ng-show="user.accessAll" title="Can Access All Items"></i>
+                        <i class="fa fa-pencil-square-o" ng-show="!user.readOnly" title="Can Edit"></i>
+                    </td>
+                    <td style="width: 100px;">
+                        {{user.type | enumName: 'OrgUserType'}}
+                    </td>
+                    <td style="width: 120px;">
+                        <span class="label {{user.status | enumLabelClass: 'OrgUserStatus'}}">
+                            {{user.status | enumName: 'OrgUserStatus'}}
+                        </span>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+</div>

web-vault/app/organization/views/organizationDashboard.html

@@ -0,0 +1,34 @@
+<section class="content-header">
+    <h1>
+        Dashboard
+        <small>{{orgProfile.name}}</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="callout callout-warning" ng-if="!orgProfile.enabled">
+        <h4><i class="fa fa-warning"></i> Organization Disabled</h4>
+        <p>This organization is currently disabled. Users will not see your shared logins or collections.</p>
+        <p ng-if="!selfHosted">Contact us if you would like to reinstate this organization.</p>
+        <p ng-if="selfHosted">Update your license to reinstate this organization.</p>
+        <a ng-if="selfHosted" class="btn btn-default btn-flat" href="#" stop-click ng-click="goBilling()">
+            Billing &amp; Licensing
+        </a>
+        <a class="btn btn-default btn-flat" href="https://bitwarden.com/contact/" target="_blank">
+            Contact Us
+        </a>
+    </div>
+    <div class="box">
+        <div class="box-header with-border">
+            <h3 class="box-title">Let's Get Started!</h3>
+        </div>
+        <div class="box-body">
+            <p>Dashboard features are coming soon. Get started by inviting users and creating your collections.</p>
+            <a class="btn btn-default btn-flat" ui-sref="backend.org.people({orgId: orgProfile.id})">
+                Invite Users
+            </a>
+            <a class="btn btn-default btn-flat" ui-sref="backend.org.collections({orgId: orgProfile.id})">
+                Manage Collections
+            </a>
+        </div>
+    </div>
+</section>

web-vault/app/organization/views/organizationDelete.html

@@ -0,0 +1,34 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-trash"></i> Delete Organization</h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise">
+    <div class="modal-body">
+        <p>
+            Continue below to delete this organization and all associated data. This data includes any collections and
+            their associated logins. Individual user accounts will remain, though they will not be associated to this
+            organization anymore.
+        </p>
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning</h4>
+            Deleting this organization is permanent. It cannot be undone.
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="masterPassword" class="form-control"
+                   required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Delete
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationEvents.html

@@ -0,0 +1,67 @@
+<section class="content-header">
+    <h1>
+        Events
+        <small>audit your organization</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            &nbsp;
+            <div class="box-filters hidden-xs hidden-sm">
+                <input type="datetime-local" ng-model="filterStart" required
+                       class="form-control input-sm" style="width:initial;" />
+                -
+                <input type="datetime-local" ng-model="filterEnd" required
+                       class="form-control input-sm" style="width:initial;" />
+            </div>
+            <div class="box-tools">
+                <button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="refresh()">
+                    <i class="fa fa-fw fa-refresh" ng-class="{'fa-spin': loading}"></i> Refresh
+                </button>
+            </div>
+        </div>
+        <div class="box-body" ng-class="{'no-padding': filteredEvents.length}">
+            <div ng-show="loading && !events.length">
+                Loading...
+            </div>
+            <div ng-show="!loading && !events.length">
+                <p>There are no events to list.</p>
+            </div>
+            <div class="table-responsive" ng-show="events.length">
+                <table class="table table-striped table-hover">
+                    <thead>
+                        <tr>
+                            <th>Timestamp</th>
+                            <th><span class="sr-only">App</span></th>
+                            <th>User</th>
+                            <th>Event</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-repeat="event in filteredEvents = (events)">
+                            <td style="width: 210px; min-width: 100px;">
+                                {{event.date | date:'medium'}}
+                            </td>
+                            <td style="width: 20px;" class="text-center">
+                                <i class="text-muted fa fa-lg {{event.appIcon}}" title="{{event.appName}}, {{event.ip}}"></i>
+                            </td>
+                            <td style="width: 150px; min-width: 100px;">
+                                {{event.userName}}
+                            </td>
+                            <td>
+                                <div ng-bind-html="event.message"></div>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="box-footer text-center" ng-show="continuationToken">
+            <button class="btn btn-link btn-block" ng-click="next()" ng-if="!loading">
+                Load more...
+            </button>
+            <i class="fa fa-fw fa-refresh fa-spin text-muted" ng-if="loading"></i>
+        </div>
+    </div>
+</section>

web-vault/app/organization/views/organizationGroups.html

@@ -0,0 +1,70 @@
+<section class="content-header">
+    <h1>
+        Groups
+        <small>organize your users</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            &nbsp;
+            <div class="box-filters hidden-xs">
+                <div class="form-group form-group-sm has-feedback has-feedback-left">
+                    <input type="text" id="filterSearch" class="form-control" placeholder="Search groups..."
+                           style="width: 200px;" ng-model="filterSearch">
+                    <span class="fa fa-search form-control-feedback text-muted" aria-hidden="true"></span>
+                </div>
+            </div>
+            <div class="box-tools">
+                <button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="add()">
+                    <i class="fa fa-fw fa-plus-circle"></i> New Group
+                </button>
+            </div>
+        </div>
+        <div class="box-body" ng-class="{'no-padding': filteredGroups.length}">
+            <div ng-show="loading && !groups.length">
+                Loading...
+            </div>
+            <div ng-show="!filteredGroups.length && filterSearch">
+                No groups to list.
+            </div>
+            <div ng-show="!loading && !groups.length">
+                <p>There are no groups yet for your organization.</p>
+                <button type="button" ng-click="add()" class="btn btn-default btn-flat">Add a Group</button>
+            </div>
+            <div class="table-responsive" ng-show="groups.length">
+                <table class="table table-striped table-hover table-vmiddle">
+                    <tbody>
+                        <tr ng-repeat="group in filteredGroups = (groups | filter: (filterSearch || '') |
+                            orderBy: ['name']) track by group.id">
+                            <td style="width: 70px;">
+                                <div class="btn-group" data-append-to="body">
+                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                        <i class="fa fa-cog"></i> <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        <li>
+                                            <a href="#" stop-click ng-click="users(group)">
+                                                <i class="fa fa-fw fa-users"></i> Users
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="delete(group)" class="text-red">
+                                                <i class="fa fa-fw fa-trash"></i> Delete
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </td>
+                            <td valign="middle">
+                                <a href="#" stop-click ng-click="edit(group)">
+                                    {{group.name}}
+                                </a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</section>

web-vault/app/organization/views/organizationGroupsAdd.html

@@ -0,0 +1,95 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-sitemap"></i> Add New Group</h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit(model)" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-default">
+            <h4><i class="fa fa-info-circle"></i> Note</h4>
+            <p>
+                After creating the group, you can associate a user to it by selecting the "Groups" option for a specific user
+                on the "People" page.
+            </p>
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="name">Name</label>
+            <input type="text" id="name" name="Name" ng-model="model.name" class="form-control" required api-field />
+        </div>
+        <div class="form-group" show-errors>
+            <label for="externalId">External Id</label>
+            <input type="text" id="externalId" name="ExternalId" ng-model="model.externalId" class="form-control" api-field />
+        </div>
+        <h4>Access</h4>
+        <div class="radio">
+            <label>
+                <input type="radio" ng-model="model.accessAll" name="AccessAll"
+                       ng-value="true" ng-checked="model.accessAll">
+                This group can access and modify <u>all items</u>.
+            </label>
+        </div>
+        <div class="radio">
+            <label>
+                <input type="radio" ng-model="model.accessAll" name="AccessAll"
+                       ng-value="false" ng-checked="!model.accessAll">
+                This group can access only the selected collections.
+            </label>
+        </div>
+        <div ng-show="!model.accessAll">
+            <div ng-show="loading && !collections.length">
+                Loading collections...
+            </div>
+            <div ng-show="!loading && !collections.length">
+                <p>No collections for your organization.</p>
+            </div>
+            <div class="table-responsive" ng-show="collections.length" style="margin: 0;">
+                <table class="table table-striped table-hover" style="margin: 0;">
+                    <thead>
+                        <tr>
+                            <th style="width: 40px;">
+                                <input type="checkbox"
+                                       ng-checked="allSelected()"
+                                       ng-click="toggleCollectionSelectionAll($event)">
+                            </th>
+                            <th>Name</th>
+                            <th style="width: 100px; text-align: center;">Read Only</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-repeat="collection in collections | orderBy: ['name']">
+                            <td valign="middle">
+                                <input type="checkbox"
+                                       name="selectedCollections[]"
+                                       value="{{collection.id}}"
+                                       ng-checked="collectionSelected(collection)"
+                                       ng-click="toggleCollectionSelection(collection.id)">
+                            </td>
+                            <td valign="middle">
+                                {{collection.name}}
+                            </td>
+                            <td style="width: 100px; text-align: center;" valign="middle">
+                                <input type="checkbox"
+                                       name="selectedCollectionsReadonly[]"
+                                       value="{{collection.id}}"
+                                       ng-disabled="!collectionSelected(collection)"
+                                       ng-checked="collectionSelected(collection) && selectedCollections[collection.id].readOnly"
+                                       ng-click="toggleCollectionReadOnlySelection(collection.id)">
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationGroupsEdit.html

@@ -0,0 +1,95 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-sitemap"></i> Edit Group</h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-default">
+            <h4><i class="fa fa-info-circle"></i> Note</h4>
+            <p>
+                Select "Users" from the listing options to manage existing users for this group. Associate new users by
+                selecting "Groups" the "People" page for a specific user.
+            </p>
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="name">Name</label>
+            <input type="text" id="name" name="Name" ng-model="group.name" class="form-control" required api-field />
+        </div>
+        <div class="form-group" show-errors>
+            <label for="externalId">External Id</label>
+            <input type="text" id="externalId" name="ExternalId" ng-model="group.externalId" class="form-control" api-field />
+        </div>
+        <h4>Access</h4>
+        <div class="radio">
+            <label>
+                <input type="radio" ng-model="group.accessAll" name="AccessAll"
+                       ng-value="true" ng-checked="group.accessAll">
+                This group can access and modify <u>all items</u>.
+            </label>
+        </div>
+        <div class="radio">
+            <label>
+                <input type="radio" ng-model="group.accessAll" name="AccessAll"
+                       ng-value="false" ng-checked="!group.accessAll">
+                This group can access only the selected collections.
+            </label>
+        </div>
+        <div ng-show="!group.accessAll">
+            <div ng-show="loading && !collections.length">
+                Loading collections...
+            </div>
+            <div ng-show="!loading && !collections.length">
+                <p>No collections for your organization.</p>
+            </div>
+            <div class="table-responsive" ng-show="collections.length" style="margin: 0;">
+                <table class="table table-striped table-hover" style="margin: 0;">
+                    <thead>
+                        <tr>
+                            <th style="width: 40px;">
+                                <input type="checkbox"
+                                       ng-checked="allSelected()"
+                                       ng-click="toggleCollectionSelectionAll($event)">
+                            </th>
+                            <th>Name</th>
+                            <th style="width: 100px; text-align: center;">Read Only</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-repeat="collection in collections | orderBy: ['name']">
+                            <td valign="middle">
+                                <input type="checkbox"
+                                       name="selectedCollections[]"
+                                       value="{{collection.id}}"
+                                       ng-checked="collectionSelected(collection)"
+                                       ng-click="toggleCollectionSelection(collection.id)">
+                            </td>
+                            <td valign="middle">
+                                {{collection.name}}
+                            </td>
+                            <td style="width: 100px; text-align: center;" valign="middle">
+                                <input type="checkbox"
+                                       name="selectedCollectionsReadonly[]"
+                                       value="{{collection.id}}"
+                                       ng-disabled="!collectionSelected(collection)"
+                                       ng-checked="collectionSelected(collection) && selectedCollections[collection.id].readOnly"
+                                       ng-click="toggleCollectionReadOnlySelection(collection.id)">
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationGroupsUsers.html

@@ -0,0 +1,55 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-users"></i> User Access <small>{{group.name}}</small></h4>
+</div>
+<div class="modal-body">
+    <div ng-show="loading && !users.length">
+        Loading...
+    </div>
+    <div ng-show="!loading && !users.length">
+        <p>
+            No users for this group. You can associate a new user to this group by
+            selecting a specific user's "Groups" on the "People" page.
+        </p>
+    </div>
+    <div class="table-responsive" ng-show="users.length" style="margin: 0;">
+        <table class="table table-striped table-hover table-vmiddle" style="margin: 0;">
+            <tbody>
+                <tr ng-repeat="user in users | orderBy: ['email']">
+                    <td style="width: 70px;">
+                        <div class="btn-group" data-append-to=".modal">
+                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                <i class="fa fa-cog"></i> <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu">
+                                <li ng-show="user.organizationUserId">
+                                    <a href="#" stop-click ng-click="remove(user)" class="text-red">
+                                        <i class="fa fa-fw fa-remove"></i> Remove
+                                    </a>
+                                </li>
+                            </ul>
+                        </div>
+                    </td>
+                    <td style="width: 45px;">
+                        <letter-avatar data="{{user.name || user.email}}"></letter-avatar>
+                    </td>
+                    <td>
+                        {{user.email}}
+                        <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
+                    </td>
+                    <td style="width: 100px;">
+                        {{user.type | enumName: 'OrgUserType'}}
+                    </td>
+                    <td style="width: 120px;">
+                        <span class="label {{user.status | enumLabelClass: 'OrgUserStatus'}}">
+                            {{user.status | enumName: 'OrgUserStatus'}}
+                        </span>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+</div>

web-vault/app/organization/views/organizationPeople.html

@@ -0,0 +1,96 @@
+<section class="content-header">
+    <h1>
+        People
+        <small>users for your organization</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="box">
+        <div class="box-header with-border">
+            &nbsp;
+            <div class="box-filters hidden-xs">
+                <div class="form-group form-group-sm has-feedback has-feedback-left">
+                    <input type="text" id="filterSearch" class="form-control" placeholder="Search people..."
+                           style="width: 200px;" ng-model="filterSearch">
+                    <span class="fa fa-search form-control-feedback text-muted" aria-hidden="true"></span>
+                </div>
+            </div>
+            <div class="box-tools">
+                <button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="invite()">
+                    <i class="fa fa-fw fa-plus-circle"></i> Invite User
+                </button>
+            </div>
+        </div>
+        <div class="box-body" ng-class="{'no-padding': filteredUsers.length}">
+            <div ng-show="!filteredUsers.length && !filterSearch">
+                Loading...
+            </div>
+            <div class="table-responsive" ng-show="filteredUsers.length">
+                <table class="table table-striped table-hover table-vmiddle">
+                    <tbody>
+                        <tr ng-repeat="user in filteredUsers = (users | filter: (filterSearch || '') |
+                            orderBy: ['type', 'name', 'email']) track by user.id">
+                            <td style="width: 70px;">
+                                <div class="btn-group" data-append-to="body">
+                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                        <i class="fa fa-cog"></i> <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        <li>
+                                            <a href="#" stop-click ng-click="edit(user)">
+                                                <i class="fa fa-fw fa-pencil"></i> Edit
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="groups(user)" ng-if="useGroups">
+                                                <i class="fa fa-fw fa-sitemap"></i> Groups
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="events(user)"
+                                               ng-if="useEvents && user.status === 2">
+                                                <i class="fa fa-fw fa-file-text-o"></i> Event Logs
+                                            </a>
+                                        </li>
+                                        <li ng-show="user.status === 1">
+                                            <a href="#" stop-click ng-click="confirm(user)">
+                                                <i class="fa fa-fw fa-check"></i> Confirm
+                                            </a>
+                                        </li>
+                                        <li ng-show="user.status === 0">
+                                            <a href="#" stop-click ng-click="reinvite(user)">
+                                                <i class="fa fa-fw fa-envelope-o"></i> Re-send Invitation
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="delete(user)" class="text-red">
+                                                <i class="fa fa-fw fa-remove"></i> Remove
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </td>
+                            <td style="width: 45px;">
+                                <letter-avatar data="{{user.name || user.email}}"></letter-avatar>
+                            </td>
+                            <td>
+                                <a href="#" stop-click ng-click="edit(user)">{{user.email}}</a>
+                                <i class="fa fa-unlock text-muted" ng-show="user.accessAll"
+                                   title="Can Access All Items"></i>
+                                <div ng-if="user.name"><small class="text-muted">{{user.name}}</small></div>
+                            </td>
+                            <td style="width: 100px;">
+                                {{user.type | enumName: 'OrgUserType'}}
+                            </td>
+                            <td style="width: 120px;">
+                                <span class="label {{user.status | enumLabelClass: 'OrgUserStatus'}}">
+                                    {{user.status | enumName: 'OrgUserStatus'}}
+                                </span>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</section>

web-vault/app/organization/views/organizationPeopleEdit.html

@@ -0,0 +1,101 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-user"></i> Edit User <small>{{email}}</small></h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <h4>User Type</h4>
+        <div class="form-group">
+            <div class="radio">
+                <label>
+                    <input type="radio" id="user-type" ng-model="type" name="Type" value="2" ng-checked="type === 2">
+                    <strong>User</strong> - A regular user with access to your organization's collections.
+                </label>
+            </div>
+            <div class="radio">
+                <label>
+                    <input type="radio" ng-model="type" name="Type" value="1" ng-checked="type === 1">
+                    <strong>Admin</strong> - Admins can manage collections and users for your organization.
+                </label>
+            </div>
+            <div class="radio">
+                <label>
+                    <input type="radio" ng-model="type" name="Type" value="0" ng-checked="type === 0">
+                    <strong>Owner</strong> - The highest access user that can manage all aspects of your organization.
+                </label>
+            </div>
+        </div>
+        <h4>Access</h4>
+        <div class="radio">
+            <label>
+                <input type="radio" ng-model="accessAll" name="AccessAll"
+                       ng-value="true" ng-checked="accessAll">
+                This user can access and modify <u>all items</u>.
+            </label>
+        </div>
+        <div class="radio">
+            <label>
+                <input type="radio" ng-model="accessAll" name="AccessAll"
+                       ng-value="false" ng-checked="!accessAll">
+                This user can access only the selected collections.
+            </label>
+        </div>
+        <div ng-show="!accessAll">
+            <div ng-show="loading && !collections.length">
+                Loading collections...
+            </div>
+            <div ng-show="!loading && !collections.length">
+                <p>No collections for your organization.</p>
+            </div>
+            <div class="table-responsive" ng-show="collections.length" style="margin: 0;">
+                <table class="table table-striped table-hover" style="margin: 0;">
+                    <thead>
+                        <tr>
+                            <th style="width: 40px;">
+                                <input type="checkbox"
+                                       ng-checked="allSelected()"
+                                       ng-click="toggleCollectionSelectionAll($event)">
+                            </th>
+                            <th>Name</th>
+                            <th style="width: 100px; text-align: center;">Read Only</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-repeat="collection in collections | orderBy: ['name']">
+                            <td valign="middle">
+                                <input type="checkbox"
+                                       name="selectedCollections[]"
+                                       value="{{collection.id}}"
+                                       ng-checked="collectionSelected(collection)"
+                                       ng-click="toggleCollectionSelection(collection.id)">
+                            </td>
+                            <td valign="middle">
+                                {{collection.name}}
+                            </td>
+                            <td style="text-align: center;" valign="middle">
+                                <input type="checkbox"
+                                       name="selectedCollectionsReadonly[]"
+                                       value="{{collection.id}}"
+                                       ng-disabled="!collectionSelected(collection)"
+                                       ng-checked="collectionSelected(collection) && selectedCollections[collection.id].readOnly"
+                                       ng-click="toggleCollectionReadOnlySelection(collection.id)">
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationPeopleEvents.html

@@ -0,0 +1,56 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-file-text-o"></i> User Event Logs <small>{{email}}</small></h4>
+</div>
+<div class="modal-body">
+    <div class="hidden-xs">
+        <input type="datetime-local" ng-model="filterStart" required
+               class="form-control input-sm" style="width:initial; display: inline;" />
+        -
+        <input type="datetime-local" ng-model="filterEnd" required
+               class="form-control input-sm" style="width:initial; display: inline;" />
+        <button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="refresh()">
+            <i class="fa fa-fw fa-refresh" ng-class="{'fa-spin': loading}"></i> Refresh
+        </button>
+        <hr />
+    </div>
+    <div ng-show="loading && !events.length">
+        Loading...
+    </div>
+    <div ng-show="!loading && !events.length">
+        <p>There are no events to list.</p>
+    </div>
+    <div class="table-responsive" ng-show="events.length" style="margin: 0;">
+        <table class="table table-striped table-hover" style="{{ !continuationToken ? 'margin: 0;' : '' }}">
+            <thead>
+                <tr>
+                    <th>Timestamp</th>
+                    <th><span class="sr-only">App</span></th>
+                    <th>Event</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr ng-repeat="event in filteredEvents = (events)">
+                    <td style="width: 210px; min-width: 100px;">
+                        {{event.date | date:'medium'}}
+                    </td>
+                    <td style="width: 20px;" class="text-center">
+                        <i class="text-muted fa fa-lg {{event.appIcon}}" title="{{event.appName}}, {{event.ip}}"></i>
+                    </td>
+                    <td>
+                        <div ng-bind-html="event.message"></div>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="text-center" ng-show="continuationToken">
+        <button class="btn btn-link btn-block" ng-click="next()" ng-if="!loading">
+            Load more...
+        </button>
+        <i class="fa fa-fw fa-refresh fa-spin text-muted" ng-if="loading"></i>
+    </div>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+</div>

web-vault/app/organization/views/organizationPeopleGroups.html

@@ -0,0 +1,55 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-sitemap"></i> Edit User Groups <small>{{orgUser.email}}</small></h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div ng-show="loading && !groups.length">
+            Loading...
+        </div>
+        <div ng-show="!loading && !groups.length">
+            <p>No groups for your organization.</p>
+        </div>
+        <p ng-show="groups.length">Edit the groups that this user belongs to.</p>
+        <div class="table-responsive" ng-show="groups.length" style="margin: 0;">
+            <table class="table table-striped table-hover" style="margin: 0;">
+                <thead>
+                    <tr>
+                        <th style="width: 40px;">
+                            <input type="checkbox"
+                                   ng-checked="allSelected()"
+                                   ng-click="toggleGroupSelectionAll($event)">
+                        </th>
+                        <th>Name</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr ng-repeat="group in groups | orderBy: ['name']">
+                        <td valign="middle">
+                            <input type="checkbox"
+                                   name="selectedGroups[]"
+                                   value="{{group.id}}"
+                                   ng-checked="groupSelected(group)"
+                                   ng-click="toggleGroupSelection(group.id)">
+                        </td>
+                        <td valign="middle">
+                            {{group.name}}
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationPeopleInvite.html

@@ -0,0 +1,110 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-user"></i> Invite User</h4>
+</div>
+<form name="inviteForm" ng-submit="inviteForm.$valid && submit(model)" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <p>
+            Invite a new user to your organization by entering their bitwarden account email address below. If they do not have
+            a bitwarden account already, they will be prompted to create a new account.
+        </p>
+        <div class="callout callout-danger validation-errors" ng-show="inviteForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in inviteForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="emails">Email</label>
+            <input type="text" id="emails" name="Emails" ng-model="model.emails" class="form-control" required api-field />
+            <p class="help-block">You can invite up to 20 users at a time by comma separating a list of email addresses.</p>
+        </div>
+        <h4>User Type</h4>
+        <div class="form-group">
+            <div class="radio">
+                <label>
+                    <input type="radio" id="user-type" ng-model="model.type" name="Type" value="User">
+                    <strong>User</strong> - A regular user with access to your organization's collections.
+                </label>
+            </div>
+            <div class="radio">
+                <label>
+                    <input type="radio" ng-model="model.type" name="Type" value="Admin">
+                    <strong>Admin</strong> - Admins can manage collections and users for your organization.
+                </label>
+            </div>
+            <div class="radio">
+                <label>
+                    <input type="radio" ng-model="model.type" name="Type" value="Owner">
+                    <strong>Owner</strong> - The highest access user that can manage all aspects of your organization.
+                </label>
+            </div>
+        </div>
+        <h4>Access</h4>
+        <div class="radio">
+            <label>
+                <input type="radio" ng-model="model.accessAll" name="AccessAll"
+                       ng-value="true" ng-checked="model.accessAll">
+                This user can access and modify <u>all items</u>.
+            </label>
+        </div>
+        <div class="radio">
+            <label>
+                <input type="radio" ng-model="model.accessAll" name="AccessAll"
+                       ng-value="false" ng-checked="!model.accessAll">
+                This user can access only the selected collections.
+            </label>
+        </div>
+        <div ng-show="!model.accessAll">
+            <div ng-show="loading && !collections.length">
+                Loading collections...
+            </div>
+            <div ng-show="!loading && !collections.length">
+                <p>No collections for your organization.</p>
+            </div>
+            <div class="table-responsive" ng-show="collections.length" style="margin: 0;">
+                <table class="table table-striped table-hover" style="margin: 0;">
+                    <thead>
+                        <tr>
+                            <th style="width: 40px;">
+                                <input type="checkbox"
+                                       ng-checked="allSelected()"
+                                       ng-click="toggleCollectionSelectionAll($event)">
+                            </th>
+                            <th>Name</th>
+                            <th style="width: 100px; text-align: center;">Read Only</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr ng-repeat="collection in collections | orderBy: ['name'] track by collection.id">
+                            <td style="width: 40px;" valign="middle">
+                                <input type="checkbox"
+                                       name="selectedCollections[]"
+                                       value="{{collection.id}}"
+                                       ng-checked="collectionSelected(collection)"
+                                       ng-click="toggleCollectionSelection(collection.id)">
+                            </td>
+                            <td valign="middle">
+                                {{collection.name}}
+                            </td>
+                            <td style="width: 100px; text-align: center;" valign="middle">
+                                <input type="checkbox"
+                                       name="selectedCollectionsReadonly[]"
+                                       value="{{collection.id}}"
+                                       ng-disabled="!collectionSelected(collection)"
+                                       ng-checked="collectionSelected(collection) && selectedCollections[collection.id].readOnly"
+                                       ng-click="toggleCollectionReadOnlySelection(collection.id)">
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="inviteForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="inviteForm.$loading"></i>Send Invite
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationSettings.html

@@ -0,0 +1,94 @@
+<section class="content-header">
+    <h1>
+        Settings
+        <small>manage your organization</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">General</h3>
+        </div>
+        <form role="form" name="generalForm" ng-submit="generalForm.$valid && generalSave()" api-form="generalPromise"
+              autocomplete="off">
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-sm-9">
+                        <div class="callout callout-danger validation-errors" ng-show="generalForm.$errors">
+                            <h4>Errors have occurred</h4>
+                            <ul>
+                                <li ng-repeat="e in generalForm.$errors">{{e}}</li>
+                            </ul>
+                        </div>
+                        <div class="form-group" show-errors>
+                            <label for="name">Organization Name</label>
+                            <input type="text" id="name" name="Name" ng-model="model.name" class="form-control"
+                                   required api-field ng-readonly="selfHosted" />
+                        </div>
+                        <div class="form-group" show-errors>
+                            <label for="name">Billing Email</label>
+                            <input type="email" id="billingEmail" name="BillingEmail" ng-model="model.billingEmail"
+                                   class="form-control" required api-field ng-readonly="selfHosted" />
+                        </div>
+                        <div class="form-group" show-errors>
+                            <label for="name">Business Name</label>
+                            <input type="text" id="businessName" name="BusinessName" ng-model="model.businessName"
+                                   class="form-control" api-field ng-readonly="selfHosted" />
+                        </div>
+                        <div ng-if="!selfHosted">
+                            <hr />
+                            <strong>Tax Information</strong>
+                            <div>{{model.businessAddress1}}</div>
+                            <div>{{model.businessAddress2}}</div>
+                            <div>{{model.businessAddress3}}</div>
+                            <div>{{model.businessCountry}}</div>
+                            <div>{{model.businessTaxNumber}}</div>
+                            <p class="help-block">
+                                Please <a href="https://bitwarden.com/contact/" target="_blank">contact support</a>
+                                to provide (or update) tax information for your invoices.
+                            </p>
+                        </div>
+                    </div>
+                    <div class="col-sm-3 settings-photo">
+                        <letter-avatar data="{{model.name}}" round="false"
+                                       avclass="img-responsive img-rounded" avwidth="200" avheight="200"
+                                       fontsize="90"></letter-avatar>
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer" ng-if="!selfHosted">
+                <button type="submit" class="btn btn-primary btn-flat" ng-disabled="generalForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon" ng-show="generalForm.$loading"></i>Save
+                </button>
+            </div>
+        </form>
+    </div>
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">Import/Export</h3>
+        </div>
+        <div class="box-body">
+            <p>
+                Quickly import logins, collections, and other data. You can also export all of your organization's
+                vault data in <code>.csv</code> format.
+            </p>
+        </div>
+        <div class="box-footer">
+            <button class="btn btn-default btn-flat" type="button" ng-click="import()">Import Data</button>
+            <button class="btn btn-default btn-flat" type="button" ng-click="export()">Export Data</button>
+        </div>
+    </div>
+    <div class="box box-danger">
+        <div class="box-header with-border">
+            <h3 class="box-title">Danger Zone</h3>
+        </div>
+        <div class="box-body">
+            Careful, these actions are not reversible!
+        </div>
+        <div class="box-footer">
+            <button type="submit" class="btn btn-default btn-flat" ng-click="delete()">
+                Delete Organization
+            </button>
+        </div>
+    </div>
+</section>

web-vault/app/organization/views/organizationVault.html

@@ -0,0 +1,95 @@
+<section class="content-header">
+    <h1>
+        Org<span class="hidden-xs">anization</span> Vault
+        <small>
+            <span ng-pluralize
+                  count="collections.length > 0 ? collections.length - 1 : 0"
+                  when="{'1': '{} collection', 'other': '{} collections'}"></span>,
+            <span ng-pluralize count="ciphers.length" when="{'1': '{} item', 'other': '{} items'}"></span>
+        </small>
+    </h1>
+</section>
+<section class="content">
+    <p ng-show="loading && !collections.length">Loading...</p>
+    <div class="box" ng-class="{'collapsed-box': collection.collapsed}" ng-repeat="collection in collections |
+         orderBy: collectionSort track by collection.id"
+         ng-show="collections.length && (!main.searchVaultText || collectionCiphers.length)">
+        <div class="box-header with-border">
+            <h3 class="box-title">
+                <i class="fa" ng-class="{'fa-cube': collection.id, 'fa-sitemap': !collection.id}"></i>
+                {{collection.name}}
+                <small ng-pluralize count="collectionCiphers.length" when="{'1': '{} item', 'other': '{} items'}"></small>
+            </h3>
+            <div class="box-tools">
+                <button type="button" class="btn btn-box-tool" data-widget="collapse" title="Collapse/Expand"
+                        ng-click="collapseExpand(collection)">
+                    <i class="fa" ng-class="{'fa-minus': !collection.collapsed, 'fa-plus': collection.collapsed}"></i>
+                </button>
+            </div>
+        </div>
+        <div class="box-body" ng-class="{'no-padding': collectionCiphers.length}">
+            <div ng-show="!collectionCiphers.length && collection.id">No items in this collection.</div>
+            <div ng-show="!collectionCiphers.length && !collection.id">No unassigned items.</div>
+            <div class="table-responsive" ng-show="collectionCiphers.length">
+                <table class="table table-striped table-hover table-vmiddle">
+                    <tbody>
+                        <tr ng-repeat="cipher in collectionCiphers = (ciphers | filter: filterByCollection(collection) |
+                            filter: (main.searchVaultText || '') | orderBy: ['name', 'subTitle']) track by cipher.id">
+                            <td style="width: 70px;">
+                                <div class="btn-group" data-append-to="body">
+                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                        <i class="fa fa-cog"></i> <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        <li>
+                                            <a href="#" stop-click ng-click="editCipher(cipher)">
+                                                <i class="fa fa-fw fa-pencil"></i> Edit
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="attachments(cipher)">
+                                                <i class="fa fa-fw fa-paperclip"></i> Attachments
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="editCollections(cipher)">
+                                                <i class="fa fa-fw fa-cubes"></i> Collections
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="viewEvents(cipher)" ng-if="useEvents">
+                                                <i class="fa fa-fw fa-file-text-o"></i> Event Logs
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="removeCipher(cipher, collection)" class="text-red"
+                                               ng-if="collection.id">
+                                                <i class="fa fa-fw fa-remove"></i> Remove
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a href="#" stop-click ng-click="deleteCipher(cipher)" class="text-red">
+                                                <i class="fa fa-fw fa-trash"></i> Delete
+                                            </a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            </td>
+                            <td class="vault-icon">
+                                <i class="fa fa-fw fa-lg {{::cipher.icon}}" ng-if="!cipher.meta.image"></i>
+                                <img alt="" ng-if="cipher.meta.image" ng-src="{{cipher.meta.image}}"
+                                     fallback-src="images/fa-globe.png" />
+                            </td>
+                            <td>
+                                <a href="#" stop-click ng-click="editCipher(cipher)">{{cipher.name}}</a>
+                                <i class="fa fa-paperclip text-muted" title="Attachments" ng-if="cipher.hasAttachments"
+                                   stop-prop></i>
+                                <div class="text-sm text-muted">{{cipher.subTitle}}</div>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</section>

web-vault/app/organization/views/organizationVaultCipherCollections.html

@@ -0,0 +1,52 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-cubes"></i> Collections <small>{{cipher.name}}</small></h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <p>Edit the collections that this item is being shared with.</p>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div ng-show="!collections.length" class="callout callout-default">
+            <p>There are no collections yet for your organization.</p>
+        </div>
+        <div class="table-responsive" ng-show="collections.length" style="margin: 0;">
+            <table class="table table-striped table-hover" style="margin: 0;">
+                <thead>
+                    <tr>
+                        <th style="width: 40px;">
+                            <input type="checkbox"
+                                   ng-checked="allSelected()"
+                                   ng-click="toggleCollectionSelectionAll($event)">
+                        </th>
+                        <th>Name</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr ng-repeat="collection in collections | orderBy: ['name'] track by collection.id">
+                        <td valign="middle">
+                            <input type="checkbox"
+                                   name="selectedCollections[]"
+                                   value="{{collection.id}}"
+                                   ng-checked="collectionSelected(collection)"
+                                   ng-click="toggleCollectionSelection(collection.id)">
+                        </td>
+                        <td valign="middle" ng-click="toggleCollectionSelection(collection.id)">
+                            {{collection.name}}
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading" ng-show="collections.length">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Save
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/organization/views/organizationVaultCipherEvents.html

@@ -0,0 +1,60 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-file-text-o"></i> Event Logs <small>{{cipher.name}}</small></h4>
+</div>
+<div class="modal-body">
+    <div class="hidden-xs">
+        <input type="datetime-local" ng-model="filterStart" required
+               class="form-control input-sm" style="width:initial; display: inline;" />
+        -
+        <input type="datetime-local" ng-model="filterEnd" required
+               class="form-control input-sm" style="width:initial; display: inline;" />
+        <button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="refresh()">
+            <i class="fa fa-fw fa-refresh" ng-class="{'fa-spin': loading}"></i> Refresh
+        </button>
+        <hr />
+    </div>
+    <div ng-show="loading && !events.length">
+        Loading...
+    </div>
+    <div ng-show="!loading && !events.length">
+        <p>There are no events to list.</p>
+    </div>
+    <div class="table-responsive" ng-show="events.length" style="margin: 0;">
+        <table class="table table-striped table-hover" style="{{ !continuationToken ? 'margin: 0;' : '' }}">
+            <thead>
+                <tr>
+                    <th>Timestamp</th>
+                    <th><span class="sr-only">App</span></th>
+                    <th>User</th>
+                    <th>Event</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr ng-repeat="event in filteredEvents = (events)">
+                    <td style="width: 210px; min-width: 100px;">
+                        {{event.date | date:'medium'}}
+                    </td>
+                    <td style="width: 20px;" class="text-center">
+                        <i class="text-muted fa fa-lg {{event.appIcon}}" title="{{event.appName}}, {{event.ip}}"></i>
+                    </td>
+                    <td style="width: 150px; min-width: 100px;">
+                        {{event.userName}}
+                    </td>
+                    <td>
+                        {{event.message}}
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="text-center" ng-show="continuationToken">
+        <button class="btn btn-link btn-block" ng-click="next()" ng-if="!loading">
+            Load more...
+        </button>
+        <i class="fa fa-fw fa-refresh fa-spin text-muted" ng-if="loading"></i>
+    </div>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+</div>

web-vault/app/reports/views/reportsBreach.html

@@ -0,0 +1,74 @@
+<section class="content-header">
+    <h1>
+        Data Breach Report
+        <small>have you been pwned?</small>
+    </h1>
+</section>
+<section class="content">
+    <div ng-show="loading && !breachAccounts.length">
+        <p>Loading...</p>
+    </div>
+    <div ng-show="!loading && error">
+        <p>An error occurred trying to load the report. Try again...</p>
+    </div>
+    <div class="callout callout-danger" ng-show="!error && !loading && breachAccounts.length">
+        <h4><i class="fa fa-frown-o"></i> Oh No, Data Breaches Found!</h4>
+        <p>
+            Your email ({{email}}) was found in {{breachAccounts.length}}
+            <span ng-if="breachAccounts.length > 1">different</span> data
+            <span ng-pluralize count="breachAccounts.length" when="{'1': 'breach', 'other': 'breaches'}"></span>
+            online.
+        </p>
+        <p>
+            A "breach" is an incident where a site's data has been illegally accessed by hackers and then released publicly.
+            Review the types of data that were compromised (email addresses, passwords, credit cards etc.) and take appropriate
+            action, such as changing passwords.
+        </p>
+        <a href="https://haveibeenpwned.com" rel="noopener" target="_blank" class="btn btn-default btn-flat">Check another email</a>
+    </div>
+    <div class="callout callout-success" ng-show="!error && !loading && !breachAccounts.length">
+        <h4><i class="fa fa-smile-o"></i> Good News, Nothing Found!</h4>
+        <p>Your email ({{email}}) was not found in any known data breaches.</p>
+        <a href="https://haveibeenpwned.com" rel="noopener" target="_blank" class="btn btn-default btn-flat">Check another email</a>
+    </div>
+    <div class="box box-danger" ng-repeat="breach in breachAccounts track by breach.id">
+        <div class="box-header with-border">
+            <h3 class="box-title">{{breach.title}}</h3>
+        </div>
+        <div class="box-body box-breach">
+            <div class="row">
+                <div class="col-sm-2">
+                    <img ng-src="{{breach.image}}" alt="{{breach.id}} logo" class="img-responsive" />
+                </div>
+                <div class="col-sm-10">
+                    <div class="row">
+                        <div class="col-sm-8">
+                            <p ng-bind-html="breach.description"></p>
+                            <h5><b>Compromised Data</b></h5>
+                            <ul>
+                                <li ng-repeat="class in breach.classes">{{class}}</li>
+                            </ul>
+                        </div>
+                        <div class="col-sm-4">
+                            <dl>
+                                <dt><span class="hidden-sm">Website</dt>
+                                <dd>{{breach.domain}}</dd>
+                                <dt><span class="hidden-sm">Affected </span>Users</dt>
+                                <dd>{{breach.count | number: 0}}</dd>
+                                <dt><span class="hidden-sm">Breach </span>Occurred</dt>
+                                <dd>{{breach.date | date: format: mediumDate}}</dd>
+                                <dt><span class="hidden-sm">Breach </span>Reported</dt>
+                                <dd>{{breach.reportedDate | date: format: mediumDate}}</dd>
+                                <dt><span class="hidden-sm">Information </span>Updated</dt>
+                                <dd>{{breach.modifiedDate | date: format: mediumDate}}</dd>
+                            </dl>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    This data is brought to you as a service from
+    <b><a href="https://haveibeenpwned.com/" target="_blank" rel="noopener">Have I been pwned?</a></b>.
+    Please check out their wonderful services and subscribe to receive notifications about future data breaches.
+</section>

web-vault/app/settings/views/settings.html

@@ -0,0 +1,164 @@
+<section class="content-header">
+    <h1>
+        Settings
+        <small>manage your account</small>
+    </h1>
+</section>
+<section class="content">
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">General</h3>
+        </div>
+        <form role="form" name="generalForm" ng-submit="generalForm.$valid && generalSave()" api-form="generalPromise"
+              autocomplete="off">
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-sm-9">
+                        <div class="callout callout-danger validation-errors" ng-show="generalForm.$errors">
+                            <h4>Errors have occurred</h4>
+                            <ul>
+                                <li ng-repeat="e in generalForm.$errors">{{e}}</li>
+                            </ul>
+                        </div>
+                        <div class="form-group" show-errors>
+                            <label for="name">Name</label>
+                            <input type="text" id="name" name="Name" ng-model="model.profile.name" class="form-control"
+                                   required api-field />
+                        </div>
+                        <div class="form-group">
+                            <label for="email">Email - <a href="#" stop-click ng-click="changeEmail()">change</a></label>
+                            <input type="text" id="email" ng-model="model.email" class="form-control" readonly />
+                        </div>
+                        <div class="form-group" show-errors>
+                            <label for="culture">Language/Culture</label>
+                            <select id="culture" name="Culture" ng-model="model.profile.culture" class="form-control" api-field>
+                                <option value="en-US">English (US)</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-3 settings-photo">
+                        <letter-avatar data="{{model.profile.name || model.email}}" round="false"
+                                       avclass="img-responsive img-rounded" avwidth="200" avheight="200"
+                                       fontsize="90"></letter-avatar>
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer">
+                <button type="submit" class="btn btn-primary btn-flat" ng-disabled="generalForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon" ng-show="generalForm.$loading"></i>Save
+                </button>
+                <button type="button" class="btn btn-default btn-flat" ng-click="changeEmail()">
+                    Change Email
+                </button>
+            </div>
+        </form>
+    </div>
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">Master Password</h3>
+        </div>
+        <form role="form" name="masterPasswordForm" ng-submit="masterPasswordForm.$valid && passwordHintSave()"
+              api-form="passwordHintPromise" autocomplete="off">
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-sm-9">
+                        <div class="callout callout-danger validation-errors" ng-show="masterPasswordForm.$errors">
+                            <h4>Errors have occurred</h4>
+                            <ul>
+                                <li ng-repeat="e in masterPasswordForm.$errors">{{e}}</li>
+                            </ul>
+                        </div>
+                        <div class="form-group" show-errors>
+                            <label for="hint">Master Password Hint</label>
+                            <input type="text" id="hint" name="MasterPasswordHint" ng-model="model.profile.masterPasswordHint"
+                                   class="form-control" api-field />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer">
+                <button type="submit" class="btn btn-primary btn-flat" ng-disabled="masterPasswordForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon" ng-show="masterPasswordForm.$loading"></i>Save
+                </button>
+                <button type="button" class="btn btn-default btn-flat" ng-click="changePassword()">
+                    Change Master Password
+                </button>
+            </div>
+        </form>
+    </div>
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">Web Vault Options</h3>
+        </div>
+        <form role="form" name="optionsForm" ng-submit="optionsForm.$valid && optionsSave()" autocomplete="off">
+            <div class="box-body">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" ng-model="model.disableWebsiteIcons">
+                        Disable Website Icons
+                    </label>
+                    <p class="help-block">Website Icons provide a recognizable image next to each login item in your vault.</p>
+                </div>
+            </div>
+            <div class="box-footer">
+                <button type="submit" class="btn btn-primary btn-flat" ng-disabled="optionsForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon" ng-show="optionsForm.$loading"></i>Save
+                </button>
+            </div>
+        </form>
+    </div>
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">Organizations</h3>
+        </div>
+        <div class="box-body" ng-if="!model.organizations || !model.organizations.length">
+            No organizations yet for your account.
+        </div>
+        <div class="list-group" ng-if="model.organizations && model.organizations.length">
+            <div class="list-group-item" ng-repeat="org in model.organizations | orderBy: ['name']">
+                <div class="btn-group" data-append-to="body">
+                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                        <i class="fa fa-cog"></i> <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <li>
+                            <a href="#" stop-click ng-click="leaveOrganization(org)" class="text-red">
+                                <i class="fa fa-fw fa-sign-out"></i> Leave
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <a href="#" stop-click ng-click="viewOrganization(org)">
+                    <letter-avatar data="{{org.name}}" round="false" avwidth="25" avheight="25"
+                                   avclass="img-rounded" fontsize="10"></letter-avatar>
+                    {{org.name}}
+                    <span class="label bg-gray" ng-if="!org.enabled">DISABLED</span>
+                </a>
+            </div>
+        </div>
+        <div class="box-footer">
+            <a ui-sref="backend.user.settingsCreateOrg" class="btn btn-default btn-flat">
+                Create an Organization
+            </a>
+        </div>
+    </div>
+    <div class="box box-danger">
+        <div class="box-header with-border">
+            <h3 class="box-title">Danger Zone</h3>
+        </div>
+        <div class="box-body">
+            Careful, these actions are not reversible!
+        </div>
+        <div class="box-footer">
+            <button type="button" class="btn btn-default btn-flat" ng-click="sessions()">
+                Deauthorize Sessions
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="purge()">
+                Purge Vault
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="delete()">
+                Delete Account
+            </button>
+        </div>
+    </div>
+</section>

web-vault/app/settings/views/settingsAddEditEquivalentDomain.html

@@ -0,0 +1,35 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-globe"></i> {{index ? 'Edit Equivalent Domain' : 'Add Equivalent Domain'}}</h4>
+</div>
+<form name="domainAddEditForm" ng-submit="domainAddEditForm.$valid && submit(domainAddEditForm)" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-danger validation-errors" ng-show="domainAddEditForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in domainAddEditForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <p>
+            Enter a list of domains separated by commas.
+        </p>
+        <div class="form-group" show-errors>
+            <label for="name">Domains</label> <span>*</span>
+            <textarea id="domains" name="Domains" ng-model="domains" class="form-control" placeholder="ex. google.com, gmail.com"
+                      style="height: 100px;" required></textarea>
+            <p class="help-block">
+                Only "base" domains are allowed. Do not enter subdomains. For example, enter "google.com" instead of
+                "www.google.com".
+            </p>
+            <p class="help-block">
+                You can also enter "androidapp://package.name" to associate an android app with other website domains.
+            </p>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat">
+            Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsBilling.html

@@ -0,0 +1,178 @@
+<section class="content-header">
+    <h1>Billing <small>manage your membership</small></h1>
+</section>
+<section class="content">
+    <div class="callout callout-warning" ng-if="subscription && subscription.cancelled">
+        <h4><i class="fa fa-warning"></i> Canceled</h4>
+        The premium membership subscription has been canceled.
+    </div>
+    <div class="callout callout-warning" ng-if="subscription && subscription.markedForCancel">
+        <h4><i class="fa fa-warning"></i> Pending Cancellation</h4>
+        <p>
+            The premium membership has been marked for cancellation at the end of the
+            current billing period.
+        </p>
+        <button type="button" class="btn btn-default btn-flat" ng-click="reinstate()">
+            Reinstate
+        </button>
+    </div>
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">Premium Membership</h3>
+        </div>
+        <div class="box-body">
+            <dl ng-if="selfHosted">
+                <dt>Expiration</dt>
+                <dd ng-if="loading">
+                    Loading...
+                </dd>
+                <dd ng-if="!loading && expiration">
+                    {{expiration | date: 'medium'}}
+                </dd>
+                <dd ng-if="!loading && !expiration">
+                    Never expires
+                </dd>
+            </dl>
+            <div class="row" ng-if="!selfHosted">
+                <div class="col-md-5">
+                    <dl>
+                        <dt>Status</dt>
+                        <dd>
+                            <span style="text-transform: capitalize;">{{(subscription && subscription.status) || '-'}}</span>
+                            <span ng-if="subscription.markedForCancel">- marked for cancellation</span>
+                        </dd>
+                        <dt>Next Charge</dt>
+                        <dd>{{nextInvoice ? ((nextInvoice.date | date: 'mediumDate') + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}</dd>
+                    </dl>
+                </div>
+                <div class="col-md-7">
+                    <strong>Details</strong>
+                    <div ng-show="loading">
+                        Loading...
+                    </div>
+                    <div class="table-responsive" style="margin: 0;" ng-show="!loading">
+                        <table class="table" style="margin: 0;">
+                            <tbody>
+                                <tr ng-repeat="item in subscription.items">
+                                    <td>
+                                        {{item.name}} {{item.qty > 1 ? '&times;' + item.qty : ''}}
+                                        @ {{item.amount | currency:'$'}}
+                                    </td>
+                                    <td class="text-right">{{(item.qty * item.amount) | currency:'$'}} /{{item.interval}}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="box-footer" ng-if="!selfHosted && !loading && subscription &&
+             (!subscription.cancelled || subscription.markedForCancel)">
+            <button type="button" class="btn btn-default btn-flat" ng-click="cancel()"
+                    ng-if="!subscription.cancelled && !subscription.markedForCancel">
+                Cancel
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="reinstate()"
+                    ng-if="subscription.markedForCancel">
+                Reinstate
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="license()"
+                    ng-if="!subscription.cancelled">
+                Download License
+            </button>
+        </div>
+        <div class="box-footer" ng-if="selfHosted">
+            <button type="button" class="btn btn-default btn-flat" ng-click="updateLicense()">
+                Update License
+            </button>
+            <a href="https://vault.bitwarden.com" class="btn btn-default btn-flat" target="_blank">
+                Manage Membership
+            </a>
+        </div>
+    </div>
+    <div class="box box-default" ng-if="storage && !selfHosted">
+        <div class="box-header with-border">
+            <h3 class="box-title">Storage</h3>
+        </div>
+        <div class="box-body">
+            <p>
+                Your membership has a total of {{storage.maxGb}} GB of encrypted file storage.
+                You are currently using {{storage.currentName}}.
+            </p>
+            <div class="progress" style="margin: 0;">
+                <div class="progress-bar progress-bar-info" role="progressbar"
+                     aria-valuenow="{{storage.percentage}}" aria-valuemin="0" aria-valuemax="1"
+                     style="min-width: 50px; width: {{storage.percentage}}%;">
+                    {{storage.percentage}}%
+                </div>
+            </div>
+        </div>
+        <div class="box-footer" ng-if="subscription && paymentSource && !subscription.cancelled">
+            <button type="button" class="btn btn-default btn-flat" ng-click="adjustStorage(true)">
+                Add Storage
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="adjustStorage(false)">
+                Remove Storage
+            </button>
+        </div>
+    </div>
+    <div class="box box-default" ng-if="!selfHosted">
+        <div class="box-header with-border">
+            <h3 class="box-title">Payment Method</h3>
+        </div>
+        <div class="box-body">
+            <div ng-show="loading">
+                Loading...
+            </div>
+            <div ng-show="!loading && !paymentSource">
+                <i class="fa fa-credit-card"></i> No payment method on file.
+            </div>
+            <div ng-show="!loading && paymentSource">
+                <i class="fa" ng-class="{'fa-credit-card': paymentSource.type === 0,
+                   'fa-university': paymentSource.type === 1, 'fa-paypal fa-fw text-blue': paymentSource.type === 2}"></i>
+                {{paymentSource.description}}
+            </div>
+        </div>
+        <div class="box-footer">
+            <button type="button" class="btn btn-default btn-flat" ng-click="changePayment()">
+                {{ paymentSource ? 'Change Payment Method' : 'Add Payment Method' }}
+            </button>
+        </div>
+    </div>
+    <div class="box box-default" ng-if="!selfHosted">
+        <div class="box-header with-border">
+            <h3 class="box-title">Charges</h3>
+        </div>
+        <div class="box-body">
+            <div ng-show="loading">
+                Loading...
+            </div>
+            <div ng-show="!loading && !charges.length">
+                No charges.
+            </div>
+            <div class="table-responsive" ng-show="charges.length">
+                <table class="table">
+                    <tbody>
+                        <tr ng-repeat="charge in charges">
+                            <td style="width: 200px">
+                                {{charge.date | date: 'mediumDate'}}
+                            </td>
+                            <td style="min-width: 150px">
+                                {{charge.paymentSource}}
+                            </td>
+                            <td style="width: 150px; text-transform: capitalize;">
+                                {{charge.status}}
+                            </td>
+                            <td class="text-right" style="width: 150px;">
+                                {{charge.amount | currency:'$'}}
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <div class="box-footer">
+            Note: Any charges will appear on your statement as <b>BITWARDEN</b>.
+        </div>
+    </div>
+</section>

web-vault/app/settings/views/settingsBillingAdjustStorage.html

@@ -0,0 +1,46 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-database"></i>
+        {{add ? 'Add Storage' : 'Remove Storage'}}
+    </h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-default" ng-show="add">
+            <h4><i class="fa fa-dollar"></i> Note About Charges</h4>
+            <p>
+                Adding storage to your plan will result in adjustments to your billing totals and immediately charge your
+                payment method on file. The first charge will be prorated for the remainder of the current billing cycle.
+            </p>
+        </div>
+        <div class="callout callout-default" ng-show="!add">
+            <h4><i class="fa fa-dollar"></i> Note About Charges</h4>
+            <p>
+                Removing storage will result in adjustments to your billing totals that will be prorated as credits
+                to your next billing charge.
+            </p>
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="row">
+            <div class="col-md-6">
+                <div class="form-group">
+                    <label for="gb">{{add ? 'GB of Storage To Add' : 'GB of Storage To Remove'}}</label>
+                    <input type="number" id="gb" name="StroageGbAdjustment" ng-model="storageAdjustment" class="form-control"
+                           required min="0" max="99" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsBillingChangePayment.html

@@ -0,0 +1,433 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-credit-card"></i>
+        {{existingPaymentMethod ? 'Change Payment Method' : 'Add Payment Method'}}
+    </h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit()" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div ng-if="showPaymentOptions">
+            <label class="radio-inline radio-boxed" ng-show="!hideCard">
+                <input type="radio" name="PaymentMethod" value="card" ng-model="paymentMethod"
+                       ng-change="changePaymentMethod('card')"><i class="fa fa-fw fa-credit-card"></i> Credit Card
+            </label>
+            <label class="radio-inline radio-boxed" ng-show="!hidePaypal">
+                <input type="radio" name="PaymentMethod" value="paypal" ng-model="paymentMethod"
+                       ng-change="changePaymentMethod('paypal')"><i class="fa fa-fw fa-paypal"></i> PayPal
+            </label>
+            <label class="radio-inline radio-boxed" ng-show="!hideBank">
+                <input type="radio" name="PaymentMethod" value="bank" ng-model="paymentMethod"
+                       ng-change="changePaymentMethod('bank')"><i class="fa fa-fw fa-bank"></i>
+                Bank<span class="hidden-xs"> Account (ACH)</span>
+            </label>
+            <hr />
+        </div>
+        <div ng-if="paymentMethod === 'paypal'">
+            <div id="bt-dropin-container"></div>
+        </div>
+        <div ng-if="paymentMethod === 'bank'">
+            <div class="callout callout-warning">
+                <h4><i class="fa fa-warning"></i> You must verify your bank account</h4>
+                <p>
+                    Payment with a bank account is <u>only available to customers in the United States</u>.
+                    You will be required to verify your bank account. We will make two micro-deposits within the next
+                    1-2 business days. Enter these amounts in the organization's billing area to verify the bank account.
+                    Failure to verify the bank account will result in a missed payment and your organization being
+                    disabled.
+                </p>
+            </div>
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <label for="routing_number">Routing Number</label>
+                        <input type="text" id="routing_number" name="routing_number"
+                               ng-model="bank.routing_number" class="form-control" required />
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <label for="account_number">Account Number</label>
+                        <input type="text" id="account_number" name="account_number"
+                               ng-model="bank.account_number" class="form-control" required />
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <label for="account_holder_name">Account Holder Name</label>
+                        <input type="text" id="account_holder_name" name="account_holder_name"
+                               ng-model="bank.account_holder_name" class="form-control" required />
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <label for="account_holder_type">Account Type</label>
+                        <select id="account_holder_type" class="form-control" name="account_holder_type"
+                                ng-model="bank.account_holder_type" required>
+                            <option value="">-- Select --</option>
+                            <option value="company">Company (Business)</option>
+                            <option value="individual">Individual (Personal)</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div ng-if="paymentMethod === 'card'">
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="form-group" show-errors>
+                        <label for="card_number">Card Number</label>
+                        <input type="text" id="card_number" name="card_number" ng-model="card.number"
+                               class="form-control" cc-number required api-field />
+                    </div>
+                </div>
+            </div>
+            <ul class="list-inline">
+                <li><div class="cc visa"></div></li>
+                <li><div class="cc mastercard"></div></li>
+                <li><div class="cc amex"></div></li>
+                <li><div class="cc discover"></div></li>
+                <li><div class="cc diners"></div></li>
+                <li><div class="cc jcb"></div></li>
+            </ul>
+            <div class="row">
+                <div class="col-sm-4">
+                    <div class="form-group" show-errors>
+                        <label for="exp_month">Expiration Month</label>
+                        <select id="exp_month" class="form-control" ng-model="card.exp_month" required cc-exp-month
+                                name="exp_month" api-field>
+                            <option value="">-- Select --</option>
+                            <option value="01">01 - January</option>
+                            <option value="02">02 - February</option>
+                            <option value="03">03 - March</option>
+                            <option value="04">04 - April</option>
+                            <option value="05">05 - May</option>
+                            <option value="06">06 - June</option>
+                            <option value="07">07 - July</option>
+                            <option value="08">08 - August</option>
+                            <option value="09">09 - September</option>
+                            <option value="10">10 - October</option>
+                            <option value="11">11 - November</option>
+                            <option value="12">12 - December</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="col-sm-4">
+                    <div class="form-group" show-errors>
+                        <label for="exp_year">Expiration Year</label>
+                        <select id="exp_year" class="form-control" ng-model="card.exp_year" required cc-exp-year
+                                name="exp_year" api-field>
+                            <option value="">-- Select --</option>
+                            <option value="17">2017</option>
+                            <option value="18">2018</option>
+                            <option value="19">2019</option>
+                            <option value="20">2020</option>
+                            <option value="21">2021</option>
+                            <option value="22">2022</option>
+                            <option value="23">2023</option>
+                            <option value="24">2024</option>
+                            <option value="25">2025</option>
+                            <option value="26">2026</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="col-sm-4">
+                    <div class="form-group" show-errors>
+                        <label for="cvc">
+                            CVC
+                            <a href="https://www.cvvnumber.com/cvv.html" target="_blank" title="What is this?"
+                               rel="noopener noreferrer">
+                                <i class="fa fa-question-circle"></i>
+                            </a>
+                        </label>
+                        <input type="text" id="cvc" ng-model="card.cvc" class="form-control" name="cvc"
+                               cc-type="number.$ccType" cc-cvc required api-field />
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group" show-errors>
+                        <label for="address_country">Country</label>
+                        <select id="address_country" class="form-control" ng-model="card.address_country"
+                                required name="address_country" api-field>
+                            <option value="">-- Select --</option>
+                            <option value="US">United States</option>
+                            <option value="CN">China</option>
+                            <option value="FR">France</option>
+                            <option value="DE">Germany</option>
+                            <option value="CA">Canada</option>
+                            <option value="GB">United Kingdom</option>
+                            <option value="AU">Australia</option>
+                            <option value="IN">India</option>
+                            <option value="-" disabled></option>
+                            <option value="AF">Afghanistan</option>
+                            <option value="AX">Åland Islands</option>
+                            <option value="AL">Albania</option>
+                            <option value="DZ">Algeria</option>
+                            <option value="AS">American Samoa</option>
+                            <option value="AD">Andorra</option>
+                            <option value="AO">Angola</option>
+                            <option value="AI">Anguilla</option>
+                            <option value="AQ">Antarctica</option>
+                            <option value="AG">Antigua and Barbuda</option>
+                            <option value="AR">Argentina</option>
+                            <option value="AM">Armenia</option>
+                            <option value="AW">Aruba</option>
+                            <option value="AT">Austria</option>
+                            <option value="AZ">Azerbaijan</option>
+                            <option value="BS">Bahamas</option>
+                            <option value="BH">Bahrain</option>
+                            <option value="BD">Bangladesh</option>
+                            <option value="BB">Barbados</option>
+                            <option value="BY">Belarus</option>
+                            <option value="BE">Belgium</option>
+                            <option value="BZ">Belize</option>
+                            <option value="BJ">Benin</option>
+                            <option value="BM">Bermuda</option>
+                            <option value="BT">Bhutan</option>
+                            <option value="BO">Bolivia, Plurinational State of</option>
+                            <option value="BQ">Bonaire, Sint Eustatius and Saba</option>
+                            <option value="BA">Bosnia and Herzegovina</option>
+                            <option value="BW">Botswana</option>
+                            <option value="BV">Bouvet Island</option>
+                            <option value="BR">Brazil</option>
+                            <option value="IO">British Indian Ocean Territory</option>
+                            <option value="BN">Brunei Darussalam</option>
+                            <option value="BG">Bulgaria</option>
+                            <option value="BF">Burkina Faso</option>
+                            <option value="BI">Burundi</option>
+                            <option value="KH">Cambodia</option>
+                            <option value="CM">Cameroon</option>
+                            <option value="CV">Cape Verde</option>
+                            <option value="KY">Cayman Islands</option>
+                            <option value="CF">Central African Republic</option>
+                            <option value="TD">Chad</option>
+                            <option value="CL">Chile</option>
+                            <option value="CX">Christmas Island</option>
+                            <option value="CC">Cocos (Keeling) Islands</option>
+                            <option value="CO">Colombia</option>
+                            <option value="KM">Comoros</option>
+                            <option value="CG">Congo</option>
+                            <option value="CD">Congo, the Democratic Republic of the</option>
+                            <option value="CK">Cook Islands</option>
+                            <option value="CR">Costa Rica</option>
+                            <option value="CI">Côte d'Ivoire</option>
+                            <option value="HR">Croatia</option>
+                            <option value="CU">Cuba</option>
+                            <option value="CW">Curaçao</option>
+                            <option value="CY">Cyprus</option>
+                            <option value="CZ">Czech Republic</option>
+                            <option value="DK">Denmark</option>
+                            <option value="DJ">Djibouti</option>
+                            <option value="DM">Dominica</option>
+                            <option value="DO">Dominican Republic</option>
+                            <option value="EC">Ecuador</option>
+                            <option value="EG">Egypt</option>
+                            <option value="SV">El Salvador</option>
+                            <option value="GQ">Equatorial Guinea</option>
+                            <option value="ER">Eritrea</option>
+                            <option value="EE">Estonia</option>
+                            <option value="ET">Ethiopia</option>
+                            <option value="FK">Falkland Islands (Malvinas)</option>
+                            <option value="FO">Faroe Islands</option>
+                            <option value="FJ">Fiji</option>
+                            <option value="FI">Finland</option>
+                            <option value="GF">French Guiana</option>
+                            <option value="PF">French Polynesia</option>
+                            <option value="TF">French Southern Territories</option>
+                            <option value="GA">Gabon</option>
+                            <option value="GM">Gambia</option>
+                            <option value="GE">Georgia</option>
+                            <option value="GH">Ghana</option>
+                            <option value="GI">Gibraltar</option>
+                            <option value="GR">Greece</option>
+                            <option value="GL">Greenland</option>
+                            <option value="GD">Grenada</option>
+                            <option value="GP">Guadeloupe</option>
+                            <option value="GU">Guam</option>
+                            <option value="GT">Guatemala</option>
+                            <option value="GG">Guernsey</option>
+                            <option value="GN">Guinea</option>
+                            <option value="GW">Guinea-Bissau</option>
+                            <option value="GY">Guyana</option>
+                            <option value="HT">Haiti</option>
+                            <option value="HM">Heard Island and McDonald Islands</option>
+                            <option value="VA">Holy See (Vatican City State)</option>
+                            <option value="HN">Honduras</option>
+                            <option value="HK">Hong Kong</option>
+                            <option value="HU">Hungary</option>
+                            <option value="IS">Iceland</option>
+                            <option value="ID">Indonesia</option>
+                            <option value="IR">Iran, Islamic Republic of</option>
+                            <option value="IQ">Iraq</option>
+                            <option value="IE">Ireland</option>
+                            <option value="IM">Isle of Man</option>
+                            <option value="IL">Israel</option>
+                            <option value="IT">Italy</option>
+                            <option value="JM">Jamaica</option>
+                            <option value="JP">Japan</option>
+                            <option value="JE">Jersey</option>
+                            <option value="JO">Jordan</option>
+                            <option value="KZ">Kazakhstan</option>
+                            <option value="KE">Kenya</option>
+                            <option value="KI">Kiribati</option>
+                            <option value="KP">Korea, Democratic People's Republic of</option>
+                            <option value="KR">Korea, Republic of</option>
+                            <option value="KW">Kuwait</option>
+                            <option value="KG">Kyrgyzstan</option>
+                            <option value="LA">Lao People's Democratic Republic</option>
+                            <option value="LV">Latvia</option>
+                            <option value="LB">Lebanon</option>
+                            <option value="LS">Lesotho</option>
+                            <option value="LR">Liberia</option>
+                            <option value="LY">Libya</option>
+                            <option value="LI">Liechtenstein</option>
+                            <option value="LT">Lithuania</option>
+                            <option value="LU">Luxembourg</option>
+                            <option value="MO">Macao</option>
+                            <option value="MK">Macedonia, the former Yugoslav Republic of</option>
+                            <option value="MG">Madagascar</option>
+                            <option value="MW">Malawi</option>
+                            <option value="MY">Malaysia</option>
+                            <option value="MV">Maldives</option>
+                            <option value="ML">Mali</option>
+                            <option value="MT">Malta</option>
+                            <option value="MH">Marshall Islands</option>
+                            <option value="MQ">Martinique</option>
+                            <option value="MR">Mauritania</option>
+                            <option value="MU">Mauritius</option>
+                            <option value="YT">Mayotte</option>
+                            <option value="MX">Mexico</option>
+                            <option value="FM">Micronesia, Federated States of</option>
+                            <option value="MD">Moldova, Republic of</option>
+                            <option value="MC">Monaco</option>
+                            <option value="MN">Mongolia</option>
+                            <option value="ME">Montenegro</option>
+                            <option value="MS">Montserrat</option>
+                            <option value="MA">Morocco</option>
+                            <option value="MZ">Mozambique</option>
+                            <option value="MM">Myanmar</option>
+                            <option value="NA">Namibia</option>
+                            <option value="NR">Nauru</option>
+                            <option value="NP">Nepal</option>
+                            <option value="NL">Netherlands</option>
+                            <option value="NC">New Caledonia</option>
+                            <option value="NZ">New Zealand</option>
+                            <option value="NI">Nicaragua</option>
+                            <option value="NE">Niger</option>
+                            <option value="NG">Nigeria</option>
+                            <option value="NU">Niue</option>
+                            <option value="NF">Norfolk Island</option>
+                            <option value="MP">Northern Mariana Islands</option>
+                            <option value="NO">Norway</option>
+                            <option value="OM">Oman</option>
+                            <option value="PK">Pakistan</option>
+                            <option value="PW">Palau</option>
+                            <option value="PS">Palestinian Territory, Occupied</option>
+                            <option value="PA">Panama</option>
+                            <option value="PG">Papua New Guinea</option>
+                            <option value="PY">Paraguay</option>
+                            <option value="PE">Peru</option>
+                            <option value="PH">Philippines</option>
+                            <option value="PN">Pitcairn</option>
+                            <option value="PL">Poland</option>
+                            <option value="PT">Portugal</option>
+                            <option value="PR">Puerto Rico</option>
+                            <option value="QA">Qatar</option>
+                            <option value="RE">Réunion</option>
+                            <option value="RO">Romania</option>
+                            <option value="RU">Russian Federation</option>
+                            <option value="RW">Rwanda</option>
+                            <option value="BL">Saint Barthélemy</option>
+                            <option value="SH">Saint Helena, Ascension and Tristan da Cunha</option>
+                            <option value="KN">Saint Kitts and Nevis</option>
+                            <option value="LC">Saint Lucia</option>
+                            <option value="MF">Saint Martin (French part)</option>
+                            <option value="PM">Saint Pierre and Miquelon</option>
+                            <option value="VC">Saint Vincent and the Grenadines</option>
+                            <option value="WS">Samoa</option>
+                            <option value="SM">San Marino</option>
+                            <option value="ST">Sao Tome and Principe</option>
+                            <option value="SA">Saudi Arabia</option>
+                            <option value="SN">Senegal</option>
+                            <option value="RS">Serbia</option>
+                            <option value="SC">Seychelles</option>
+                            <option value="SL">Sierra Leone</option>
+                            <option value="SG">Singapore</option>
+                            <option value="SX">Sint Maarten (Dutch part)</option>
+                            <option value="SK">Slovakia</option>
+                            <option value="SI">Slovenia</option>
+                            <option value="SB">Solomon Islands</option>
+                            <option value="SO">Somalia</option>
+                            <option value="ZA">South Africa</option>
+                            <option value="GS">South Georgia and the South Sandwich Islands</option>
+                            <option value="SS">South Sudan</option>
+                            <option value="ES">Spain</option>
+                            <option value="LK">Sri Lanka</option>
+                            <option value="SD">Sudan</option>
+                            <option value="SR">Suriname</option>
+                            <option value="SJ">Svalbard and Jan Mayen</option>
+                            <option value="SZ">Swaziland</option>
+                            <option value="SE">Sweden</option>
+                            <option value="CH">Switzerland</option>
+                            <option value="SY">Syrian Arab Republic</option>
+                            <option value="TW">Taiwan, Province of China</option>
+                            <option value="TJ">Tajikistan</option>
+                            <option value="TZ">Tanzania, United Republic of</option>
+                            <option value="TH">Thailand</option>
+                            <option value="TL">Timor-Leste</option>
+                            <option value="TG">Togo</option>
+                            <option value="TK">Tokelau</option>
+                            <option value="TO">Tonga</option>
+                            <option value="TT">Trinidad and Tobago</option>
+                            <option value="TN">Tunisia</option>
+                            <option value="TR">Turkey</option>
+                            <option value="TM">Turkmenistan</option>
+                            <option value="TC">Turks and Caicos Islands</option>
+                            <option value="TV">Tuvalu</option>
+                            <option value="UG">Uganda</option>
+                            <option value="UA">Ukraine</option>
+                            <option value="AE">United Arab Emirates</option>
+                            <option value="UM">United States Minor Outlying Islands</option>
+                            <option value="UY">Uruguay</option>
+                            <option value="UZ">Uzbekistan</option>
+                            <option value="VU">Vanuatu</option>
+                            <option value="VE">Venezuela, Bolivarian Republic of</option>
+                            <option value="VN">Viet Nam</option>
+                            <option value="VG">Virgin Islands, British</option>
+                            <option value="VI">Virgin Islands, U.S.</option>
+                            <option value="WF">Wallis and Futuna</option>
+                            <option value="EH">Western Sahara</option>
+                            <option value="YE">Yemen</option>
+                            <option value="ZM">Zambia</option>
+                            <option value="ZW">Zimbabwe</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group" show-errors>
+                        <label for="address_zip"
+                               ng-bind="card.address_country === 'US' ? 'Zip Code' : 'Postal Code'"></label>
+                        <input type="text" id="address_zip" ng-model="card.address_zip"
+                               class="form-control" required name="address_zip" api-field />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsBillingUpdateLicense.html

@@ -0,0 +1,30 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-drivers-license"></i>
+        Update License
+    </h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit(form)" api-form="submitPromise" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-error>
+            <label for="file" class="sr-only">License</label>
+            <input type="file" id="file" name="file" accept=".json" />
+            <p class="help-block">
+                Select your <code>.json</code> license file.
+            </p>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsChangeEmail.html

@@ -0,0 +1,58 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title" id="changeEmailModelLabel"><i class="fa fa-at"></i> Change Email</h4>
+</div>
+<form name="changeEmailForm" ng-submit="changeEmailForm.$valid && token(model, changeEmailForm)" api-form="tokenPromise"
+      ng-show="!tokenSent">
+    <div class="modal-body">
+        <p>Below you can change your account's email address.</p>
+        <div class="callout callout-danger validation-errors" ng-show="changeEmailForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in changeEmailForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="model.masterPassword" class="form-control"
+                   required api-field />
+        </div>
+        <div class="form-group" show-errors>
+            <label for="newEmail">New Email</label>
+            <input type="email" id="newEmail" name="NewEmail" ng-model="model.newEmail" class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="changeEmailForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="changeEmailForm.$loading"></i>Submit
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>
+<form name="changeEmailConfirmForm" ng-submit="changeEmailConfirmForm.$valid && confirm(model)" api-form="confirmPromise"
+      ng-show="tokenSent" autocomplete="off">
+    <div class="modal-body">
+        <p>We have emailed a verification code to <b>{{model.newEmail}}</b>. Please check your email for this code and enter it below to finalize your the email address change.</p>
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning</h4>
+            Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices
+            may continue to remain active for up to one hour.
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="changeEmailConfirmForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in changeEmailConfirmForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="token">Code</label>
+            <input type="number" id="token" name="Token" ng-model="model.token" class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="changeEmailConfirmForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="changeEmailConfirmForm.$loading"></i>Change Email
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsChangePassword.html

@@ -0,0 +1,43 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title" id="changePasswrdModelLabel"><i class="fa fa-key"></i> Change Password</h4>
+</div>
+<form name="changePasswordForm" ng-submit="changePasswordForm.$valid && save(model, changePasswordForm)" api-form="savePromise">
+    <div class="modal-body">
+        <p>Below you can change your account's master password.</p>
+        <p>We recommend that you change your master password immediately if you believe that your credentials have been compromised.</p>
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning</h4>
+            Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices
+            may continue to remain active for up to one hour.
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="changePasswordForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in changePasswordForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Current Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="model.masterPassword" class="form-control"
+                   required api-field />
+        </div>
+        <hr />
+        <div class="form-group" show-errors>
+            <label for="newMasterPassword">New Master Password</label>
+            <input type="password" id="newMasterPassword" name="NewMasterPasswordHash" ng-model="model.newMasterPassword" class="form-control"
+                   required api-field />
+        </div>
+        <div class="form-group" show-errors>
+            <label for="confirmNewMasterPassword">Confirm New Master Password</label>
+            <input type="password" id="confirmNewMasterPassword" name="ConfirmNewMasterPasswordHash" ng-model="model.confirmNewMasterPassword"
+                   class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="changePasswordForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="changePasswordForm.$loading"></i>Change Password
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsCreateOrganization.html

@@ -0,0 +1,697 @@
+<section class="content-header">
+    <h1>Create Organization</h1>
+</section>
+<section class="content">
+    <p>
+        Organizations allow you to share parts of your vault with others as well as manage related users
+        for a specific entity (such as a family, small team, or large company).
+    </p>
+    <form name="createOrgForm" ng-submit="createOrgForm.$valid && submit(model, createOrgForm)" api-form="submitPromise">
+        <div class="callout callout-danger validation-errors" ng-show="createOrgForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in createOrgForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div ng-if="selfHosted">
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">License</h3>
+                </div>
+                <div class="box-body">
+                    <p>To create an on-premise hosted organization you need to upload a valid license file.</p>
+                    <div class="form-group" show-error>
+                        <label for="file" class="sr-only">License</label>
+                        <input type="file" id="file" name="file" accept=".json" />
+                        <p class="help-block">
+                            Your license file will be named something like <code>bitwarden_organization_license.json</code>
+                        </p>
+                    </div>
+                </div>
+                <div class="box-footer">
+                    <button type="submit" class="btn btn-primary btn-flat" ng-disabled="createOrgForm.$loading">
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="createOrgForm.$loading"></i>Submit
+                    </button>
+                </div>
+            </div>
+        </div>
+        <div ng-if="!selfHosted">
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">General Information</h3>
+                </div>
+                <div class="box-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="form-group" show-errors>
+                                <label for="name">Organization Name</label>
+                                <input type="text" id="name" name="Name" ng-model="model.name" class="form-control"
+                                       required api-field />
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="form-group" show-errors>
+                                <label for="billingEmail">Billing Email</label>
+                                <input type="email" id="billingEmail" name="BillingEmail" ng-model="model.billingEmail"
+                                       class="form-control" required api-field />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="checkbox">
+                        <label>
+                            <input type="checkbox" ng-model="model.ownedBusiness" ng-click="changedBusiness()">
+                            This account is owned by a business.
+                        </label>
+                    </div>
+                    <div class="row" ng-show="model.ownedBusiness">
+                        <div class="col-md-6">
+                            <div class="form-group" show-errors>
+                                <label for="businessName">Business Name</label>
+                                <input type="text" id="businessName" name="BusinessName" ng-model="model.businessName"
+                                       class="form-control" api-field />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Choose Your Plan</h3>
+                </div>
+                <div class="box-body">
+                    <div class="radio radio-block" ng-if="!model.ownedBusiness" ng-click="changedPlan()">
+                        <label>
+                            <input type="radio" ng-model="model.plan" name="PlanType" value="free">
+                            Free
+                            <span>For personal users to share with 1 other user.</span>
+                            <span>- Limit 2 users (including you)</span>
+                            <span>- Limit 2 collections</span>
+                            <span class="bottom-line">
+                                Free forever
+                            </span>
+                        </label>
+                    </div>
+                    <div class="radio radio-block" ng-if="!model.ownedBusiness" ng-click="changedPlan()">
+                        <label>
+                            <input type="radio" ng-model="model.plan" name="PlanType" value="families">
+                            Families
+                            <span>For personal use, to share with family &amp; friends.</span>
+                            <span>- Add and share with up to 5 users</span>
+                            <span>- Create unlimited collections</span>
+                            <span>- 1 GB encrypted file storage</span>
+                            <span>- Self-hosting (optional)</span>
+                            <span>- Priority customer support</span>
+                            <span>- 7 day free trial, cancel anytime</span>
+                            <span class="bottom-line">
+                                {{plans.families.basePrice | currency:'$'}} /month includes {{plans.families.baseSeats}} users
+                            </span>
+                        </label>
+                    </div>
+                    <div class="radio radio-block" ng-click="changedPlan()">
+                        <label>
+                            <input type="radio" ng-model="model.plan" name="PlanType" value="teams">
+                            Teams
+                            <span>For businesses and other team organizations.</span>
+                            <span>- Add and share with unlimited users</span>
+                            <span>- Create unlimited collections</span>
+                            <span>- 1 GB encrypted file storage</span>
+                            <span>- Priority customer support</span>
+                            <span>- 7 day free trial, cancel anytime</span>
+                            <span class="bottom-line">
+                                {{plans.teams.basePrice | currency:'$'}} /month includes {{plans.teams.baseSeats}} users,
+                                additional users {{plans.teams.seatPrice | currency:'$'}} /month
+                            </span>
+                        </label>
+                    </div>
+                    <div class="radio radio-block" ng-click="changedPlan()">
+                        <label>
+                            <input type="radio" ng-model="model.plan" name="PlanType" value="enterprise">
+                            Enterprise
+                            <span>For businesses and other large organizations.</span>
+                            <span>- Add and share with unlimited users</span>
+                            <span>- Create unlimited collections</span>
+                            <span>- 1 GB encrypted file storage</span>
+                            <span>- Control user access with groups</span>
+                            <span>- Sync your users and groups from a directory (AD, Azure AD, GSuite, LDAP)</span>
+                            <span>- On-premise hosting (optional)</span>
+                            <span>- Priority customer support</span>
+                            <span>- 7 day free trial, cancel anytime</span>
+                            <span class="bottom-line">
+                                {{plans.enterprise.seatPrice | currency:'$'}} per user /month
+                            </span>
+                        </label>
+                    </div>
+                </div>
+                <div class="box-footer" ng-show="plans[model.plan].noPayment">
+                    <button type="submit" class="btn btn-primary btn-flat" ng-disabled="createOrgForm.$loading">
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="createOrgForm.$loading"></i>Submit
+                    </button>
+                </div>
+            </div>
+            <div class="box box-default" ng-if="!plans[model.plan].noAdditionalSeats && plans[model.plan].baseSeats">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Additional Users (Seats)</h3>
+                </div>
+                <div class="box-body">
+                    <p>
+                        Your plan comes with <b>{{plans[model.plan].baseSeats}}</b> users (seats). You can add additional users
+                        <span ng-if="plans[model.plan].maxAdditionalSeats">
+                            (up to {{plans[model.plan].maxAdditionalSeats}} more)
+                        </span>
+                        for {{plans[model.plan].seatPrice | currency:'$'}} per user /month.
+                    </p>
+                    <div class="row">
+                        <div class="col-md-4">
+                            <div class="form-group" show-errors style="margin: 0;">
+                                <label for="additionalSeats" class="sr-only">Additional Users</label>
+                                <input type="number" id="additionalSeats" name="AdditionalSeats" ng-model="model.additionalSeats"
+                                       min="0" class="form-control" placeholder="# of users" api-field
+                                       ng-attr-max="{{plans[model.plan].maxAdditionalSeats || 1000000}}" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="box box-default" ng-if="!plans[model.plan].noAdditionalSeats && !plans[model.plan].baseSeats">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Users (Seats)</h3>
+                </div>
+                <div class="box-body">
+                    <p>
+                        How many user seats do you need?
+                        You can also add additional seats later if needed.
+                    </p>
+                    <div class="row">
+                        <div class="col-md-4">
+                            <div class="form-group" show-errors style="margin: 0;">
+                                <label for="additionalSeats" class="sr-only">Users</label>
+                                <input type="number" id="additionalSeats" name="AdditionalSeats" ng-model="model.additionalSeats"
+                                       min="1" class="form-control" placeholder="# of users" api-field
+                                       ng-attr-max="{{plans[model.plan].maxAdditionalSeats || 1000000}}" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="box box-default" ng-if="!plans[model.plan].noPayment">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Additional Storage</h3>
+                </div>
+                <div class="box-body">
+                    <div class="form-group" show-errors style="margin: 0;">
+                        <p>
+                            Your plan comes with 1 GB of encrypted file storage. You can add additional
+                            storage for {{storageGb.price | currency:"$":2}} per GB /month.
+                        </p>
+                        <div class="row">
+                            <div class="col-md-4">
+                                <label for="additionalStorage" class="sr-only">Storage</label>
+                                <input type="number" id="additionalStorage" name="AdditionalStorageGb"
+                                       ng-model="model.additionalStorageGb" min="0" max="99" step="1" class="form-control"
+                                       placeholder="# of additional GB" api-field />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="box box-default" ng-if="!plans[model.plan].noPayment">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Billing Summary</h3>
+                </div>
+                <div class="box-body">
+                    <div class="radio radio-block">
+                        <label>
+                            <input type="radio" ng-model="model.interval" name="BillingInterval" value="year">
+                            Annually
+                            <span ng-if="plans[model.plan].annualBasePrice">
+                                Base price:
+                                {{plans[model.plan].basePrice | currency:"$":2}} &times;12 mo. =
+                                {{plans[model.plan].annualBasePrice | currency:"$":2}} /year
+                            </span>
+                            <span>
+                                <span ng-if="plans[model.plan].baseSeats">Additional users:</span>
+                                <span ng-if="!plans[model.plan].baseSeats">Users:</span>
+                                {{model.additionalSeats || 0}} &times;{{plans[model.plan].seatPrice | currency:"$":2}}
+                                &times;12 mo. =
+                                {{((model.additionalSeats || 0) * plans[model.plan].annualSeatPrice) | currency:"$":2}} /year
+                            </span>
+                            <span>
+                                Additional storage:
+                                {{model.additionalStorageGb || 0}} GB &times; {{storageGb.price | currency:"$":2}}
+                                &times;12 mo. =
+                                {{(model.additionalStorageGb || 0) * storageGb.yearlyPrice | currency:"$":2}} /year
+                            </span>
+                        </label>
+                    </div>
+                    <div class="radio radio-block" ng-if="model.plan !== 'families'">
+                        <label>
+                            <input type="radio" ng-model="model.interval" name="BillingInterval" value="month">
+                            Monthly
+                            <span ng-if="plans[model.plan].monthlyBasePrice">
+                                Base price:
+                                {{plans[model.plan].monthlyBasePrice | currency:"$":2}} /month
+                            </span>
+                            <span>
+                                <span ng-if="plans[model.plan].baseSeats">Additional users:</span>
+                                <span ng-if="!plans[model.plan].baseSeats">Users:</span>
+                                {{model.additionalSeats || 0}}
+                                &times;{{plans[model.plan].monthlySeatPrice | currency:"$":2}} =
+                                {{((model.additionalSeats || 0) * plans[model.plan].monthlySeatPrice) | currency:"$":2}} /month
+                            </span>
+                            <span>
+                                Additional storage:
+                                {{model.additionalStorageGb || 0}} GB &times; {{storageGb.monthlyPrice | currency:"$":2}} =
+                                {{(model.additionalStorageGb || 0) * storageGb.monthlyPrice | currency:"$":2}} /month
+                            </span>
+                        </label>
+                    </div>
+                </div>
+                <div class="box-footer">
+                    <h4>
+                        <b>Total:</b>
+                        {{totalPrice() | currency:"USD $":2}} /{{model.interval}}
+                    </h4>
+                    Your plan comes with a free 7 day trial. Your card will not be charged until the trial has ended.
+                    You may cancel at any time.
+                </div>
+            </div>
+            <div class="box box-default" ng-if="!plans[model.plan].noPayment">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Payment Information</h3>
+                </div>
+                <div class="box-body">
+                    <label class="radio-inline radio-lg radio-boxed">
+                        <input type="radio" name="PaymentMethod" value="card" ng-model="paymentMethod"
+                               ng-change="changePaymentMethod('card')">
+                        <i class="fa fa-fw fa-credit-card"></i> Credit Card
+                    </label>
+                    <label class="radio-inline radio-lg radio-boxed">
+                        <input type="radio" name="PaymentMethod" value="bank" ng-model="paymentMethod"
+                               ng-change="changePaymentMethod('bank')">
+                        <i class="fa fa-fw fa-bank"></i> Bank<span class="hidden-xs"> Account (ACH)</span>
+                    </label>
+                    <hr />
+                    <div ng-if="paymentMethod === 'bank'">
+                        <div class="callout callout-warning">
+                            <h4><i class="fa fa-warning"></i> You must verify your bank account</h4>
+                            <p>
+                                Payment with a bank account is <u>only available to customers in the United States</u>.
+                                You will be required to verify your bank account. We will make two micro-deposits within the next
+                                1-2 business days. Enter these amounts in the organization's billing area to verify the bank account.
+                                Failure to verify the bank account will result in a missed payment and your organization being
+                                disabled.
+                            </p>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-5 col-sm-6">
+                                <div class="form-group">
+                                    <label for="routing_number">Routing Number</label>
+                                    <input type="text" id="routing_number" name="routing_number"
+                                           ng-model="model.bank.routing_number" class="form-control" required />
+                                </div>
+                            </div>
+                            <div class="col-lg-5 col-sm-6">
+                                <div class="form-group">
+                                    <label for="account_number">Account Number</label>
+                                    <input type="text" id="account_number" name="account_number"
+                                           ng-model="model.bank.account_number" class="form-control" required />
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-lg-5 col-sm-6">
+                                <div class="form-group">
+                                    <label for="account_holder_name">Account Holder Name</label>
+                                    <input type="text" id="account_holder_name" name="account_holder_name"
+                                           ng-model="model.bank.account_holder_name" class="form-control" required />
+                                </div>
+                            </div>
+                            <div class="col-lg-5 col-sm-6">
+                                <div class="form-group">
+                                    <label for="account_holder_type">Account Type</label>
+                                    <select id="account_holder_type" class="form-control" name="account_holder_type"
+                                            ng-model="model.bank.account_holder_type" required>
+                                        <option value="">-- Select --</option>
+                                        <option value="company">Company (Business)</option>
+                                        <option value="individual">Individual (Personal)</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div ng-if="paymentMethod === 'card'">
+                        <div class="row">
+                            <div class="col-md-5">
+                                <div class="form-group" show-errors>
+                                    <label for="card_number">Card Number</label>
+                                    <input type="text" id="card_number" name="card_number" ng-model="model.card.number"
+                                           class="form-control" cc-number required api-field autocomplete="cc-number" />
+                                </div>
+                            </div>
+                            <div class="col-md-7">
+                                <br class="hidden-sm hidden-xs" />
+                                <ul class="list-inline" style="margin: 0;">
+                                    <li><div class="cc visa"></div></li>
+                                    <li><div class="cc mastercard"></div></li>
+                                    <li><div class="cc amex"></div></li>
+                                    <li><div class="cc discover"></div></li>
+                                    <li><div class="cc diners"></div></li>
+                                    <li><div class="cc jcb"></div></li>
+                                </ul>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-4">
+                                <div class="form-group" show-errors>
+                                    <label for="exp_month">Expiration Month</label>
+                                    <select id="exp_month" class="form-control" ng-model="model.card.exp_month" required cc-exp-month
+                                            name="exp_month" api-field autocomplete="cc-exp-month">
+                                        <option value="">-- Select --</option>
+                                        <option value="01">01 - January</option>
+                                        <option value="02">02 - February</option>
+                                        <option value="03">03 - March</option>
+                                        <option value="04">04 - April</option>
+                                        <option value="05">05 - May</option>
+                                        <option value="06">06 - June</option>
+                                        <option value="07">07 - July</option>
+                                        <option value="08">08 - August</option>
+                                        <option value="09">09 - September</option>
+                                        <option value="10">10 - October</option>
+                                        <option value="11">11 - November</option>
+                                        <option value="12">12 - December</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-4">
+                                <div class="form-group" show-errors>
+                                    <label for="exp_year">Expiration Year</label>
+                                    <select id="exp_year" class="form-control" ng-model="model.card.exp_year" required cc-exp-year
+                                            name="exp_year" api-field autocomplete="cc-exp-year">
+                                        <option value="">-- Select --</option>
+                                        <option value="17">2017</option>
+                                        <option value="18">2018</option>
+                                        <option value="19">2019</option>
+                                        <option value="20">2020</option>
+                                        <option value="21">2021</option>
+                                        <option value="22">2022</option>
+                                        <option value="23">2023</option>
+                                        <option value="24">2024</option>
+                                        <option value="25">2025</option>
+                                        <option value="26">2026</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-4">
+                                <div class="form-group" show-errors>
+                                    <label for="cvc">
+                                        CVC
+                                        <a href="https://www.cvvnumber.com/cvv.html" target="_blank" title="What is this?"
+                                           rel="noopener noreferrer">
+                                            <i class="fa fa-question-circle"></i>
+                                        </a>
+                                    </label>
+                                    <input type="text" id="cvc" ng-model="model.card.cvc" class="form-control" name="cvc"
+                                           cc-type="number.$ccType" cc-cvc required api-field autocomplete="cc-csc" />
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-6">
+                                <div class="form-group" show-errors>
+                                    <label for="address_country">Country</label>
+                                    <select id="address_country" class="form-control" ng-model="model.card.address_country"
+                                            required name="address_country" api-field autocomplete="country">
+                                        <option value="">-- Select --</option>
+                                        <option value="US">United States</option>
+                                        <option value="CN">China</option>
+                                        <option value="FR">France</option>
+                                        <option value="DE">Germany</option>
+                                        <option value="CA">Canada</option>
+                                        <option value="GB">United Kingdom</option>
+                                        <option value="AU">Australia</option>
+                                        <option value="IN">India</option>
+                                        <option value="-" disabled></option>
+                                        <option value="AF">Afghanistan</option>
+                                        <option value="AX">Åland Islands</option>
+                                        <option value="AL">Albania</option>
+                                        <option value="DZ">Algeria</option>
+                                        <option value="AS">American Samoa</option>
+                                        <option value="AD">Andorra</option>
+                                        <option value="AO">Angola</option>
+                                        <option value="AI">Anguilla</option>
+                                        <option value="AQ">Antarctica</option>
+                                        <option value="AG">Antigua and Barbuda</option>
+                                        <option value="AR">Argentina</option>
+                                        <option value="AM">Armenia</option>
+                                        <option value="AW">Aruba</option>
+                                        <option value="AT">Austria</option>
+                                        <option value="AZ">Azerbaijan</option>
+                                        <option value="BS">Bahamas</option>
+                                        <option value="BH">Bahrain</option>
+                                        <option value="BD">Bangladesh</option>
+                                        <option value="BB">Barbados</option>
+                                        <option value="BY">Belarus</option>
+                                        <option value="BE">Belgium</option>
+                                        <option value="BZ">Belize</option>
+                                        <option value="BJ">Benin</option>
+                                        <option value="BM">Bermuda</option>
+                                        <option value="BT">Bhutan</option>
+                                        <option value="BO">Bolivia, Plurinational State of</option>
+                                        <option value="BQ">Bonaire, Sint Eustatius and Saba</option>
+                                        <option value="BA">Bosnia and Herzegovina</option>
+                                        <option value="BW">Botswana</option>
+                                        <option value="BV">Bouvet Island</option>
+                                        <option value="BR">Brazil</option>
+                                        <option value="IO">British Indian Ocean Territory</option>
+                                        <option value="BN">Brunei Darussalam</option>
+                                        <option value="BG">Bulgaria</option>
+                                        <option value="BF">Burkina Faso</option>
+                                        <option value="BI">Burundi</option>
+                                        <option value="KH">Cambodia</option>
+                                        <option value="CM">Cameroon</option>
+                                        <option value="CV">Cape Verde</option>
+                                        <option value="KY">Cayman Islands</option>
+                                        <option value="CF">Central African Republic</option>
+                                        <option value="TD">Chad</option>
+                                        <option value="CL">Chile</option>
+                                        <option value="CX">Christmas Island</option>
+                                        <option value="CC">Cocos (Keeling) Islands</option>
+                                        <option value="CO">Colombia</option>
+                                        <option value="KM">Comoros</option>
+                                        <option value="CG">Congo</option>
+                                        <option value="CD">Congo, the Democratic Republic of the</option>
+                                        <option value="CK">Cook Islands</option>
+                                        <option value="CR">Costa Rica</option>
+                                        <option value="CI">Côte d'Ivoire</option>
+                                        <option value="HR">Croatia</option>
+                                        <option value="CU">Cuba</option>
+                                        <option value="CW">Curaçao</option>
+                                        <option value="CY">Cyprus</option>
+                                        <option value="CZ">Czech Republic</option>
+                                        <option value="DK">Denmark</option>
+                                        <option value="DJ">Djibouti</option>
+                                        <option value="DM">Dominica</option>
+                                        <option value="DO">Dominican Republic</option>
+                                        <option value="EC">Ecuador</option>
+                                        <option value="EG">Egypt</option>
+                                        <option value="SV">El Salvador</option>
+                                        <option value="GQ">Equatorial Guinea</option>
+                                        <option value="ER">Eritrea</option>
+                                        <option value="EE">Estonia</option>
+                                        <option value="ET">Ethiopia</option>
+                                        <option value="FK">Falkland Islands (Malvinas)</option>
+                                        <option value="FO">Faroe Islands</option>
+                                        <option value="FJ">Fiji</option>
+                                        <option value="FI">Finland</option>
+                                        <option value="GF">French Guiana</option>
+                                        <option value="PF">French Polynesia</option>
+                                        <option value="TF">French Southern Territories</option>
+                                        <option value="GA">Gabon</option>
+                                        <option value="GM">Gambia</option>
+                                        <option value="GE">Georgia</option>
+                                        <option value="GH">Ghana</option>
+                                        <option value="GI">Gibraltar</option>
+                                        <option value="GR">Greece</option>
+                                        <option value="GL">Greenland</option>
+                                        <option value="GD">Grenada</option>
+                                        <option value="GP">Guadeloupe</option>
+                                        <option value="GU">Guam</option>
+                                        <option value="GT">Guatemala</option>
+                                        <option value="GG">Guernsey</option>
+                                        <option value="GN">Guinea</option>
+                                        <option value="GW">Guinea-Bissau</option>
+                                        <option value="GY">Guyana</option>
+                                        <option value="HT">Haiti</option>
+                                        <option value="HM">Heard Island and McDonald Islands</option>
+                                        <option value="VA">Holy See (Vatican City State)</option>
+                                        <option value="HN">Honduras</option>
+                                        <option value="HK">Hong Kong</option>
+                                        <option value="HU">Hungary</option>
+                                        <option value="IS">Iceland</option>
+                                        <option value="ID">Indonesia</option>
+                                        <option value="IR">Iran, Islamic Republic of</option>
+                                        <option value="IQ">Iraq</option>
+                                        <option value="IE">Ireland</option>
+                                        <option value="IM">Isle of Man</option>
+                                        <option value="IL">Israel</option>
+                                        <option value="IT">Italy</option>
+                                        <option value="JM">Jamaica</option>
+                                        <option value="JP">Japan</option>
+                                        <option value="JE">Jersey</option>
+                                        <option value="JO">Jordan</option>
+                                        <option value="KZ">Kazakhstan</option>
+                                        <option value="KE">Kenya</option>
+                                        <option value="KI">Kiribati</option>
+                                        <option value="KP">Korea, Democratic People's Republic of</option>
+                                        <option value="KR">Korea, Republic of</option>
+                                        <option value="KW">Kuwait</option>
+                                        <option value="KG">Kyrgyzstan</option>
+                                        <option value="LA">Lao People's Democratic Republic</option>
+                                        <option value="LV">Latvia</option>
+                                        <option value="LB">Lebanon</option>
+                                        <option value="LS">Lesotho</option>
+                                        <option value="LR">Liberia</option>
+                                        <option value="LY">Libya</option>
+                                        <option value="LI">Liechtenstein</option>
+                                        <option value="LT">Lithuania</option>
+                                        <option value="LU">Luxembourg</option>
+                                        <option value="MO">Macao</option>
+                                        <option value="MK">Macedonia, the former Yugoslav Republic of</option>
+                                        <option value="MG">Madagascar</option>
+                                        <option value="MW">Malawi</option>
+                                        <option value="MY">Malaysia</option>
+                                        <option value="MV">Maldives</option>
+                                        <option value="ML">Mali</option>
+                                        <option value="MT">Malta</option>
+                                        <option value="MH">Marshall Islands</option>
+                                        <option value="MQ">Martinique</option>
+                                        <option value="MR">Mauritania</option>
+                                        <option value="MU">Mauritius</option>
+                                        <option value="YT">Mayotte</option>
+                                        <option value="MX">Mexico</option>
+                                        <option value="FM">Micronesia, Federated States of</option>
+                                        <option value="MD">Moldova, Republic of</option>
+                                        <option value="MC">Monaco</option>
+                                        <option value="MN">Mongolia</option>
+                                        <option value="ME">Montenegro</option>
+                                        <option value="MS">Montserrat</option>
+                                        <option value="MA">Morocco</option>
+                                        <option value="MZ">Mozambique</option>
+                                        <option value="MM">Myanmar</option>
+                                        <option value="NA">Namibia</option>
+                                        <option value="NR">Nauru</option>
+                                        <option value="NP">Nepal</option>
+                                        <option value="NL">Netherlands</option>
+                                        <option value="NC">New Caledonia</option>
+                                        <option value="NZ">New Zealand</option>
+                                        <option value="NI">Nicaragua</option>
+                                        <option value="NE">Niger</option>
+                                        <option value="NG">Nigeria</option>
+                                        <option value="NU">Niue</option>
+                                        <option value="NF">Norfolk Island</option>
+                                        <option value="MP">Northern Mariana Islands</option>
+                                        <option value="NO">Norway</option>
+                                        <option value="OM">Oman</option>
+                                        <option value="PK">Pakistan</option>
+                                        <option value="PW">Palau</option>
+                                        <option value="PS">Palestinian Territory, Occupied</option>
+                                        <option value="PA">Panama</option>
+                                        <option value="PG">Papua New Guinea</option>
+                                        <option value="PY">Paraguay</option>
+                                        <option value="PE">Peru</option>
+                                        <option value="PH">Philippines</option>
+                                        <option value="PN">Pitcairn</option>
+                                        <option value="PL">Poland</option>
+                                        <option value="PT">Portugal</option>
+                                        <option value="PR">Puerto Rico</option>
+                                        <option value="QA">Qatar</option>
+                                        <option value="RE">Réunion</option>
+                                        <option value="RO">Romania</option>
+                                        <option value="RU">Russian Federation</option>
+                                        <option value="RW">Rwanda</option>
+                                        <option value="BL">Saint Barthélemy</option>
+                                        <option value="SH">Saint Helena, Ascension and Tristan da Cunha</option>
+                                        <option value="KN">Saint Kitts and Nevis</option>
+                                        <option value="LC">Saint Lucia</option>
+                                        <option value="MF">Saint Martin (French part)</option>
+                                        <option value="PM">Saint Pierre and Miquelon</option>
+                                        <option value="VC">Saint Vincent and the Grenadines</option>
+                                        <option value="WS">Samoa</option>
+                                        <option value="SM">San Marino</option>
+                                        <option value="ST">Sao Tome and Principe</option>
+                                        <option value="SA">Saudi Arabia</option>
+                                        <option value="SN">Senegal</option>
+                                        <option value="RS">Serbia</option>
+                                        <option value="SC">Seychelles</option>
+                                        <option value="SL">Sierra Leone</option>
+                                        <option value="SG">Singapore</option>
+                                        <option value="SX">Sint Maarten (Dutch part)</option>
+                                        <option value="SK">Slovakia</option>
+                                        <option value="SI">Slovenia</option>
+                                        <option value="SB">Solomon Islands</option>
+                                        <option value="SO">Somalia</option>
+                                        <option value="ZA">South Africa</option>
+                                        <option value="GS">South Georgia and the South Sandwich Islands</option>
+                                        <option value="SS">South Sudan</option>
+                                        <option value="ES">Spain</option>
+                                        <option value="LK">Sri Lanka</option>
+                                        <option value="SD">Sudan</option>
+                                        <option value="SR">Suriname</option>
+                                        <option value="SJ">Svalbard and Jan Mayen</option>
+                                        <option value="SZ">Swaziland</option>
+                                        <option value="SE">Sweden</option>
+                                        <option value="CH">Switzerland</option>
+                                        <option value="SY">Syrian Arab Republic</option>
+                                        <option value="TW">Taiwan, Province of China</option>
+                                        <option value="TJ">Tajikistan</option>
+                                        <option value="TZ">Tanzania, United Republic of</option>
+                                        <option value="TH">Thailand</option>
+                                        <option value="TL">Timor-Leste</option>
+                                        <option value="TG">Togo</option>
+                                        <option value="TK">Tokelau</option>
+                                        <option value="TO">Tonga</option>
+                                        <option value="TT">Trinidad and Tobago</option>
+                                        <option value="TN">Tunisia</option>
+                                        <option value="TR">Turkey</option>
+                                        <option value="TM">Turkmenistan</option>
+                                        <option value="TC">Turks and Caicos Islands</option>
+                                        <option value="TV">Tuvalu</option>
+                                        <option value="UG">Uganda</option>
+                                        <option value="UA">Ukraine</option>
+                                        <option value="AE">United Arab Emirates</option>
+                                        <option value="UM">United States Minor Outlying Islands</option>
+                                        <option value="UY">Uruguay</option>
+                                        <option value="UZ">Uzbekistan</option>
+                                        <option value="VU">Vanuatu</option>
+                                        <option value="VE">Venezuela, Bolivarian Republic of</option>
+                                        <option value="VN">Viet Nam</option>
+                                        <option value="VG">Virgin Islands, British</option>
+                                        <option value="VI">Virgin Islands, U.S.</option>
+                                        <option value="WF">Wallis and Futuna</option>
+                                        <option value="EH">Western Sahara</option>
+                                        <option value="YE">Yemen</option>
+                                        <option value="ZM">Zambia</option>
+                                        <option value="ZW">Zimbabwe</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-4">
+                                <div class="form-group" show-errors>
+                                    <label for="address_zip"
+                                           ng-bind="model.card.address_country === 'US' ? 'Zip Code' : 'Postal Code'"></label>
+                                    <input type="text" id="address_zip" ng-model="model.card.address_zip"
+                                           class="form-control" required name="address_zip" api-field autocomplete="postal-code" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="box-footer">
+                    <button type="submit" class="btn btn-primary btn-flat" ng-disabled="createOrgForm.$loading">
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="createOrgForm.$loading"></i>Submit
+                    </button>
+                </div>
+            </div>
+        </div>
+    </form>
+</section>

web-vault/app/settings/views/settingsDelete.html

@@ -0,0 +1,30 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title" id="deleteAccountModelLabel"><i class="fa fa-trash"></i> Delete Account</h4>
+</div>
+<form name="deleteAccountForm" ng-submit="deleteAccountForm.$valid && submit(model)" api-form="submitPromise">
+    <div class="modal-body">
+        <p>Continue below to delete your account and all associated data.</p>
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning</h4>
+            Deleting your account is permanent. It cannot be undone.
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="deleteAccountForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in deleteAccountForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="model.masterPassword" class="form-control"
+                   required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="deleteAccountForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="deleteAccountForm.$loading"></i>Delete
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsDomains.html

@@ -0,0 +1,117 @@
+<section class="content-header">
+    <h1>Domain Rules</h1>
+</section>
+<section class="content">
+    <p>
+        If you have the same login across multiple different website domains, you can mark the website as "equivalent".
+        "Global" domains are ones already created for you by bitwarden.
+    </p>
+    <form name="customForm" ng-submit="customForm.$valid && saveCustom()" api-form="customPromise" autocomplete="off">
+        <div class="box box-default">
+            <div class="box-header with-border">
+                <h3 class="box-title">Custom <span class="hidden-xs">Equivalent Domains</span></h3>
+                <div class="box-tools">
+                    <button type="button" class="btn btn-primary btn-sm btn-flat" ng-click="addEdit(null)">
+                        <i class="fa fa-fw fa-plus-circle"></i> New Domain
+                    </button>
+                </div>
+            </div>
+            <div class="box-body no-padding">
+                <div class="table-responsive">
+                    <table class="table table-striped table-hover table-vmiddle">
+                        <tbody ng-if="equivalentDomains.length">
+                            <tr ng-repeat="customDomain in equivalentDomains track by $index">
+                                <td style="width: 70px;">
+                                    <div class="btn-group" data-append-to="body">
+                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                            <i class="fa fa-cog"></i> <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu">
+                                            <li>
+                                                <a href="#" stop-click ng-click="addEdit($index)">
+                                                    <i class="fa fa-fw fa-pencil"></i> Edit
+                                                </a>
+                                            </li>
+                                            <li>
+                                                <a href="#" stop-click ng-click="delete($index)" class="text-red">
+                                                    <i class="fa fa-fw fa-trash"></i> Delete
+                                                </a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </td>
+                                <td>{{customDomain}}</td>
+                            </tr>
+                        </tbody>
+                        <tbody ng-if="!equivalentDomains.length">
+                            <tr>
+                                <td>No domains to list.</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="box-footer">
+                <button type="submit" class="btn btn-primary btn-flat" ng-disabled="customForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon" ng-show="customForm.$loading"></i>Save
+                </button>
+            </div>
+        </div>
+    </form>
+
+    <form name="globalForm" ng-submit="globalForm.$valid && saveGlobal()" api-form="globalPromise" autocomplete="off">
+        <div class="box box-default">
+            <div class="box-header with-border">
+                <h3 class="box-title">Global <span class="hidden-xs">Equivalent Domains</span></h3>
+            </div>
+            <div class="box-body no-padding">
+                <div class="table-responsive">
+                    <table class="table table-striped table-hover table-vmiddle">
+                        <tbody ng-if="globalEquivalentDomains.length">
+                            <tr ng-repeat="globalDomain in globalEquivalentDomains">
+                                <td style="width: 70px;">
+                                    <div class="btn-group" data-append-to="body">
+                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                            <i class="fa fa-cog"></i> <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu">
+                                            <li>
+                                                <a href="#" stop-click ng-if="!globalDomain.excluded" 
+                                                   ng-click="toggleExclude(globalDomain)">
+                                                    <i class="fa fa-fw fa-remove"></i> Exclude
+                                                </a>
+                                            </li>
+                                            <li>
+                                                <a href="#" stop-click ng-if="globalDomain.excluded"
+                                                   ng-click="toggleExclude(globalDomain)">
+                                                    <i class="fa fa-fw fa-plus"></i> Include
+                                                </a>
+                                            </li>
+                                            <li>
+                                                <a href="#" stop-click ng-click="customize(globalDomain)">
+                                                    <i class="fa fa-fw fa-cut"></i> Customize
+                                                </a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </td>
+                                <td ng-class="{strike: globalDomain.excluded}">{{::globalDomain.domains}}</td>
+                            </tr>
+                        </tbody>
+                        <tbody ng-if="!globalEquivalentDomains.length">
+                            <tr>
+                                <td>No domains to list.</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="box-footer">
+                <button type="submit" class="btn btn-primary btn-flat" ng-disabled="globalForm.$loading">
+                    <i class="fa fa-refresh fa-spin loading-icon" ng-show="globalForm.$loading"></i>Save
+                </button>
+            </div>
+        </div>
+    </form>
+</section>
+

web-vault/app/settings/views/settingsPremium.html

@@ -0,0 +1,487 @@
+<section class="content-header">
+    <h1>Premium<span class="hidden-xs"> Membership</span><small>get started today!</small></h1>
+</section>
+<section class="content">
+    <form name="form" ng-submit="form.$valid && submit(model, form)" api-form="submitPromise">
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="box box-default">
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-sm-8">
+                        <p>Sign up for a premium membership and get:</p>
+                        <ul class="fa-ul">
+                            <li>
+                                <i class="fa-li fa fa-check text-green"></i>
+                                1 GB of encrypted file storage.
+                            </li>
+                            <li>
+                                <i class="fa-li fa fa-check text-green"></i>
+                                Additional two-step login options such as YubiKey, FIDO U2F, and Duo.
+                            </li>
+                            <li>
+                                <i class="fa-li fa fa-check text-green"></i>
+                                TOTP verification code (2FA) generator for logins in your vault.
+                            </li>
+                            <li>
+                                <i class="fa-li fa fa-check text-green"></i>
+                                Priority customer support.
+                            </li>
+                            <li>
+                                <i class="fa-li fa fa-check text-green"></i>
+                                All future premium features. More coming soon!
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="col-sm-4">
+                        all for just<br />
+                        <span style="font-size: 30px;">{{premiumPrice | currency:"$":0}}</span> /year
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer" ng-if="selfHosted">
+                <a href="https://vault.bitwarden.com/#/?premium=purchase" class="btn btn-primary btn-flat" target="_blank">
+                    Purchase Premium
+                </a>
+            </div>
+        </div>
+        <div ng-if="selfHosted">
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">License</h3>
+                </div>
+                <div class="box-body">
+                    <p>To upgrade your account to a premium membership you need to upload a valid license file.</p>
+                    <div class="form-group" show-error>
+                        <label for="file" class="sr-only">License</label>
+                        <input type="file" id="file" name="file" accept=".json" />
+                        <p class="help-block">
+                            Your license file will be named something like <code>bitwarden_premium_license.json</code>
+                        </p>
+                    </div>
+                </div>
+                <div class="box-footer">
+                    <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+                    </button>
+                </div>
+            </div>
+        </div>
+        <div ng-if="!selfHosted">
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Addons</h3>
+                </div>
+                <div class="box-body">
+                    <div class="form-group" show-errors style="margin: 0;">
+                        <label for="additionalStorage">Storage</label>
+                        <p>
+                            Your plan comes with 1 GB of encrypted file storage. You can add additional
+                            storage for {{storageGbPrice | currency:"$":0}} per GB /year.
+                        </p>
+                        <div class="row">
+                            <div class="col-md-4">
+                                <input type="number" id="additionalStorage" name="AdditionalStorageGb"
+                                       ng-model="model.additionalStorageGb" min="0" max="99" step="1" class="form-control"
+                                       placeholder="# of additional GB" api-field />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Billing Summary</h3>
+                </div>
+                <div class="box-body">
+                    Premium membership:
+                    {{premiumPrice | currency:"$"}}<br />
+                    Additional storage:
+                    {{model.additionalStorageGb || 0}} GB &times; {{storageGbPrice | currency:"$"}} =
+                    {{(model.additionalStorageGb || 0) * storageGbPrice | currency:"$"}}
+                </div>
+                <div class="box-footer">
+                    <h4>
+                        <b>Total:</b>
+                        {{totalPrice() | currency:"USD $"}} /year
+                    </h4>
+                    Your card will be charged immediately and on a recurring basis each year. You may cancel at any time.
+                </div>
+            </div>
+            <div class="box box-default">
+                <div class="box-header with-border">
+                    <h3 class="box-title">Payment Information</h3>
+                </div>
+                <div class="box-body">
+                    <label class="radio-inline radio-lg radio-boxed">
+                        <input type="radio" name="PaymentMethod" value="card" ng-model="paymentMethod"
+                               ng-change="changePaymentMethod('card')"><i class="fa fa-fw fa-credit-card"></i> Credit Card
+                    </label>
+                    <label class="radio-inline radio-lg radio-boxed">
+                        <input type="radio" name="PaymentMethod" value="paypal" ng-model="paymentMethod"
+                               ng-change="changePaymentMethod('paypal')"><i class="fa fa-fw fa-paypal"></i> PayPal
+                    </label>
+                    <hr />
+                    <div ng-if="paymentMethod === 'paypal'">
+                        <div id="bt-dropin-container"></div>
+                    </div>
+                    <div ng-if="paymentMethod === 'card'">
+                        <div class="row">
+                            <div class="col-md-5">
+                                <div class="form-group" show-errors>
+                                    <label for="card_number">Card Number</label>
+                                    <input type="text" id="card_number" name="card_number" ng-model="model.card.number"
+                                           class="form-control" cc-number required api-field />
+                                </div>
+                            </div>
+                            <div class="col-md-7">
+                                <br class="hidden-sm hidden-xs" />
+                                <ul class="list-inline" style="margin: 0;">
+                                    <li><div class="cc visa"></div></li>
+                                    <li><div class="cc mastercard"></div></li>
+                                    <li><div class="cc amex"></div></li>
+                                    <li><div class="cc discover"></div></li>
+                                    <li><div class="cc diners"></div></li>
+                                    <li><div class="cc jcb"></div></li>
+                                </ul>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-4">
+                                <div class="form-group" show-errors>
+                                    <label for="exp_month">Expiration Month</label>
+                                    <select id="exp_month" class="form-control" ng-model="model.card.exp_month" required cc-exp-month
+                                            name="exp_month" api-field>
+                                        <option value="">-- Select --</option>
+                                        <option value="01">01 - January</option>
+                                        <option value="02">02 - February</option>
+                                        <option value="03">03 - March</option>
+                                        <option value="04">04 - April</option>
+                                        <option value="05">05 - May</option>
+                                        <option value="06">06 - June</option>
+                                        <option value="07">07 - July</option>
+                                        <option value="08">08 - August</option>
+                                        <option value="09">09 - September</option>
+                                        <option value="10">10 - October</option>
+                                        <option value="11">11 - November</option>
+                                        <option value="12">12 - December</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-4">
+                                <div class="form-group" show-errors>
+                                    <label for="exp_year">Expiration Year</label>
+                                    <select id="exp_year" class="form-control" ng-model="model.card.exp_year" required cc-exp-year
+                                            name="exp_year" api-field>
+                                        <option value="">-- Select --</option>
+                                        <option value="17">2017</option>
+                                        <option value="18">2018</option>
+                                        <option value="19">2019</option>
+                                        <option value="20">2020</option>
+                                        <option value="21">2021</option>
+                                        <option value="22">2022</option>
+                                        <option value="23">2023</option>
+                                        <option value="24">2024</option>
+                                        <option value="25">2025</option>
+                                        <option value="26">2026</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-4">
+                                <div class="form-group" show-errors>
+                                    <label for="cvc">
+                                        CVC
+                                        <a href="https://www.cvvnumber.com/cvv.html" target="_blank" title="What is this?"
+                                           rel="noopener noreferrer">
+                                            <i class="fa fa-question-circle"></i>
+                                        </a>
+                                    </label>
+                                    <input type="text" id="cvc" ng-model="model.card.cvc" class="form-control" name="cvc"
+                                           cc-type="number.$ccType" cc-cvc required api-field />
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-6">
+                                <div class="form-group" show-errors>
+                                    <label for="address_country">Country</label>
+                                    <select id="address_country" class="form-control" ng-model="model.card.address_country"
+                                            required name="address_country" api-field>
+                                        <option value="">-- Select --</option>
+                                        <option value="US">United States</option>
+                                        <option value="CN">China</option>
+                                        <option value="FR">France</option>
+                                        <option value="DE">Germany</option>
+                                        <option value="CA">Canada</option>
+                                        <option value="GB">United Kingdom</option>
+                                        <option value="AU">Australia</option>
+                                        <option value="IN">India</option>
+                                        <option value="-" disabled></option>
+                                        <option value="AF">Afghanistan</option>
+                                        <option value="AX">Åland Islands</option>
+                                        <option value="AL">Albania</option>
+                                        <option value="DZ">Algeria</option>
+                                        <option value="AS">American Samoa</option>
+                                        <option value="AD">Andorra</option>
+                                        <option value="AO">Angola</option>
+                                        <option value="AI">Anguilla</option>
+                                        <option value="AQ">Antarctica</option>
+                                        <option value="AG">Antigua and Barbuda</option>
+                                        <option value="AR">Argentina</option>
+                                        <option value="AM">Armenia</option>
+                                        <option value="AW">Aruba</option>
+                                        <option value="AT">Austria</option>
+                                        <option value="AZ">Azerbaijan</option>
+                                        <option value="BS">Bahamas</option>
+                                        <option value="BH">Bahrain</option>
+                                        <option value="BD">Bangladesh</option>
+                                        <option value="BB">Barbados</option>
+                                        <option value="BY">Belarus</option>
+                                        <option value="BE">Belgium</option>
+                                        <option value="BZ">Belize</option>
+                                        <option value="BJ">Benin</option>
+                                        <option value="BM">Bermuda</option>
+                                        <option value="BT">Bhutan</option>
+                                        <option value="BO">Bolivia, Plurinational State of</option>
+                                        <option value="BQ">Bonaire, Sint Eustatius and Saba</option>
+                                        <option value="BA">Bosnia and Herzegovina</option>
+                                        <option value="BW">Botswana</option>
+                                        <option value="BV">Bouvet Island</option>
+                                        <option value="BR">Brazil</option>
+                                        <option value="IO">British Indian Ocean Territory</option>
+                                        <option value="BN">Brunei Darussalam</option>
+                                        <option value="BG">Bulgaria</option>
+                                        <option value="BF">Burkina Faso</option>
+                                        <option value="BI">Burundi</option>
+                                        <option value="KH">Cambodia</option>
+                                        <option value="CM">Cameroon</option>
+                                        <option value="CV">Cape Verde</option>
+                                        <option value="KY">Cayman Islands</option>
+                                        <option value="CF">Central African Republic</option>
+                                        <option value="TD">Chad</option>
+                                        <option value="CL">Chile</option>
+                                        <option value="CX">Christmas Island</option>
+                                        <option value="CC">Cocos (Keeling) Islands</option>
+                                        <option value="CO">Colombia</option>
+                                        <option value="KM">Comoros</option>
+                                        <option value="CG">Congo</option>
+                                        <option value="CD">Congo, the Democratic Republic of the</option>
+                                        <option value="CK">Cook Islands</option>
+                                        <option value="CR">Costa Rica</option>
+                                        <option value="CI">Côte d'Ivoire</option>
+                                        <option value="HR">Croatia</option>
+                                        <option value="CU">Cuba</option>
+                                        <option value="CW">Curaçao</option>
+                                        <option value="CY">Cyprus</option>
+                                        <option value="CZ">Czech Republic</option>
+                                        <option value="DK">Denmark</option>
+                                        <option value="DJ">Djibouti</option>
+                                        <option value="DM">Dominica</option>
+                                        <option value="DO">Dominican Republic</option>
+                                        <option value="EC">Ecuador</option>
+                                        <option value="EG">Egypt</option>
+                                        <option value="SV">El Salvador</option>
+                                        <option value="GQ">Equatorial Guinea</option>
+                                        <option value="ER">Eritrea</option>
+                                        <option value="EE">Estonia</option>
+                                        <option value="ET">Ethiopia</option>
+                                        <option value="FK">Falkland Islands (Malvinas)</option>
+                                        <option value="FO">Faroe Islands</option>
+                                        <option value="FJ">Fiji</option>
+                                        <option value="FI">Finland</option>
+                                        <option value="GF">French Guiana</option>
+                                        <option value="PF">French Polynesia</option>
+                                        <option value="TF">French Southern Territories</option>
+                                        <option value="GA">Gabon</option>
+                                        <option value="GM">Gambia</option>
+                                        <option value="GE">Georgia</option>
+                                        <option value="GH">Ghana</option>
+                                        <option value="GI">Gibraltar</option>
+                                        <option value="GR">Greece</option>
+                                        <option value="GL">Greenland</option>
+                                        <option value="GD">Grenada</option>
+                                        <option value="GP">Guadeloupe</option>
+                                        <option value="GU">Guam</option>
+                                        <option value="GT">Guatemala</option>
+                                        <option value="GG">Guernsey</option>
+                                        <option value="GN">Guinea</option>
+                                        <option value="GW">Guinea-Bissau</option>
+                                        <option value="GY">Guyana</option>
+                                        <option value="HT">Haiti</option>
+                                        <option value="HM">Heard Island and McDonald Islands</option>
+                                        <option value="VA">Holy See (Vatican City State)</option>
+                                        <option value="HN">Honduras</option>
+                                        <option value="HK">Hong Kong</option>
+                                        <option value="HU">Hungary</option>
+                                        <option value="IS">Iceland</option>
+                                        <option value="ID">Indonesia</option>
+                                        <option value="IR">Iran, Islamic Republic of</option>
+                                        <option value="IQ">Iraq</option>
+                                        <option value="IE">Ireland</option>
+                                        <option value="IM">Isle of Man</option>
+                                        <option value="IL">Israel</option>
+                                        <option value="IT">Italy</option>
+                                        <option value="JM">Jamaica</option>
+                                        <option value="JP">Japan</option>
+                                        <option value="JE">Jersey</option>
+                                        <option value="JO">Jordan</option>
+                                        <option value="KZ">Kazakhstan</option>
+                                        <option value="KE">Kenya</option>
+                                        <option value="KI">Kiribati</option>
+                                        <option value="KP">Korea, Democratic People's Republic of</option>
+                                        <option value="KR">Korea, Republic of</option>
+                                        <option value="KW">Kuwait</option>
+                                        <option value="KG">Kyrgyzstan</option>
+                                        <option value="LA">Lao People's Democratic Republic</option>
+                                        <option value="LV">Latvia</option>
+                                        <option value="LB">Lebanon</option>
+                                        <option value="LS">Lesotho</option>
+                                        <option value="LR">Liberia</option>
+                                        <option value="LY">Libya</option>
+                                        <option value="LI">Liechtenstein</option>
+                                        <option value="LT">Lithuania</option>
+                                        <option value="LU">Luxembourg</option>
+                                        <option value="MO">Macao</option>
+                                        <option value="MK">Macedonia, the former Yugoslav Republic of</option>
+                                        <option value="MG">Madagascar</option>
+                                        <option value="MW">Malawi</option>
+                                        <option value="MY">Malaysia</option>
+                                        <option value="MV">Maldives</option>
+                                        <option value="ML">Mali</option>
+                                        <option value="MT">Malta</option>
+                                        <option value="MH">Marshall Islands</option>
+                                        <option value="MQ">Martinique</option>
+                                        <option value="MR">Mauritania</option>
+                                        <option value="MU">Mauritius</option>
+                                        <option value="YT">Mayotte</option>
+                                        <option value="MX">Mexico</option>
+                                        <option value="FM">Micronesia, Federated States of</option>
+                                        <option value="MD">Moldova, Republic of</option>
+                                        <option value="MC">Monaco</option>
+                                        <option value="MN">Mongolia</option>
+                                        <option value="ME">Montenegro</option>
+                                        <option value="MS">Montserrat</option>
+                                        <option value="MA">Morocco</option>
+                                        <option value="MZ">Mozambique</option>
+                                        <option value="MM">Myanmar</option>
+                                        <option value="NA">Namibia</option>
+                                        <option value="NR">Nauru</option>
+                                        <option value="NP">Nepal</option>
+                                        <option value="NL">Netherlands</option>
+                                        <option value="NC">New Caledonia</option>
+                                        <option value="NZ">New Zealand</option>
+                                        <option value="NI">Nicaragua</option>
+                                        <option value="NE">Niger</option>
+                                        <option value="NG">Nigeria</option>
+                                        <option value="NU">Niue</option>
+                                        <option value="NF">Norfolk Island</option>
+                                        <option value="MP">Northern Mariana Islands</option>
+                                        <option value="NO">Norway</option>
+                                        <option value="OM">Oman</option>
+                                        <option value="PK">Pakistan</option>
+                                        <option value="PW">Palau</option>
+                                        <option value="PS">Palestinian Territory, Occupied</option>
+                                        <option value="PA">Panama</option>
+                                        <option value="PG">Papua New Guinea</option>
+                                        <option value="PY">Paraguay</option>
+                                        <option value="PE">Peru</option>
+                                        <option value="PH">Philippines</option>
+                                        <option value="PN">Pitcairn</option>
+                                        <option value="PL">Poland</option>
+                                        <option value="PT">Portugal</option>
+                                        <option value="PR">Puerto Rico</option>
+                                        <option value="QA">Qatar</option>
+                                        <option value="RE">Réunion</option>
+                                        <option value="RO">Romania</option>
+                                        <option value="RU">Russian Federation</option>
+                                        <option value="RW">Rwanda</option>
+                                        <option value="BL">Saint Barthélemy</option>
+                                        <option value="SH">Saint Helena, Ascension and Tristan da Cunha</option>
+                                        <option value="KN">Saint Kitts and Nevis</option>
+                                        <option value="LC">Saint Lucia</option>
+                                        <option value="MF">Saint Martin (French part)</option>
+                                        <option value="PM">Saint Pierre and Miquelon</option>
+                                        <option value="VC">Saint Vincent and the Grenadines</option>
+                                        <option value="WS">Samoa</option>
+                                        <option value="SM">San Marino</option>
+                                        <option value="ST">Sao Tome and Principe</option>
+                                        <option value="SA">Saudi Arabia</option>
+                                        <option value="SN">Senegal</option>
+                                        <option value="RS">Serbia</option>
+                                        <option value="SC">Seychelles</option>
+                                        <option value="SL">Sierra Leone</option>
+                                        <option value="SG">Singapore</option>
+                                        <option value="SX">Sint Maarten (Dutch part)</option>
+                                        <option value="SK">Slovakia</option>
+                                        <option value="SI">Slovenia</option>
+                                        <option value="SB">Solomon Islands</option>
+                                        <option value="SO">Somalia</option>
+                                        <option value="ZA">South Africa</option>
+                                        <option value="GS">South Georgia and the South Sandwich Islands</option>
+                                        <option value="SS">South Sudan</option>
+                                        <option value="ES">Spain</option>
+                                        <option value="LK">Sri Lanka</option>
+                                        <option value="SD">Sudan</option>
+                                        <option value="SR">Suriname</option>
+                                        <option value="SJ">Svalbard and Jan Mayen</option>
+                                        <option value="SZ">Swaziland</option>
+                                        <option value="SE">Sweden</option>
+                                        <option value="CH">Switzerland</option>
+                                        <option value="SY">Syrian Arab Republic</option>
+                                        <option value="TW">Taiwan, Province of China</option>
+                                        <option value="TJ">Tajikistan</option>
+                                        <option value="TZ">Tanzania, United Republic of</option>
+                                        <option value="TH">Thailand</option>
+                                        <option value="TL">Timor-Leste</option>
+                                        <option value="TG">Togo</option>
+                                        <option value="TK">Tokelau</option>
+                                        <option value="TO">Tonga</option>
+                                        <option value="TT">Trinidad and Tobago</option>
+                                        <option value="TN">Tunisia</option>
+                                        <option value="TR">Turkey</option>
+                                        <option value="TM">Turkmenistan</option>
+                                        <option value="TC">Turks and Caicos Islands</option>
+                                        <option value="TV">Tuvalu</option>
+                                        <option value="UG">Uganda</option>
+                                        <option value="UA">Ukraine</option>
+                                        <option value="AE">United Arab Emirates</option>
+                                        <option value="UM">United States Minor Outlying Islands</option>
+                                        <option value="UY">Uruguay</option>
+                                        <option value="UZ">Uzbekistan</option>
+                                        <option value="VU">Vanuatu</option>
+                                        <option value="VE">Venezuela, Bolivarian Republic of</option>
+                                        <option value="VN">Viet Nam</option>
+                                        <option value="VG">Virgin Islands, British</option>
+                                        <option value="VI">Virgin Islands, U.S.</option>
+                                        <option value="WF">Wallis and Futuna</option>
+                                        <option value="EH">Western Sahara</option>
+                                        <option value="YE">Yemen</option>
+                                        <option value="ZM">Zambia</option>
+                                        <option value="ZW">Zimbabwe</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-4">
+                                <div class="form-group" show-errors>
+                                    <label for="address_zip"
+                                           ng-bind="model.card.address_country === 'US' ? 'Zip Code' : 'Postal Code'"></label>
+                                    <input type="text" id="address_zip" ng-model="model.card.address_zip"
+                                           class="form-control" required name="address_zip" api-field />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="box-footer">
+                    <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+                        <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Submit
+                    </button>
+                </div>
+            </div>
+        </div>
+    </form>
+</section>

web-vault/app/settings/views/settingsPurge.html

@@ -0,0 +1,33 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-trash"></i> Purge Vault</h4>
+</div>
+<form name="form" ng-submit="form.$valid && submit(model)" api-form="submitPromise">
+    <div class="modal-body">
+        <p>
+            Continue below to delete all items in your vault. Items that belong to an organization that you share
+            with will not be deleted.
+        </p>
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning</h4>
+            Purging your vault is permanent. It cannot be undone.
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="model.masterPassword"
+                   class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Purge
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsSessions.html

@@ -0,0 +1,37 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title" id="logoutSessionsModelLabel"><i class="fa fa-ban"></i> Deauthorize Sessions</h4>
+</div>
+<form name="logoutSessionsForm" ng-submit="logoutSessionsForm.$valid && submit(model)" api-form="submitPromise">
+    <div class="modal-body">
+        <p>Concerned your account is logged in on another device?</p>
+        <p>Proceed below to deauthorize all computers or devices that you have previously used.</p>
+        <p>
+            This security step is recommended if you previously used a public PC or accidentally saved your password
+            on a device that isn't yours. This step will also clear all previously remembered two-step login sessions.
+        </p>
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning</h4>
+            Proceeding will also log you out of your current session, requiring you to log back in. You will also be prompted
+            for two-step login again, if enabled. Active sessions on other devices may continue to remain active for up to
+            one hour.
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="logoutSessionsForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in logoutSessionsForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="model.masterPassword" class="form-control"
+                   required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="logoutSessionsForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="logoutSessionsForm.$loading"></i>Deauthorize
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsTwoStep.html

@@ -0,0 +1,52 @@
+<section class="content-header">
+    <h1>Two-step Login <small>secure your account</small></h1>
+</section>
+<section class="content">
+    <div class="box box-danger">
+        <div class="box-header with-border">
+            <h3 class="box-title"><i class="fa fa-warning"></i> Recovery Code <i class="fa fa-warning"></i></h3>
+        </div>
+        <div class="box-body">
+            The recovery code allows you to access your account in the event that you can no longer use your normal
+            two-step login provider (ex. you lose your device). bitwarden support will not be able to assist you if you lose
+            access to your account. We recommend you write down or print the recovery code and keep it in a safe place.
+        </div>
+        <div class="box-footer">
+            <button type="button" class="btn btn-default btn-flat" ng-click="viewRecover()">View Recovery Code</button>
+        </div>
+    </div>
+    <div class="box box-default">
+        <div class="box-header with-border">
+            <h3 class="box-title">Providers</h3>
+        </div>
+        <div class="box-body no-padding">
+            <div class="table-responsive">
+                <table class="table table-striped table-hover table-vmiddle">
+                    <tbody>
+                        <tr ng-repeat="provider in providers | orderBy: 'displayOrder'">
+                            <td style="width: 120px; height: 75px;" align="center">
+                                <a href="#" stop-click ng-click="edit(provider)">
+                                    <img alt="{{::provider.name}}" ng-src="{{'images/two-factor/' + provider.image}}" />
+                                </a>
+                            </td>
+                            <td>
+                                <a href="#" stop-click ng-click="edit(provider)">
+                                    {{::provider.name}}
+                                    <span class="label label-info" ng-if="!premium && !provider.free"
+                                          style="margin-left: 5px;">PREMIUM</span>
+                                </a>
+                                <div class="text-muted text-sm">{{::provider.description}}</div>
+                            </td>
+                            <td style="width: 100px;" class="text-right">
+                                <span class="label label-full"
+                                      ng-class="{ 'label-success': provider.enabled, 'label-default': !provider.enabled }">
+                                    {{provider.enabled ? 'Enabled' : 'Disabled'}}
+                                </span>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</section>

web-vault/app/settings/views/settingsTwoStepAuthenticator.html

@@ -0,0 +1,116 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-key"></i> Two-step Login <small>authenticator app</small>
+    </h4>
+</div>
+<form name="authTwoStepForm" ng-submit="authTwoStepForm.$valid && auth(authModel)" api-form="authPromise"
+      ng-if="!model">
+    <div class="modal-body">
+        <p>Enter your master password to modify two-step login settings.</p>
+        <div class="callout callout-danger validation-errors" ng-show="authTwoStepForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in authTwoStepForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="authModel.masterPassword"
+                   class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="authTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="authTwoStepForm.$loading"></i>Continue
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>
+<form name="submitTwoStepForm" ng-submit="submitTwoStepForm.$valid && submit(updateModel)" api-form="submitPromise"
+      ng-if="model" autocomplete="off">
+    <div class="modal-body">
+        <div ng-if="enabled">
+            <div class="callout callout-success">
+                <h4><i class="fa fa-check-circle"></i> Enabled</h4>
+                <p>
+                    Two-step login via authenticator app is enabled on your account.
+                </p>
+                <p>
+                    In case you need to add it to another device, below is the QR code (or key) required by your
+                    authenticator app.
+                </p>
+            </div>
+            <p>Need a two-step authenticator app? Download one of the following:</p>
+        </div>
+        <div ng-if="!enabled">
+            <p>Setting up two-step login with an authenticator app is easy, just follow these steps:</p>
+            <h4>1. Download a two-step authenticator app</h4>
+        </div>
+        <ul class="fa-ul">
+            <li>
+                <i class="fa-li fa fa-apple fa-lg"></i>
+                iOS devices:
+                <a href="https://itunes.apple.com/us/app/authy/id494168017?mt=8" target="_blank">
+                    Authy for iOS
+                </a>
+            </li>
+            <li>
+                <i class="fa-li fa fa-android fa-lg"></i>
+                Android devices:
+                <a href="https://play.google.com/store/apps/details?id=com.authy.authy" target="_blank">
+                    Authy for Android
+                </a>
+            </li>
+            <li>
+                <i class="fa-li fa fa-windows fa-lg"></i>
+                Windows devices:
+                <a href="https://www.microsoft.com/en-us/store/apps/authenticator/9wzdncrfj3rj" target="_blank">
+                    Microsoft Authenticator
+                </a>
+            </li>
+        </ul>
+        <p>These apps are recommended, however, other authenticator apps will also work.</p>
+        <hr ng-if="enabled" />
+        <h4 ng-if="!enabled" style="margin-top: 30px;">2. Scan this QR code with your authenticator app</h4>
+        <div class="row">
+            <div class="col-sm-4 text-center">
+                <p><img ng-src="{{model.qr}}" alt="QR" /></p>
+            </div>
+            <div class="col-sm-8">
+                <p>
+                    <strong>Can't scan the code?</strong> You can add the code to your application manually using the
+                    following details:
+                </p>
+                <ul class="list-unstyled">
+                    <li><strong>Key:</strong> <code>{{model.key}}</code></li>
+                    <li><strong>Account:</strong> {{account}}</li>
+                    <li><strong>Time based:</strong> Yes</li>
+                </ul>
+            </div>
+        </div>
+        <div ng-if="!enabled">
+            <h4 style="margin-top: 30px;">
+                3. Enter the resulting 6 digit verification code from the app
+            </h4>
+            <div class="callout callout-danger validation-errors" ng-show="submitTwoStepForm.$errors">
+                <h4>Errors have occurred</h4>
+                <ul>
+                    <li ng-repeat="e in submitTwoStepForm.$errors">{{e}}</li>
+                </ul>
+            </div>
+            <div class="form-group" show-errors>
+                <label for="token" class="sr-only">Verification Code</label>
+                <input type="text" id="token" name="Token" placeholder="Verification Code" ng-model="updateModel.token"
+                       class="form-control" required api-field />
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="submitTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="submitTwoStepForm.$loading"></i>
+            {{enabled ? 'Disable' : 'Enable'}}
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsTwoStepDuo.html

@@ -0,0 +1,76 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-key"></i> Two-step Login <small>duo</small>
+    </h4>
+</div>
+<form name="authTwoStepForm" ng-submit="authTwoStepForm.$valid && auth(authModel)" api-form="authPromise"
+      ng-if="!authed">
+    <div class="modal-body">
+        <p>Enter your master password to modify two-step login settings.</p>
+        <div class="callout callout-danger validation-errors" ng-show="authTwoStepForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in authTwoStepForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="authModel.masterPassword"
+                   class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="authTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="authTwoStepForm.$loading"></i>Continue
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>
+<form name="submitTwoStepForm" ng-submit="submitTwoStepForm.$valid && submit(updateModel)" api-form="submitPromise"
+      ng-if="authed" autocomplete="off">
+    <div class="modal-body">
+        <div ng-if="enabled">
+            <div class="callout callout-success">
+                <h4><i class="fa fa-check-circle"></i> Enabled</h4>
+                <p>Two-step log via Duo is enabled on your account.</p>
+            </div>
+            <ul class="list-unstyled">
+                <li><strong>Integration Key:</strong> {{updateModel.ikey}}</li>
+                <li><strong>Secret Key:</strong> ************</li>
+                <li><strong>API Hostname:</strong> {{updateModel.host}}</li>
+            </ul>
+        </div>
+        <div ng-if="!enabled">
+            <div class="callout callout-danger validation-errors" ng-show="submitTwoStepForm.$errors">
+                <h4>Errors have occurred</h4>
+                <ul>
+                    <li ng-repeat="e in submitTwoStepForm.$errors">{{e}}</li>
+                </ul>
+            </div>
+            <p>Enter the bitwarden application information from your Duo Admin panel:</p>
+            <div class="form-group" show-errors>
+                <label for="ikey">Integration Key</label>
+                <input type="text" id="ikey" name="IntegrationKey" ng-model="updateModel.ikey" class="form-control"
+                       required api-field />
+            </div>
+            <div class="form-group" show-errors>
+                <label for="skey">Secret Key</label>
+                <input type="password" id="skey" name="SecretKey" ng-model="updateModel.skey" class="form-control"
+                       required api-field autocomplete="new-password" />
+            </div>
+            <div class="form-group" show-errors>
+                <label for="host">API Hostname</label>
+                <input type="text" id="host" name="Host" placeholder="ex. api-xxxxxxxx.duosecurity.com"
+                       ng-model="updateModel.host" class="form-control" required api-field />
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="submitTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="submitTwoStepForm.$loading"></i>
+            {{enabled ? 'Disable' : 'Enable'}}
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsTwoStepEmail.html

@@ -0,0 +1,77 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-key"></i> Two-step Login <small>email</small>
+    </h4>
+</div>
+<form name="authTwoStepForm" ng-submit="authTwoStepForm.$valid && auth(authModel)" api-form="authPromise"
+      ng-if="!authed">
+    <div class="modal-body">
+        <p>Enter your master password to modify two-step login settings.</p>
+        <div class="callout callout-danger validation-errors" ng-show="authTwoStepForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in authTwoStepForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="authModel.masterPassword"
+                   class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="authTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="authTwoStepForm.$loading"></i>Continue
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>
+<form name="submitTwoStepForm" ng-submit="submitTwoStepForm.$valid && submit(updateModel)" api-form="submitPromise"
+      ng-if="authed" autocomplete="off">
+    <div class="modal-body">
+        <div ng-if="enabled">
+            <div class="callout callout-success">
+                <h4><i class="fa fa-check-circle"></i> Enabled</h4>
+                <p>Two-step log via email is enabled on your account.</p>
+            </div>
+            Email: <strong>{{updateModel.email}}</strong>
+        </div>
+        <div ng-if="!enabled">
+            <div class="callout callout-danger validation-errors" ng-show="submitTwoStepForm.$errors">
+                <h4>Errors have occurred</h4>
+                <ul>
+                    <li ng-repeat="e in submitTwoStepForm.$errors">{{e}}</li>
+                </ul>
+            </div>
+            <p>Setting up two-step login with email is easy, just follow these steps:</p>
+            <h4>1. Enter the email that you wish to receive verification codes</h4>
+            <div class="form-group" show-errors>
+                <label for="token" class="sr-only">Email</label>
+                <input type="text" id="email" name="Email" placeholder="Email" ng-model="updateModel.email"
+                       class="form-control" required api-field />
+            </div>
+            <button type="button" class="btn btn-default btn-flat" ng-click="sendEmail(updateModel)" ng-disabled="emailLoading">
+                <i class="fa fa-refresh fa-spin loading-icon" ng-show="emailLoading"></i>
+                Send Email
+            </button>
+            <span class="text-green" ng-if="emailSuccess">Verification code email was sent.</span>
+            <span class="text-red" ng-if="emailError">An error occurred when trying to send the email.</span>
+            <h4 style="margin-top: 30px;">
+                2. Enter the resulting 6 digit verification code from the email
+            </h4>
+            <div class="form-group" show-errors>
+                <label for="token" class="sr-only">Verification Code</label>
+                <input type="text" id="token" name="Token" placeholder="Verification Code" ng-model="updateModel.token"
+                       class="form-control" required api-field />
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="submitTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="submitTwoStepForm.$loading"></i>
+            {{enabled ? 'Disable' : 'Enable'}}
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsTwoStepRecover.html

@@ -0,0 +1,48 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-key"></i> Two-step Login <small>recovery code</small>
+    </h4>
+</div>
+<form name="authTwoStepForm" ng-submit="authTwoStepForm.$valid && auth(authModel)" api-form="authPromise"
+      ng-if="!authed">
+    <div class="modal-body">
+        <p>Enter your master password to view your recovery code.</p>
+        <div class="callout callout-danger validation-errors" ng-show="authTwoStepForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in authTwoStepForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="authModel.masterPassword"
+                   class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="authTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="authTwoStepForm.$loading"></i>Continue
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>
+<div ng-if="authed">
+    <div class="modal-body text-center">
+        <div ng-if="code">
+            <p>Your two-step login recovery code:</p>
+            <p class="lead"><code class="text-lg">{{code}}</code></p>
+        </div>
+        <div ng-if="!code">
+            You have not enabled any two-step login providers yet. After you have enabled a two-step login provider you can
+            check back here for your recovery code.
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-if="code" ng-click="print()">
+            <i class="fa fa-print"></i>
+            Print Code
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</div>

web-vault/app/settings/views/settingsTwoStepU2f.html

@@ -0,0 +1,93 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-key"></i> Two-step Login <small>fido u2f</small>
+    </h4>
+</div>
+<form name="authTwoStepForm" ng-submit="authTwoStepForm.$valid && auth(authModel)" api-form="authPromise"
+      ng-if="!authed">
+    <div class="modal-body">
+        <p>Enter your master password to modify two-step login settings.</p>
+        <div class="callout callout-danger validation-errors" ng-show="authTwoStepForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in authTwoStepForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="authModel.masterPassword"
+                   class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="authTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="authTwoStepForm.$loading"></i>Continue
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>
+<form name="submitTwoStepForm" ng-submit="submitTwoStepForm.$valid && submit()" api-form="submitPromise"
+      ng-if="authed" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning <i class="fa fa-warning"></i></h4>
+            <p>
+                Due to platform limitations, FIDO U2F cannot be used on all bitwarden applications. You should enable
+                another two-step login provider so that you can access your account when FIDO U2F cannot be used.
+            </p>
+            <p>Supported platforms:</p>
+            <ul>
+                <li>
+                    Web vault on a desktop/laptop with a U2F enabled browser (Chrome, Opera, Vivaldi, Brave, or Firefox with addon).
+                </li>
+                <li>Browser extensions on Chrome, Opera, Vivaldi, or Brave.</li>
+            </ul>
+        </div>
+        <div ng-if="enabled">
+            <div class="callout callout-success">
+                <h4><i class="fa fa-check-circle"></i> Enabled</h4>
+                <p>Two-step log via FIDO U2F is enabled on your account.</p>
+            </div>
+        </div>
+        <div ng-if="!enabled">
+            <div class="callout callout-danger validation-errors" ng-show="submitTwoStepForm.$errors">
+                <h4>Errors have occurred</h4>
+                <ul>
+                    <li ng-repeat="e in submitTwoStepForm.$errors">{{e}}</li>
+                </ul>
+            </div>
+            <p>To add a new FIDO U2F Security Key to your account:</p>
+            <ol>
+                <li>Plug the security key into your computer's USB port.</li>
+                <li>If the security key has a button, touch it.</li>
+            </ol>
+            <hr />
+            <div class="text-center">
+                <div ng-show="deviceListening">
+                    <p><i class="fa fa-spin fa-spinner fa-2x"></i></p>
+                    <p>Waiting for you to touch the button on your security key...</p>
+                </div>
+                <div class="text-green" ng-show="deviceResponse">
+                    <p><i class="fa fa-check-circle fa-2x"></i></p>
+                    <p>Success!</p>
+                    Click the "Enable" button below to enable this security key for two-step login.
+                </div>
+                <div class="text-red" ng-show="deviceError">
+                    <p><i class="fa fa-warning fa-2x"></i></p>
+                    <p>Error!</p>
+                    <p>There was a problem reading the security key.</p>
+                    <button type="button" class="btn btn-default btn-flat" ng-click="readDevice()">Try again</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat"
+                ng-disabled="(!enabled && !deviceResponse) || submitTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="submitTwoStepForm.$loading"></i>
+            {{enabled ? 'Disable' : 'Enable'}}
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsTwoStepYubi.html

@@ -0,0 +1,127 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title">
+        <i class="fa fa-key"></i> Two-step Login <small>yubikey</small>
+    </h4>
+</div>
+<form name="authTwoStepForm" ng-submit="authTwoStepForm.$valid && auth(authModel)" api-form="authPromise"
+      ng-if="!authed">
+    <div class="modal-body">
+        <p>Enter your master password to modify two-step login settings.</p>
+        <div class="callout callout-danger validation-errors" ng-show="authTwoStepForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in authTwoStepForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="authModel.masterPassword"
+                   class="form-control" required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="authTwoStepForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="authTwoStepForm.$loading"></i>Continue
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>
+<form name="submitTwoStepForm" ng-submit="submitTwoStepForm.$valid && submit(updateModel)" api-form="submitPromise"
+      ng-if="authed" autocomplete="off">
+    <div class="modal-body">
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning <i class="fa fa-warning"></i></h4>
+            <p>
+                Due to platform limitations, YubiKeys cannot be used on all bitwarden applications. You should enable
+                another two-step login provider so that you can access your account when YubiKeys cannot be used.
+            </p>
+            <p>Supported platforms:</p>
+            <ul>
+                <li>Web vault on a device with a USB port that can accept your YubiKey.</li>
+                <li>Browser extensions.</li>
+                <li>
+                    Android on a device with
+                    <a href="https://en.wikipedia.org/wiki/List_of_NFC-enabled_mobile_devices" target="_blank">
+                        NFC capabilities
+                    </a>. Read more <a href="https://forum.yubico.com/viewtopic.php?f=26&t=1302" target="_blank">here</a>.
+                </li>
+            </ul>
+        </div>
+        <div ng-if="enabled">
+            <div class="callout callout-success">
+                <h4><i class="fa fa-check-circle"></i> Enabled</h4>
+                <p>Two-step log via YubiKey is enabled on your account.</p>
+            </div>
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="submitTwoStepForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in submitTwoStepForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <p>To add a new YubiKey to your account:</p>
+        <ol>
+            <li>Plug the YubiKey (NEO or 4 series) into your computer's USB port.</li>
+            <li>Select in the first empty <b>Key</b> field below.</li>
+            <li>Touch the YubiKey's button.</li>
+            <li>Save the form.</li>
+        </ol>
+        <hr />
+        <div class="form-group" show-errors>
+            <label for="key1">YubiKey #1</label>
+            <span ng-if="updateModel.key1.existingKey">
+                <a href="#" class="btn btn-link btn-xs" stop-click ng-click="remove(updateModel.key1)">[remove]</a>
+            </span>
+            <div ng-if="updateModel.key1.existingKey" class="monospaced">
+                {{updateModel.key1.existingKey}}
+            </div>
+            <input type="password" id="key1" name="Key1" ng-model="updateModel.key1.key" class="form-control" api-field
+                   ng-show="!updateModel.key1.existingKey" autocomplete="new-password" />
+        </div>
+        <div class="form-group" show-errors>
+            <label for="key2">YubiKey #2</label>
+            <span ng-if="updateModel.key2.existingKey">
+                <a href="#" class="btn btn-link btn-xs" stop-click ng-click="remove(updateModel.key2)">[remove]</a>
+            </span>
+            <div ng-if="updateModel.key2.existingKey" class="monospaced">
+                {{updateModel.key2.existingKey}}
+            </div>
+            <input type="password" id="key2" name="Key2" ng-model="updateModel.key2.key" class="form-control" api-field
+                   ng-show="!updateModel.key2.existingKey" autocomplete="new-password" />
+        </div>
+        <div class="form-group" show-errors>
+            <label for="key3">YubiKey #3</label>
+            <span ng-if="updateModel.key3.existingKey">
+                <a href="#" class="btn btn-link btn-xs" stop-click ng-click="remove(updateModel.key3)">[remove]</a>
+            </span>
+            <div ng-if="updateModel.key3.existingKey" class="monospaced">
+                {{updateModel.key3.existingKey}}
+            </div>
+            <input type="password" id="key3" name="Key3" ng-model="updateModel.key3.key" class="form-control" api-field
+                   ng-show="!updateModel.key3.existingKey" autocomplete="new-password" />
+        </div>
+        <strong>NFC Support</strong>
+        <div class="checkbox">
+            <label>
+                <input type="checkbox" name="Nfc" id="nfc" ng-model="updateModel.nfc" /> One of my keys supports NFC.
+            </label>
+        </div>
+        <p class="help-block">
+            If one of your YubiKeys supports NFC (such as a YubiKey NEO), you will be prompted on mobile devices whenever NFC
+            availability is detected.
+        </p>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="submitTwoStepForm.$loading || disableLoading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="submitTwoStepForm.$loading"></i>
+            Save
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="disable()" ng-disabled="disableLoading"
+                ng-if="enabled">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="disableLoading"></i>
+            Disable All Keys
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

web-vault/app/settings/views/settingsUpdateKey.html

@@ -0,0 +1,47 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title"><i class="fa fa-key"></i> Update Encryption Key</h4>
+</div>
+<form name="form" ng-submit="form.$valid && save(form)" api-form="savePromise">
+    <div class="modal-body">
+        <p>
+            This is <b>NOT</b> a security notification indicating that anything is wrong or has been compromised on your
+            account. If interested, you can
+            <a href="https://help.bitwarden.com/article/update-encryption-key/" target="_blank">read more details here</a>.
+        </p>
+        <hr />
+        <p>
+            You are currently using an outdated encryption scheme. We've moved to larger encryption keys
+            that provide better security and access to newer features.
+        </p>
+        <p>
+            Updating your encryption key is quick and easy. Just type your master password below and you're done!
+            This update will eventually become mandatory.
+        </p>
+        <hr />
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning</h4>
+            After updating your encryption key, you are required to log out and back in to all bitwarden applications that you
+            are currently using (such as the mobile app or browser extensions). Failure to log out and back
+            in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out
+            automatically, however it may be delayed.
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="form.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in form.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="masterPassword" class="form-control"
+                   required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Update Key
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>