duplicate node_env check

* New translations messages.json (Danish)

* New translations messages.json (Dutch)

* New translations messages.json (Estonian)

* New translations messages.json (French)

* New translations messages.json (Italian)

* New translations messages.json (Spanish)

.dockerignore

@@ -0,0 +1,3 @@
+*
+!build/*
+!entrypoint.sh

.editorconfig

@@ -0,0 +1,15 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Set default charset
+[*.{js,ts,scss,html}]
+charset = utf-8
+indent_style = space
+indent_size = 4

.gitignore

@@ -1,202 +1,13 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-build/
-bld/
-[Bb]in/
-[Oo]bj/
-
-# Visual Studo 2015 cache/options directory
-.vs/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding addin-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-
-# Windows Azure Build Output
-csx/
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-*.[Cc]ache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-bower_components/
-lib/
+.vs
+.idea
+.DS_Store
+node_modules
+npm-debug.log
+vwd.webinfo
 css/
 dist/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Other
-project.lock.json
+*.pem
+*.crx
+*.zip
+build/
+!dev-server.shared.pem

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "jslib"]
+	path = jslib
+	url = https://github.com/bitwarden/jslib.git
+	branch = master

CNAME

@@ -1 +0,0 @@
-vault.bitwarden.com

CONTRIBUTING.md

@@ -0,0 +1,13 @@
+Code contributions are welcome! Please commit any pull requests against the `master` branch.
+
+# Localization (l10n)
+
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/bitwarden-web/localized.svg)](https://crowdin.com/project/bitwarden-web)
+
+We use a translation tool called [Crowdin](https://crowdin.com) to help manage our localization efforts across many different languages.
+
+If you are interested in helping translate the Bitwarden web vault into another language (or make a translation correction), please register an account at Crowdin and join our project here: https://crowdin.com/project/bitwarden-web
+
+If the language that you are interested in translating is not already listed, create a new account on Crowdin, join the project, and contact the project owner (https://crowdin.com/profile/kspearrin).
+
+You can read Crowdin's getting started guide for translators here: https://support.crowdin.com/crowdin-intro/

Dockerfile

@@ -0,0 +1,17 @@
+FROM bitwarden/server
+
+LABEL com.bitwarden.product="bitwarden"
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        gosu \
+&& rm -rf /var/lib/apt/lists/*
+
+ENV ASPNETCORE_URLS http://+:5000
+WORKDIR /app
+EXPOSE 5000
+COPY ./build .
+COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

ISSUE_TEMPLATE.md

@@ -0,0 +1,5 @@
+<!--
+Please do not submit feature requests. The [Community Forums][1] has a
+section for submitting, voting for, and discussing product feature requests.
+[1]: https://community.bitwarden.com
+-->

README.md

@@ -1,28 +1,60 @@
-[![appveyor build](https://ci.appveyor.com/api/projects/status/github/bitwarden/web?branch=master&svg=true)] (https://ci.appveyor.com/project/bitwarden/web) [![Join the chat at https://gitter.im/bitwarden/Lobby](https://badges.gitter.im/bitwarden/Lobby.svg)](https://gitter.im/bitwarden/Lobby)
+<p align="center">
+    <img src="https://raw.githubusercontent.com/bitwarden/brand/master/screenshots/web-vault-macbook.png" alt="" width="600" height="358" />
+</p>
+<p align="center">
+    The Bitwarden web project is an Angular application that powers the web vault (https://vault.bitwarden.com/).
+</p>
+<p align="center">
+  <a href="https://ci.appveyor.com/project/bitwarden/web/branch/master" target="_blank">
+    <img src="https://ci.appveyor.com/api/projects/status/github/bitwarden/web?branch=master&svg=true" alt="appveyor build" />
+  </a>
+  <a href="https://crowdin.com/project/bitwarden-web" target="_blank">
+    <img src="https://d322cqt584bo4o.cloudfront.net/bitwarden-web/localized.svg" alt="Crowdin" />
+  </a>
+  <a href="https://hub.docker.com/u/bitwarden/" target="_blank">
+    <img src="https://img.shields.io/docker/pulls/bitwarden/web.svg" alt="DockerHub" />
+  </a>
+  <a href="https://gitter.im/bitwarden/Lobby" target="_blank">
+    <img src="https://badges.gitter.im/bitwarden/Lobby.svg" alt="gitter chat" />
+  </a>
+</p>
 
-# bitwarden Web
+## Build/Run
 
-The bitwarden Web project is an AngularJS application that powers the web vault (https://vault.bitwarden.com/).
+### Requirements
 
-# Build/Run
+- [Node.js](https://nodejs.org) v8.11 or greater
 
-**Requirements**
+### Run the app
 
-- Node.js
-- Gulp
+```
+npm install
+npm run build:watch
+```
 
-Unless you are running the [Core](https://github.com/bitwarden/core) API locally, you'll probably need to switch the 
-application to target the production API. Open `package.json` and set `production` to `true`.
+You can now access the web vault in your browser at `https://localhost:8080`. You can adjust your API endpoint settings in `src/app/services/services.module.ts` by altering the `apiService.setUrls` call. For example:
 
-Then run the following commands:
+```typescript
+await apiService.setUrls({
+    base: isDev ? null : window.location.origin,
+    api: isDev ? 'http://mylocalapi' : null,
+    identity: isDev ? 'http://mylocalidentity' : null,
+});
+```
 
-- `gulp build`
-- `gulp serve`
+If you want to point the development web vault to the production APIs, you can set:
 
-You can now access the web vault at `http://localhost:4001`.
+```typescript
+await apiService.setUrls({
+    base: null,
+    api: 'https://api.bitwarden.com',
+    identity: 'https://identity.bitwarden.com',
+});
+```
 
-# Contribute
+
+## Contribute
 
 Code contributions are welcome! Please commit any pull requests against the `master` branch.
 
-Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature.
+Security audits and feedback are welcome. Please open an issue or email us privately if the report is sensitive in nature. You can read our security policy in the [`SECURITY.md`](SECURITY.md) file.

SECURITY.md

@@ -0,0 +1,45 @@
+Bitwarden believes that working with security researchers across the globe is crucial to keeping our
+users safe. If you believe you've found a security issue in our product or service, we encourage you to
+notify us. We welcome working with you to resolve the issue promptly. Thanks in advance!
+
+# Disclosure Policy
+
+- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every
+  effort to quickly resolve the issue.
+- Provide us a reasonable amount of time to resolve the issue before any disclosure to the public or a
+  third-party. We may publicly disclose the issue before resolving it, if appropriate. 
+- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or
+  degradation of our service. Only interact with accounts you own or with explicit permission of the
+  account holder.
+- If you would like to encrypt your report, please use the PGP key with long ID
+  `0xDE6887086F892325FEC04CC0D847525B6931381F` (available in the public keyserver pool).
+
+# In-scope
+
+- Security issues in any current release of Bitwarden. This includes the web vault, browser extension,
+  and mobile apps (iOS and Android). Product downloads are available at https://bitwarden.com. Source
+  code is available at https://github.com/bitwarden.
+
+# Exclusions
+
+The following bug classes are out-of scope:
+
+- Bugs that are already reported on any of Bitwarden's issue trackers (https://github.com/bitwarden),
+  or that we already know of. Note that some of our issue tracking is private.
+- Issues in an upstream software dependency (ex: Xamarin, ASP.NET) which are already reported to the
+  upstream maintainer.
+- Attacks requiring physical access to a user's device.
+- Self-XSS
+- Issues related to software or protocols not under Bitwarden's control
+- Vulnerabilities in outdated versions of Bitwarden
+- Missing security best practices that do not directly lead to a vulnerability
+- Issues that do not have any impact on the general public
+
+While researching, we'd like to ask you to refrain from:
+
+- Denial of service
+- Spamming
+- Social engineering (including phishing) of Bitwarden staff or contractors
+- Any physical attempts against Bitwarden property or data centers
+
+Thank you for helping keep Bitwarden and our users safe!

bitwarden-web.sln

@@ -1,39 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "bitwarden-web", ".", "{25BEDEF4-2CAF-445A-807D-63C17FF85694}"
-	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.1"
-		Debug.AspNetCompiler.VirtualPath = "/localhost_15509"
-		Debug.AspNetCompiler.PhysicalPath = "."
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_15509\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/localhost_15509"
-		Release.AspNetCompiler.PhysicalPath = "."
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_15509\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "15509"
-		SlnRelativePath = "."
-		DefaultWebSiteLanguage = "Visual C#"
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{25BEDEF4-2CAF-445A-807D-63C17FF85694}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25BEDEF4-2CAF-445A-807D-63C17FF85694}.Debug|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

build.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+echo ""
+
+if [ $# -gt 1 -a "$1" == "push" ]
+then
+    TAG=$2
+    echo "# Pushing Web ($TAG)"
+    echo ""
+    docker push bitwarden/web:$TAG
+elif [ $# -gt 1 -a "$1" == "tag" ]
+then
+    TAG=$2
+    echo "Tagging Web as '$TAG'"
+    docker tag bitwarden/web bitwarden/web:$TAG
+else
+    echo "# Building Web"
+
+    echo ""
+    echo "Building app"
+    echo "npm version $(npm --version)"
+    npm install
+    npm run sub:update
+    npm run dist:selfhost
+
+    echo ""
+    echo "Building docker image"
+    docker --version
+    docker build -t bitwarden/web $DIR/.
+fi

crowdin.yml

@@ -0,0 +1,10 @@
+files:
+  - source: /src/locales/en/messages.json
+    translation: /src/locales/%two_letters_code%/%original_file_name%
+    update_option: update_as_unapproved
+    languages_mapping:
+      two_letters_code:
+        pt-PT: pt_PT
+        pt-BR: pt_BR
+        zh-CN: zh_CN
+        zh-TW: zh_TW

dev-server.shared.pem

@@ -0,0 +1,45 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDaEy1cPw07irjg
+4wUgaxshW7oQrgVoNZYRROmdU20K22L+HyG2ahW6usiWw8+6fPgVve7Y1z+/GYsK
+DhaDdY1Ket3JvZHxoAJ/+6lYY+05PhtmYnyEZzZlnuYx/tu3vyGpsXqMpzL3ZrX2
+Mh2dWE7ZXKxsyig4wSDJhBPMrW8HKXLrLR/JPFhu/nz5MpRF5LfzWU13FEfmS43s
+PEkBCn5ZxhVX4eNclQhTl7oOo5LU+KCWn+C/GPQir7pdmMoYF6D5j3qtbsq9irPe
+qR7HsM9z6DnX+L0mF31P2S6OTgLT3kuWJn9vqLUwvQWGFvSSzpw7JgGBK3eX6zE9
+2koGWP9NAgMBAAECggEAIpwCie5TykxU1RQSfzegYaXuHLGRmB1RCMKYFOjlmGCD
+EHOeZRXnBvCX3x2KfT1SHhk7q9xVeJ20LE9aEVj5qIVhZ6AXZnKPkwI8uRN61afe
+r1wYCOdcgbo7LFoXQs0pqYXKPkJW217IqB8CBjO6p9KGZumago9cBb9ZaRVpVohZ
+c6YHeatrna2mPb/EUPHdT0RHHQ5Dz2ToPjCkDtxsNHLZLekR35WIMtCBlp0xY5hb
+5h54ZxnaMihvHTLa8L/pgxGEUsP+XFpdXkM1oREzh8tDRFcUL8mUVZq8bGyzALn5
+MxDhdXqxrnyD2cQ/cSqXLs1/2mh5eccU3g5IaNtrAQKBgQD0Q4K2UYXa8jWQu7jI
+b37zwr2EypLFjeluqF4fxs+oz3UYEXeBDK0Td19/tze6/XieKibKDtFrOZQwDDKC
+AVxD7Dm58T9Jf4LDHNYOfYL3X/E4H+JrVBh94s0B00jVJ6TnEQDMuLi+wMGtvTdW
+huxoNefIWKf73ozvxIF+nsyeDQKBgQDkjYoXkBtfNgQR42RVA0/UdLLDWWctMU4F
+sJYc1bLL3txbf+fK7QzbU/ggLMW0hv8/IdyirGJhW3G0K0yhpAOlPhe36qv4QyhD
+o2nFlRrzfzvGJAgH9b1s+VcL/cSIuv4aCkbv97DAoQGPzAWEKv5gY1iw1DsGgrz5
+svZUvd7WQQKBgQDPrp7yuTngQNP+bT3dXb9JLqjIwRwt0E1LgugUiIuDcnCSuDct
+iEOYK4UNKBDAckcd46T7Y8H3MwumFpjTJKj4L1+dk1tF+J6Lmnb99wVlozOLjsCK
+lQQF9NJt3OEuKvjwZeqSJfUeavHB8QGeFjXnHP4nwAmEA2M9cYzQxeAf+QKBgCbS
+U+6Er+GQT0iqk1RNZ7XyzJqaCQiII3Sb9iOXuPMgO9Xe+ARkF5b5wF/Wuw5bD+gt
+XEjVdzCKU9oCsNWUAnqC/Yxj9CoLXj9+9mx1U0qhBgo1/Jc9ipuEDuEejc+b06Wg
+sUP5krBlqNpAEX/Nvb+poFsI8a29b1QKrgTe64cBAoGALg92rZBG60N2n8fTokou
+f1fui8Ftb+vOVGv9CM6icmNuwXeMF40A33Hvx14XLFk6B5p5dtVyOR660rRv4HRV
+cBUm5wwCZjwR5Aj83XGR0PRbTNFNngHbawQiutSo6dw8cNNKCZMywVh2KX29dsLh
+0Yj++kb8+G1kzFonR8WWoC8=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICwzCCAaugAwIBAgIJAN5sbMfEx05qMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMTCWxvY2FsaG9zdDAeFw0xODA2MDUwMzMxNDhaFw0yODA2MDIwMzMxNDhaMBQx
+EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANoTLVw/DTuKuODjBSBrGyFbuhCuBWg1lhFE6Z1TbQrbYv4fIbZqFbq6yJbD
+z7p8+BW97tjXP78ZiwoOFoN1jUp63cm9kfGgAn/7qVhj7Tk+G2ZifIRnNmWe5jH+
+27e/IamxeoynMvdmtfYyHZ1YTtlcrGzKKDjBIMmEE8ytbwcpcustH8k8WG7+fPky
+lEXkt/NZTXcUR+ZLjew8SQEKflnGFVfh41yVCFOXug6jktT4oJaf4L8Y9CKvul2Y
+yhgXoPmPeq1uyr2Ks96pHsewz3PoOdf4vSYXfU/ZLo5OAtPeS5Ymf2+otTC9BYYW
+9JLOnDsmAYErd5frMT3aSgZY/00CAwEAAaMYMBYwFAYDVR0RBA0wC4IJbG9jYWxo
+b3N0MA0GCSqGSIb3DQEBCwUAA4IBAQCBTn7szrcs+fSs1Q/a2O3ng35zcme6NRhp
+T65RP0ooj3tPT9QlTJyKjo9Yb2RW2RGVbQO86mkYe9N9wcZkzurZ6KDqsfBn3FkI
+eZA1G/za907Dt/25mOdrsav7NmFBwxo9iuZ/cozgneK1mAXOu4nDI5yYvAlvNA6E
+iXgls4WX1LtHL5b9YV7Jz27d5tTmGxEimakMBo+zr10vCtMCsTlDs/ChamnI7ljN
+7B4WIVUMI3xOZzqClLnSzFJNReAlapjtGtp1qH6Y+6aZ9OErIwZOjE9CYYvm6MbE
+CblXQ9Uifpwrc09TA5S2Y/9+VxUBF9xlxh8hkcGLTzlNFDzVWdmR
+-----END CERTIFICATE-----

entrypoint.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Setup
+
+GROUPNAME="bitwarden"
+USERNAME="bitwarden"
+
+LUID=${LOCAL_UID:-0}
+LGID=${LOCAL_GID:-0}
+
+# Step down from host root to well-known nobody/nogroup user
+
+if [ $LUID -eq 0 ]
+then
+    LUID=65534
+fi
+if [ $LGID -eq 0 ]
+then
+    LGID=65534
+fi
+
+# Create user and group
+
+groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
+groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
+useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
+usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
+mkhomedir_helper $USERNAME
+
+# The rest...
+
+chown -R $USERNAME:$GROUPNAME /etc/bitwarden
+cp /etc/bitwarden/web/app-id.json /app/app-id.json
+chown -R $USERNAME:$GROUPNAME /app
+chown -R $USERNAME:$GROUPNAME /bitwarden_server
+
+exec gosu $USERNAME:$GROUPNAME dotnet /bitwarden_server/Server.dll \
+    /contentRoot=/app /webRoot=. /serveUnknown=false /webVault=true

gulpfile.js

@@ -1,334 +1,35 @@
-/// <binding BeforeBuild='build, dist' Clean='clean' ProjectOpened='build. dist' />
+const gulp = require('gulp');
+const googleWebFonts = require('gulp-google-webfonts');
+const del = require('del');
+const package = require('./package.json');
+const fs = require('fs');
 
-var gulp = require('gulp'),
-    rimraf = require('rimraf'),
-    concat = require('gulp-concat'),
-    rename = require('gulp-rename'),
-    cssmin = require('gulp-cssmin'),
-    uglify = require('gulp-uglify'),
-    ghPages = require('gulp-gh-pages'),
-    less = require('gulp-less'),
-    connect = require('gulp-connect'),
-    ngAnnotate = require('gulp-ng-annotate'),
-    preprocess = require('gulp-preprocess'),
-    runSequence = require('run-sequence'),
-    merge = require('merge-stream'),
-    ngConfig = require('gulp-ng-config'),
-    settings = require('./settings.json'),
-    project = require('./package.json'),
-    jshint = require('gulp-jshint'),
-    _ = require('lodash');
+const paths = {
+    src: './src/',
+    build: './build/',
+    cssDir: './src/css/',
+};
 
-var paths = {};
-paths.dist = './dist/';
-paths.webroot = './src/'
-paths.js = paths.webroot + 'js/**/*.js';
-paths.minJs = paths.webroot + 'js/**/*.min.js';
-paths.concatJsDest = paths.webroot + 'js/bw.min.js';
-paths.libDir = paths.webroot + 'lib/';
-paths.npmDir = 'node_modules/';
-paths.lessDir = paths.webroot + 'less/';
-paths.cssDir = paths.webroot + 'css/';
-paths.jsDir = paths.webroot + 'js/';
-
-var randomString = Math.random().toString(36).substring(7);
-
-gulp.task('lint', function () {
-    return gulp.src(paths.webroot + 'app/**/*.js')
-        .pipe(jshint())
-        .pipe(jshint.reporter('default'));
-});
-
-gulp.task('build', function (cb) {
-    return runSequence(
-        'clean',
-        ['lib', 'less', 'settings', 'lint'],
-        cb);
-});
-
-gulp.task('clean:js', function (cb) {
-    return rimraf(paths.concatJsDest, cb);
-});
-
-gulp.task('clean:css', function (cb) {
-    return rimraf(paths.cssDir, cb);
-});
-
-gulp.task('clean:lib', function (cb) {
-    return rimraf(paths.libDir, cb);
-});
-
-gulp.task('clean', ['clean:js', 'clean:css', 'clean:lib', 'dist:clean']);
-
-gulp.task('min:js', ['clean:js'], function () {
-    return gulp.src([paths.js, '!' + paths.minJs], { base: '.' })
-        .pipe(concat(paths.concatJsDest))
-        .pipe(uglify())
-        .pipe(gulp.dest('.'));
-});
-
-gulp.task('min:css', [], function () {
-    return gulp.src([paths.cssDir + '**/*.css', '!' + paths.cssDir + '**/*.min.css'], { base: '.' })
-        .pipe(cssmin())
-        .pipe(rename({ suffix: '.min' }))
-        .pipe(gulp.dest('.'));
-});
-
-gulp.task('min', ['min:js', 'min:css']);
-
-gulp.task('lib', ['clean:lib'], function () {
-    var libs = [
-        {
-            src: [
-                paths.npmDir + 'bootstrap/dist/**/*',
-                '!' + paths.npmDir + 'bootstrap/dist/**/npm.js',
-                '!' + paths.npmDir + 'bootstrap/dist/**/css/*theme*'
-            ],
-            dest: paths.libDir + 'bootstrap'
-        },
-        {
-            src: paths.npmDir + 'font-awesome/css/*',
-            dest: paths.libDir + 'font-awesome/css'
-        },
-        {
-            src: paths.npmDir + 'font-awesome/fonts/*',
-            dest: paths.libDir + 'font-awesome/fonts'
-        },
-        {
-            src: paths.npmDir + 'jquery/dist/*.js',
-            dest: paths.libDir + 'jquery'
-        },
-        {
-            src: paths.npmDir + 'admin-lte/dist/js/app*.js',
-            dest: paths.libDir + 'admin-lte/js'
-        },
-        {
-            src: paths.npmDir + 'angular/angular*.js',
-            dest: paths.libDir + 'angular'
-        },
-        {
-            src: paths.npmDir + 'angular-bootstrap-npm/dist/*tpls*.js',
-            dest: paths.libDir + 'angular-bootstrap'
-        },
-        {
-            src: paths.npmDir + 'angular-bootstrap-show-errors/src/*.js',
-            dest: paths.libDir + 'angular-bootstrap-show-errors'
-        },
-        {
-            src: paths.npmDir + 'angular-cookies/*cookies*.js',
-            dest: paths.libDir + 'angular-cookies'
-        },
-        {
-            src: paths.npmDir + 'angular-jwt/dist/*.js',
-            dest: paths.libDir + 'angular-jwt'
-        },
-        {
-            src: paths.npmDir + 'angular-md5/angular-md5*.js',
-            dest: paths.libDir + 'angular-md5'
-        },
-        {
-            src: paths.npmDir + 'angular-resource/*resource*.js',
-            dest: paths.libDir + 'angular-resource'
-        },
-        {
-            src: [paths.npmDir + 'angular-toastr/dist/**/*.css', paths.npmDir + 'angular-toastr/dist/**/*.js'],
-            dest: paths.libDir + 'angular-toastr'
-        },
-        {
-            src: paths.npmDir + 'angular-ui-router/release/*.js',
-            dest: paths.libDir + 'angular-ui-router'
-        },
-        {
-            src: paths.npmDir + 'angular-messages/*messages*.js',
-            dest: paths.libDir + 'angular-messages'
-        },
-        {
-            src: [paths.npmDir + 'sjcl/core/cbc.js', paths.npmDir + 'sjcl/core/bitArray.js', paths.npmDir + 'sjcl/sjcl.js'],
-            dest: paths.libDir + 'sjcl'
-        },
-        {
-            src: paths.npmDir + 'ngstorage/*.js',
-            dest: paths.libDir + 'ngstorage'
-        },
-        {
-            src: paths.npmDir + 'papaparse/papaparse*.js',
-            dest: paths.libDir + 'papaparse'
-        },
-        {
-            src: paths.npmDir + 'ngclipboard/dist/ngclipboard*.js',
-            dest: paths.libDir + 'ngclipboard'
-        },
-        {
-            src: paths.npmDir + 'clipboard/dist/clipboard*.js',
-            dest: paths.libDir + 'clipboard'
-        },
-        {
-            src: [
-                paths.npmDir + 'angulartics-google-analytics/lib/angulartics*.js',
-                paths.npmDir + 'angulartics/src/angulartics.js'
-            ],
-            dest: paths.libDir + 'angulartics'
-        }
-    ];
-
-    var tasks = libs.map(function (lib) {
-        return gulp.src(lib.src).pipe(gulp.dest(lib.dest));
-    });
-
-    return merge(tasks);
-});
-
-gulp.task('settings', function () {
-    return config()
-        .pipe(gulp.dest(paths.webroot + 'app'));
-});
-
-function config() {
-    return gulp.src('./settings.json')
-        .pipe(ngConfig('bit', {
-            createModule: false,
-            constants: _.merge({}, {
-                appSettings: {
-                    version: project.version,
-                    environment: project.production ? 'Production' : 'Development'
-                }
-            }, require('./settings' + (project.production ? '.Production' : '') + '.json') || {})
-        }));
+function clean() {
+    return del([paths.cssDir]);
 }
 
-gulp.task('less', function () {
-    return gulp.src(paths.lessDir + 'vault.less')
-        .pipe(less())
+function webfonts() {
+    return gulp.src('./webfonts.list')
+        .pipe(googleWebFonts({
+            fontsDir: 'webfonts',
+            cssFilename: 'webfonts.css',
+            format: 'woff',
+        }))
         .pipe(gulp.dest(paths.cssDir));
-});
+};
 
-gulp.task('watch', function () {
-    gulp.watch(paths.lessDir + '*.less', ['less']);
-    gulp.watch('./settings*.json', ['settings']);
-});
+function version() {
+    fs.writeFileSync(paths.build + 'version.json', '{"version":"' + package.version + '"}');
+}
 
-gulp.task('dist:clean', function (cb) {
-    return rimraf(paths.dist, cb);
-});
-
-gulp.task('dist:move', function () {
-    var moves = [
-        {
-            src: './CNAME',
-            dest: paths.dist
-        },
-        {
-            src: [
-                paths.npmDir + 'bootstrap/dist/**/bootstrap.min.js',
-                paths.npmDir + 'bootstrap/dist/**/bootstrap.min.css',
-                paths.npmDir + 'bootstrap/dist/**/fonts/**/*',
-            ],
-            dest: paths.dist + 'lib/bootstrap'
-        },
-        {
-            src: [
-                paths.npmDir + 'font-awesome/**/font-awesome.min.css',
-                paths.npmDir + 'font-awesome/**/fonts/**/*'
-            ],
-            dest: paths.dist + 'lib/font-awesome'
-        },
-        {
-            src: paths.npmDir + 'jquery/dist/jquery.min.js',
-            dest: paths.dist + 'lib/jquery'
-        },
-        {
-            src: paths.npmDir + 'angular/angular.min.js',
-            dest: paths.dist + 'lib/angular'
-        },
-        {
-            src: [
-                paths.webroot + '**/app/**/*.html',
-                paths.webroot + '**/images/**/*',
-                paths.webroot + 'index.html',
-                paths.webroot + 'favicon.ico'
-            ],
-            dest: paths.dist
-        }
-    ];
-
-    var tasks = moves.map(function (move) {
-        return gulp.src(move.src).pipe(gulp.dest(move.dest));
-    });
-
-    return merge(tasks);
-});
-
-gulp.task('dist:css', function () {
-    return gulp
-        .src([
-            paths.cssDir + '**/*.css',
-            '!' + paths.cssDir + '**/*.min.css'
-        ])
-        .pipe(preprocess({ context: { cacheTag: randomString } }))
-        .pipe(cssmin())
-        .pipe(rename({ suffix: '.min' }))
-        .pipe(gulp.dest(paths.dist + 'css'));
-});
-
-gulp.task('dist:js:app', function () {
-    var mainStream = gulp
-        .src([
-            paths.webroot + 'app/app.js',
-            '!' + paths.webroot + 'app/settings.js',
-            paths.webroot + 'app/**/*Module.js',
-            paths.webroot + 'app/**/*.js'
-        ]);
-
-    merge(mainStream, config())
-        .pipe(preprocess({ context: { cacheTag: randomString } }))
-        .pipe(concat(paths.dist + '/js/app.min.js'))
-        .pipe(ngAnnotate())
-        .pipe(uglify())
-        .pipe(gulp.dest('.'));
-});
-
-gulp.task('dist:js:lib', function () {
-    return gulp
-        .src([
-            paths.libDir + 'sjcl/sjcl.js',
-            paths.libDir + 'sjcl/*.js',
-            paths.libDir + 'angulartics/angulartics.js',
-            paths.libDir + '**/*.js',
-            '!' + paths.libDir + '**/*.min.js',
-            '!' + paths.libDir + 'angular/**/*',
-            '!' + paths.libDir + 'bootstrap/**/*',
-            '!' + paths.libDir + 'jquery/**/*'
-        ])
-        .pipe(concat(paths.dist + '/js/lib.min.js'))
-        .pipe(uglify())
-        .pipe(gulp.dest('.'));
-});
-
-gulp.task('dist:preprocess', function () {
-    return gulp
-        .src([
-            paths.dist + '/**/*.html'
-        ], { base: '.' })
-        .pipe(preprocess({ context: { cacheTag: randomString }}))
-        .pipe(gulp.dest('.'));
-});
-
-gulp.task('dist', ['build'], function (cb) {
-    return runSequence(
-        'dist:clean',
-        ['dist:move', 'dist:css', 'dist:js:app', 'dist:js:lib'],
-        'dist:preprocess',
-        cb);
-});
-
-gulp.task('deploy', ['dist'], function () {
-    return gulp.src(paths.dist + '**/*')
-        .pipe(ghPages({ cacheDir: paths.dist + '.publish' }));
-});
-
-gulp.task('serve', function () {
-    connect.server({
-        port: 4001,
-        root: ['src']
-    });
-});
+gulp.task('clean', clean);
+gulp.task('webfonts', ['clean'], webfonts);
+gulp.task('prebuild', ['webfonts']);
+gulp.task('version', version);
+gulp.task('postdist', ['version']);

package.json

@@ -1,47 +1,92 @@
 {
-  "name": "bitwarden",
-  "version": "1.6.0",
-  "production": false,
+  "name": "bitwarden-web",
+  "version": "2.2.0",
+  "scripts": {
+    "sub:init": "git submodule update --init --recursive",
+    "sub:update": "git submodule update --remote",
+    "sub:pull": "git submodule foreach git pull",
+    "postinstall": "npm run sub:init",
+    "build": "gulp prebuild && webpack --config webpack.config.js",
+    "build:watch": "gulp prebuild && webpack-serve --config webpack.config.js",
+    "build:prod": "gulp prebuild && cross-env NODE_ENV=production webpack --config webpack.config.js",
+    "build:prod:watch": "gulp prebuild && cross-env NODE_ENV=production webpack-serve --config webpack.config.js",
+    "build:selfhost": "gulp prebuild && cross-env SELF_HOST=true webpack-serve --config webpack.config.js",
+    "build:selfhost:watch": "gulp prebuild && cross-env SELF_HOST=true webpack-serve --config webpack.config.js",
+    "build:selfhost:prod": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack --config webpack.config.js",
+    "build:selfhost:prod:watch": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack-serve --config webpack.config.js",
+    "clean:l10n": "git push origin --delete l10n_master",
+    "dist": "npm run build:prod && gulp postdist",
+    "dist:selfhost": "npm run build:selfhost:prod && gulp postdist",
+    "deploy": "npm run dist && gh-pages -d build",
+    "deploy:preview": "npm run dist && gh-pages -d build -r git@github.com:kspearrin/web-preview.git",
+    "lint": "tslint src/**/*.ts || true",
+    "lint:fix": "tslint src/**/*.ts --fix"
+  },
   "devDependencies": {
-    "connect": "3.4.1",
-    "lodash": "4.13.1",
-    "gulp": "3.9.1",
-    "gulp-concat": "2.6.0",
-    "gulp-cssmin": "0.1.7",
-    "gulp-less": "3.1.0",
-    "gulp-rename": "1.2.2",
-    "gulp-uglify": "1.5.3",
-    "gulp-gh-pages": "0.5.4",
-    "gulp-preprocess": "2.0.0",
-    "gulp-ng-annotate": "2.0.0",
-    "gulp-ng-config": "1.3.1",
-    "gulp-connect": "5.0.0",
-    "jshint": "2.9.2",
-    "gulp-jshint": "2.0.1",
-    "rimraf": "2.5.2",
-    "run-sequence": "1.2.1",
-    "merge-stream": "1.0.0",
-    "jquery": "2.2.4",
-    "font-awesome": "4.6.3",
-    "bootstrap": "3.3.6",
-    "sjcl": "1.0.3",
-    "angular": "1.5.6",
-    "angular-resource": "1.5.6",
-    "angular-bootstrap-npm": "0.14.3",
-    "angular-ui-router": "0.3.1",
-    "angular-jwt": "0.0.9",
-    "angular-cookies": "1.5.6",
-    "admin-lte": "2.3.5",
-    "angular-md5": "0.1.10",
-    "angular-toastr": "1.7.0",
-    "angular-bootstrap-show-errors": "2.3.0",
-    "angular-messages": "1.5.6",
-    "ngstorage": "0.3.10",
-    "papaparse": "4.1.2",
-    "toastr": "2.1.2",
-    "clipboard": "1.5.12",
-    "ngclipboard": "1.1.1",
-    "angulartics": "1.1.2",
-    "angulartics-google-analytics": "0.2.1"
+    "@angular/compiler-cli": "5.2.0",
+    "@ngtools/webpack": "1.10.2",
+    "@types/jquery": "^3.3.2",
+    "@types/lunr": "^2.1.6",
+    "@types/node": "8.0.19",
+    "@types/node-forge": "0.6.10",
+    "@types/papaparse": "4.1.33",
+    "@types/webcrypto": "^0.0.28",
+    "angular2-template-loader": "^0.6.2",
+    "clean-webpack-plugin": "^0.1.19",
+    "copy-webpack-plugin": "^4.5.1",
+    "cross-env": "^5.1.4",
+    "css-loader": "^0.28.11",
+    "del": "^3.0.0",
+    "extract-text-webpack-plugin": "next",
+    "file-loader": "^1.1.11",
+    "gh-pages": "^1.2.0",
+    "gulp": "^3.9.1",
+    "gulp-google-webfonts": "^2.0.0",
+    "html-loader": "^0.5.5",
+    "html-webpack-plugin": "^3.2.0",
+    "node-sass": "^4.9.2",
+    "sass-loader": "^7.0.2",
+    "style-loader": "^0.21.0",
+    "ts-loader": "^4.3.1",
+    "tslint": "^5.10.0",
+    "tslint-loader": "^3.6.0",
+    "typescript": "^2.7.2",
+    "webpack": "^4.10.2",
+    "webpack-cli": "^3.0.2",
+    "webpack-serve": "^1.0.2"
+  },
+  "dependencies": {
+    "@angular/animations": "5.2.0",
+    "@angular/common": "5.2.0",
+    "@angular/compiler": "5.2.0",
+    "@angular/core": "5.2.0",
+    "@angular/forms": "5.2.0",
+    "@angular/http": "5.2.0",
+    "@angular/platform-browser": "5.2.0",
+    "@angular/platform-browser-dynamic": "5.2.0",
+    "@angular/router": "5.2.0",
+    "@angular/upgrade": "5.2.0",
+    "@aspnet/signalr": "1.0.3",
+    "@aspnet/signalr-protocol-msgpack": "1.0.3",
+    "angular2-toaster": "4.0.2",
+    "angulartics2": "5.0.1",
+    "bootstrap": "4.1.3",
+    "core-js": "2.4.1",
+    "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
+    "font-awesome": "4.7.0",
+    "jquery": "3.3.1",
+    "lunr": "2.3.1",
+    "mousetrap": "1.6.1",
+    "ngx-infinite-scroll": "0.8.4",
+    "node-forge": "0.7.1",
+    "papaparse": "4.3.5",
+    "popper.js": "1.14.4",
+    "qrious": "4.0.2",
+    "rxjs": "5.5.6",
+    "sweetalert": "2.1.0",
+    "web-animations-js": "2.3.1",
+    "webcrypto-shim": "0.1.4",
+    "whatwg-fetch": "^2.0.4",
+    "zone.js": "0.8.19"
   }
 }

settings.Production.json

@@ -1,5 +0,0 @@
-{
-    "appSettings": {
-        "apiUri": "https://api.bitwarden.com"
-    }
-}

settings.json

@@ -1,6 +0,0 @@
-{
-  "appSettings": {
-    "rememberedEmailCookieName": "bit.rememberedEmail",
-    "apiUri": "http://localhost:4000"
-  }
-}

src/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"
+      ]
+    }
+  ]
+}

src/app/accounts/accept-organization.component.html

@@ -0,0 +1,33 @@
+<div class="mt-5 d-flex justify-content-center" *ngIf="loading">
+    <div>
+        <img src="../../images/logo-dark@2x.png" class="mb-4 logo" alt="Bitwarden">
+        <p class="text-center">
+            <i class="fa fa-spinner fa-spin fa-2x text-muted" title="{{'loading' | i18n}}"></i>
+        </p>
+    </div>
+</div>
+<div class="container" *ngIf="!loading && !authed">
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="lead text-center mb-4">{{'joinOrganization' | i18n}}</p>
+            <div class="card d-block">
+                <div class="card-body">
+                    <p class="text-center">
+                        {{orgName}}
+                        <strong class="d-block mt-2">{{email}}</strong>
+                    </p>
+                    <p>{{'joinOrganizationDesc' | i18n}}</p>
+                    <hr>
+                    <div class="d-flex">
+                        <a routerLink="/" [queryParams]="{email: email}" class="btn btn-primary btn-block">
+                            {{'logIn' | i18n}}
+                        </a>
+                        <a routerLink="/register" [queryParams]="{email: email}" class="btn btn-primary btn-block ml-2 mt-0">
+                            {{'createAccount' | i18n}}
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

src/app/accounts/accept-organization.component.ts

@@ -0,0 +1,86 @@
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
+
+import {
+    Toast,
+    ToasterService,
+} from 'angular2-toaster';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { StateService } from 'jslib/abstractions/state.service';
+import { UserService } from 'jslib/abstractions/user.service';
+
+import { OrganizationUserAcceptRequest } from 'jslib/models/request/organizationUserAcceptRequest';
+
+@Component({
+    selector: 'app-accept-organization',
+    templateUrl: 'accept-organization.component.html',
+})
+export class AcceptOrganizationComponent implements OnInit {
+    loading = true;
+    authed = false;
+    orgName: string;
+    email: string;
+    actionPromise: Promise<any>;
+
+    constructor(private router: Router, private toasterService: ToasterService,
+        private i18nService: I18nService, private route: ActivatedRoute,
+        private apiService: ApiService, private userService: UserService,
+        private stateService: StateService) { }
+
+    ngOnInit() {
+        let fired = false;
+        this.route.queryParams.subscribe(async (qParams) => {
+            if (fired) {
+                return;
+            }
+            fired = true;
+            await this.stateService.remove('orgInvitation');
+            let error = qParams.organizationId == null || qParams.organizationUserId == null || qParams.token == null;
+            if (!error) {
+                this.authed = await this.userService.isAuthenticated();
+                if (this.authed) {
+                    const request = new OrganizationUserAcceptRequest();
+                    request.token = qParams.token;
+                    try {
+                        this.actionPromise = this.apiService.postOrganizationUserAccept(qParams.organizationId,
+                            qParams.organizationUserId, request);
+                        await this.actionPromise;
+                        const toast: Toast = {
+                            type: 'success',
+                            title: this.i18nService.t('inviteAccepted'),
+                            body: this.i18nService.t('inviteAcceptedDesc'),
+                            timeout: 10000,
+                        };
+                        this.toasterService.popAsync(toast);
+                        this.router.navigate(['/vault']);
+                    } catch {
+                        error = true;
+                    }
+                } else {
+                    await this.stateService.save('orgInvitation', qParams);
+                    this.email = qParams.email;
+                    this.orgName = qParams.organizationName;
+                    if (this.orgName != null) {
+                        // Fix URL encoding of space issue with Angular
+                        this.orgName = this.orgName.replace(/\+/g, ' ');
+                    }
+                }
+            }
+
+            if (error) {
+                this.toasterService.popAsync('error', null, this.i18nService.t('inviteAcceptFailed'));
+                this.router.navigate(['/']);
+            }
+
+            this.loading = false;
+        });
+    }
+}

src/app/accounts/accountsLoginController.js

@@ -1,51 +0,0 @@
-angular
-    .module('bit.accounts')
-
-    .controller('accountsLoginController', function ($scope, $rootScope, $cookies, apiService, cryptoService, authService, $state, appSettings, $analytics) {
-        var rememberedEmail = $cookies.get(appSettings.rememberedEmailCookieName);
-        if (rememberedEmail) {
-            $scope.model = {
-                email: rememberedEmail,
-                rememberEmail: true
-            };
-        }
-
-        $scope.login = function (model) {
-            $scope.loginPromise = authService.logIn(model.email, model.masterPassword);
-
-            $scope.loginPromise.then(function () {
-                if (model.rememberEmail) {
-                    var cookieExpiration = new Date();
-                    cookieExpiration.setFullYear(cookieExpiration.getFullYear() + 10);
-
-                    $cookies.put(
-                        appSettings.rememberedEmailCookieName,
-                        model.email,
-                        { expires: cookieExpiration });
-                }
-                else {
-                    $cookies.remove(appSettings.rememberedEmailCookieName);
-                }
-
-                var profile = authService.getUserProfile();
-                if (profile.twoFactor) {
-                    $analytics.eventTrack('Logged In To Two-step');
-                    $state.go('frontend.login.twoFactor');
-                }
-                else {
-                    $analytics.eventTrack('Logged In');
-                    $state.go('backend.vault');
-                }
-            });
-        };
-
-        $scope.twoFactor = function (model) {
-            // Only supporting Authenticator provider for now
-            $scope.twoFactorPromise = authService.logInTwoFactor(model.code, "Authenticator");
-
-            $scope.twoFactorPromise.then(function () {
-                $analytics.eventTrack('Logged In From Two-step');
-                $state.go('backend.vault');
-            });
-        };
-    });

src/app/accounts/accountsLogoutController.js

@@ -1,8 +0,0 @@
-angular
-    .module('bit.accounts')
-
-    .controller('accountsLogoutController', function ($scope, authService, $state, $analytics) {
-        authService.logOut();
-        $analytics.eventTrack('Logged Out');
-        $state.go('frontend.login.info');
-    });

src/app/accounts/accountsModule.js

@@ -1,2 +0,0 @@
-angular
-    .module('bit.accounts', ['ui.bootstrap', 'ngCookies']);

src/app/accounts/accountsPasswordHintController.js

@@ -1,12 +0,0 @@
-angular
-    .module('bit.accounts')
-
-    .controller('accountsPasswordHintController', function ($scope, $rootScope, apiService) {
-        $scope.success = false;
-
-        $scope.submit = function (model) {
-            $scope.submitPromise = apiService.accounts.postPasswordHint({ email: model.email }, function () {
-                $scope.success = true;
-            }).$promise;
-        };
-    });

src/app/accounts/accountsRecoverController.js

@@ -1,21 +0,0 @@
-angular
-    .module('bit.accounts')
-
-    .controller('accountsRecoverController', function ($scope, apiService, cryptoService) {
-        $scope.success = false;
-
-        $scope.submit = function (model) {
-            var email = model.email.toLowerCase();
-            var key = cryptoService.makeKey(model.masterPassword, email);
-
-            var request = {
-                email: email,
-                masterPasswordHash: cryptoService.hashPassword(model.masterPassword, key),
-                recoveryCode: model.code.replace(/\s/g, '').toLowerCase()
-            };
-
-            $scope.submitPromise = apiService.accounts.postTwoFactorRecover(request, function () {
-                $scope.success = true;
-            }).$promise;
-        };
-    });

src/app/accounts/accountsRegisterController.js

@@ -1,43 +0,0 @@
-angular
-    .module('bit.accounts')
-
-    .controller('accountsRegisterController', function ($scope, $location, apiService, cryptoService, validationService, $analytics) {
-        var params = $location.search();
-
-        $scope.success = false;
-        $scope.model = {
-            email: params.email
-        };
-
-        $scope.registerPromise = null;
-        $scope.register = function (form) {
-            var error = false;
-
-            if ($scope.model.masterPassword.length < 8) {
-                validationService.addError(form, 'MasterPassword', 'Master password must be at least 8 characters long.', true);
-                error = true;
-            }
-            if ($scope.model.masterPassword !== $scope.model.confirmMasterPassword) {
-                validationService.addError(form, 'ConfirmMasterPassword', 'Master password confirmation does not match.', true);
-                error = true;
-            }
-
-            if (error) {
-                return;
-            }
-
-            var email = $scope.model.email.toLowerCase();
-            var key = cryptoService.makeKey($scope.model.masterPassword, email);
-            var request = {
-                name: $scope.model.name,
-                email: email,
-                masterPasswordHash: cryptoService.hashPassword($scope.model.masterPassword, key),
-                masterPasswordHint: $scope.model.masterPasswordHint
-            };
-
-            $scope.registerPromise = apiService.accounts.register(request, function () {
-                $scope.success = true;
-                $analytics.eventTrack('Registered');
-            }).$promise;
-        };
-    });

src/app/accounts/hint.component.html

@@ -0,0 +1,27 @@
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="lead text-center mb-4">{{'passwordHint' | i18n}}</p>
+            <div class="card d-block">
+                <div class="card-body">
+                    <div class="form-group">
+                        <label for="email">{{'emailAddress' | i18n}}</label>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required appAutofocus inputmode="email"
+                            appInputVerbatim="false">
+                        <small class="form-text text-muted">{{'enterEmailToGetHint' | i18n}}</small>
+                    </div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span [hidden]="form.loading">{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                        </button>
+                        <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            {{'cancel' | i18n}}
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>

src/app/accounts/hint.component.ts

@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+import { HintComponent as BaseHintComponent } from 'jslib/angular/components/hint.component';
+
+@Component({
+    selector: 'app-hint',
+    templateUrl: 'hint.component.html',
+})
+export class HintComponent extends BaseHintComponent {
+    constructor(router: Router, analytics: Angulartics2,
+        toasterService: ToasterService, i18nService: I18nService,
+        apiService: ApiService) {
+        super(router, analytics, toasterService, i18nService, apiService);
+    }
+}

src/app/accounts/lock.component.html

@@ -0,0 +1,34 @@
+<form (ngSubmit)="submit()" class="container" ngNativeValidate>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="text-center mb-4">
+                <i class="fa fa-lock fa-4x text-muted"></i>
+            </p>
+            <p class="lead text-center mx-4 mb-4">{{'yourVaultIsLocked' | i18n}}</p>
+            <div class="card d-block">
+                <div class="card-body">
+                    <div class="form-group">
+                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                        <div class="d-flex">
+                            <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword" class="text-monospace form-control"
+                                [(ngModel)]="masterPassword" required appAutofocus appInputVerbatim>
+                            <button type="button" class="ml-1 btn btn-link" title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                                <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block">
+                            <i class="fa fa-unlock-alt"></i>
+                            {{'unlock' | i18n}}
+                        </button>
+                        <button type="button" class="btn btn-outline-secondary btn-block ml-2 mt-0" (click)="logOut()">
+                            {{'logOut' | i18n}}
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>

src/app/accounts/lock.component.ts

@@ -0,0 +1,47 @@
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { CryptoService } from 'jslib/abstractions/crypto.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { MessagingService } from 'jslib/abstractions/messaging.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { UserService } from 'jslib/abstractions/user.service';
+
+import { RouterService } from '../services/router.service';
+
+import { LockComponent as BaseLockComponent } from 'jslib/angular/components/lock.component';
+
+@Component({
+    selector: 'app-lock',
+    templateUrl: 'lock.component.html',
+})
+export class LockComponent extends BaseLockComponent implements OnInit {
+    constructor(router: Router, analytics: Angulartics2,
+        toasterService: ToasterService, i18nService: I18nService,
+        platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
+        userService: UserService, cryptoService: CryptoService,
+        private routerService: RouterService) {
+        super(router, analytics, toasterService, i18nService, platformUtilsService,
+            messagingService, userService, cryptoService);
+    }
+
+    async ngOnInit() {
+        const authed = await this.userService.isAuthenticated();
+        if (!authed) {
+            this.router.navigate(['/']);
+        } else if (await this.cryptoService.hasKey()) {
+            this.router.navigate(['vault']);
+        }
+
+        const previousUrl = this.routerService.getPreviousUrl();
+        if (previousUrl !== '/' && previousUrl.indexOf('lock') === -1) {
+            this.successRoute = previousUrl;
+        }
+    }
+}

src/app/accounts/login.component.html

@@ -0,0 +1,45 @@
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <img src="../../images/logo-dark@2x.png" class="logo mb-2" alt="Bitwarden">
+            <p class="lead text-center mx-4 mb-4">{{'loginOrCreateNewAccount' | i18n}}</p>
+            <div class="card d-block">
+                <div class="card-body">
+                    <div class="form-group">
+                        <label for="email">{{'emailAddress' | i18n}}</label>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required inputmode="email" appInputVerbatim="false">
+                    </div>
+                    <div class="form-group">
+                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                        <div class="d-flex">
+                            <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword" class="text-monospace form-control"
+                                [(ngModel)]="masterPassword" required appInputVerbatim>
+                            <button type="button" class="ml-1 btn btn-link" title="{{'toggleVisibility' | i18n}}" (click)="togglePassword()">
+                                <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                            </button>
+                        </div>
+                        <small class="form-text">
+                            <a routerLink="/hint">{{'getMasterPasswordHint' | i18n}}</a>
+                        </small>
+                    </div>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="rememberEmail" name="RememberEmail" [(ngModel)]="rememberEmail">
+                        <label class="form-check-label" for="rememberEmail">{{'rememberEmail' | i18n}}</label>
+                    </div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>
+                                <i class="fa fa-sign-in"></i> {{'logIn' | i18n}}
+                            </span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                        </button>
+                        <a routerLink="/register" [queryParams]="{email: email}" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            <i class="fa fa-pencil-square-o"></i> {{'createAccount' | i18n}}
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>

src/app/accounts/login.component.ts

@@ -0,0 +1,59 @@
+import { Component } from '@angular/core';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { AuthService } from 'jslib/abstractions/auth.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { StateService } from 'jslib/abstractions/state.service';
+import { StorageService } from 'jslib/abstractions/storage.service';
+
+import { LoginComponent as BaseLoginComponent } from 'jslib/angular/components/login.component';
+
+@Component({
+    selector: 'app-login',
+    templateUrl: 'login.component.html',
+})
+export class LoginComponent extends BaseLoginComponent {
+    constructor(authService: AuthService, router: Router,
+        analytics: Angulartics2, toasterService: ToasterService,
+        i18nService: I18nService, private route: ActivatedRoute,
+        storageService: StorageService, private stateService: StateService) {
+        super(authService, router, analytics, toasterService, i18nService, storageService);
+        this.onSuccessfulLoginNavigate = this.goAfterLogIn;
+    }
+
+    async ngOnInit() {
+        this.route.queryParams.subscribe(async (qParams) => {
+            if (qParams.email != null && qParams.email.indexOf('@') > -1) {
+                this.email = qParams.email;
+            }
+            if (qParams.premium != null) {
+                this.stateService.save('loginRedirect', { route: '/settings/premium' });
+            } else if (qParams.org != null) {
+                this.stateService.save('loginRedirect',
+                    { route: '/settings/create-organization', qParams: { plan: qParams.org } });
+            }
+            await super.ngOnInit();
+        });
+    }
+
+    async goAfterLogIn() {
+        const invite = await this.stateService.get<any>('orgInvitation');
+        if (invite != null) {
+            this.router.navigate(['accept-organization'], { queryParams: invite });
+        } else {
+            const loginRedirect = await this.stateService.get<any>('loginRedirect');
+            if (loginRedirect != null) {
+                this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
+                await this.stateService.remove('loginRedirect');
+            } else {
+                this.router.navigate([this.successRoute]);
+            }
+        }
+    }
+}

src/app/accounts/recover-delete.component.html

@@ -0,0 +1,27 @@
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="lead text-center mb-4">{{'deleteAccount' | i18n}}</p>
+            <div class="card">
+                <div class="card-body">
+                    <p>{{'deleteRecoverDesc' | i18n}}</p>
+                    <div class="form-group">
+                        <label for="email">{{'emailAddress' | i18n}}</label>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required appAutofocus inputmode="email"
+                            appInputVerbatim="false">
+                    </div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                        </button>
+                        <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            {{'cancel' | i18n}}
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>

src/app/accounts/recover-delete.component.ts

@@ -0,0 +1,36 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+import { DeleteRecoverRequest } from 'jslib/models/request/deleteRecoverRequest';
+
+@Component({
+    selector: 'app-recover-delete',
+    templateUrl: 'recover-delete.component.html',
+})
+export class RecoverDeleteComponent {
+    email: string;
+    formPromise: Promise<any>;
+
+    constructor(private router: Router, private apiService: ApiService,
+        private analytics: Angulartics2, private toasterService: ToasterService,
+        private i18nService: I18nService) {
+    }
+
+    async submit() {
+        try {
+            const request = new DeleteRecoverRequest();
+            request.email = this.email.toLowerCase();
+            this.formPromise = this.apiService.postAccountRecoverDelete(request);
+            await this.formPromise;
+            this.analytics.eventTrack.next({ action: 'Started Delete Recovery' });
+            this.toasterService.popAsync('success', null, this.i18nService.t('deleteRecoverEmailSent'));
+            this.router.navigate(['/']);
+        } catch { }
+    }
+}

src/app/accounts/recover-two-factor.component.html

@@ -0,0 +1,39 @@
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="lead text-center mb-4">{{'recoverAccountTwoStep' | i18n}}</p>
+            <div class="card">
+                <div class="card-body">
+                    <p>{{'recoverAccountTwoStepDesc' | i18n}}
+                        <a href="https://help.bitwarden.com/article/lost-two-step-device/" target="_blank" rel="noopener">{{'learnMore' | i18n}}</a>
+                    </p>
+                    <div class="form-group">
+                        <label for="email">{{'emailAddress' | i18n}}</label>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required appAutofocus inputmode="email"
+                            appInputVerbatim="false">
+                    </div>
+                    <div class="form-group">
+                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                        <input id="masterPassword" type="password" name="MasterPassword" class="form-control" [(ngModel)]="masterPassword" required
+                            appInputVerbatim>
+                    </div>
+                    <div class="form-group">
+                        <label for="recoveryCode">{{'recoveryCodeTitle' | i18n}}</label>
+                        <input id="recoveryCode" class="text-monospace form-control" type="text" name="RecoveryCode" [(ngModel)]="recoveryCode" required
+                            appInputVerbatim>
+                    </div>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                        </button>
+                        <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            {{'cancel' | i18n}}
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>

src/app/accounts/recover-two-factor.component.ts

@@ -0,0 +1,43 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { AuthService } from 'jslib/abstractions/auth.service';
+import { CryptoService } from 'jslib/abstractions/crypto.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+import { TwoFactorRecoveryRequest } from 'jslib/models/request/twoFactorRecoveryRequest';
+
+@Component({
+    selector: 'app-recover-two-factor',
+    templateUrl: 'recover-two-factor.component.html',
+})
+export class RecoverTwoFactorComponent {
+    email: string;
+    masterPassword: string;
+    recoveryCode: string;
+    formPromise: Promise<any>;
+
+    constructor(private router: Router, private apiService: ApiService,
+        private analytics: Angulartics2, private toasterService: ToasterService,
+        private i18nService: I18nService, private cryptoService: CryptoService,
+        private authService: AuthService) { }
+
+    async submit() {
+        try {
+            const request = new TwoFactorRecoveryRequest();
+            request.recoveryCode = this.recoveryCode.replace(/\s/g, '').toLowerCase();
+            request.email = this.email.toLowerCase();
+            const key = await this.authService.makePreloginKey(this.masterPassword, request.email);
+            request.masterPasswordHash = await this.cryptoService.hashPassword(this.masterPassword, key);
+            this.formPromise = this.apiService.postTwoFactorRecover(request);
+            await this.formPromise;
+            this.analytics.eventTrack.next({ action: 'Recovered 2FA' });
+            this.toasterService.popAsync('success', null, this.i18nService.t('twoStepRecoverDisabled'));
+            this.router.navigate(['/']);
+        } catch { }
+    }
+}

src/app/accounts/register.component.html

@@ -0,0 +1,66 @@
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="lead text-center mb-4">{{'createAccount' | i18n}}</p>
+            <div class="card d-block">
+                <div class="card-body">
+                    <app-callout title="{{'createOrganizationStep1' | i18n}}" type="info" icon="fa-thumb-tack" *ngIf="showCreateOrgMessage">
+                        {{'createOrganizationCreatePersonalAccount' | i18n}}
+                    </app-callout>
+                    <div class="form-group">
+                        <label for="email">{{'emailAddress' | i18n}}</label>
+                        <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email" required [appAutofocus]="email === ''"
+                            inputmode="email" appInputVerbatim="false">
+                        <small class="form-text text-muted">{{'emailAddressDesc' | i18n}}</small>
+                    </div>
+                    <div class="form-group">
+                        <label for="name">{{'yourName' | i18n}}</label>
+                        <input id="name" class="form-control" type="text" name="Name" [(ngModel)]="name" [appAutofocus]="email !== ''">
+                        <small class="form-text text-muted">{{'yourNameDesc' | i18n}}</small>
+                    </div>
+                    <div class="form-group">
+                        <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                        <div class="d-flex">
+                            <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}" name="MasterPassword" class="text-monospace form-control"
+                                [(ngModel)]="masterPassword" required appInputVerbatim>
+                            <button type="button" class="ml-1 btn btn-link" title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(false)">
+                                <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                            </button>
+                        </div>
+                        <small class="form-text text-muted">{{'masterPassDesc' | i18n}}</small>
+                    </div>
+                    <div class="form-group">
+                        <label for="masterPasswordRetype">{{'reTypeMasterPass' | i18n}}</label>
+                        <div class="d-flex">
+                            <input id="masterPasswordRetype" type="{{showPassword ? 'text' : 'password'}}" name="MasterPasswordRetype" class="text-monospace form-control"
+                                [(ngModel)]="confirmMasterPassword" required appInputVerbatim>
+                            <button type="button" class="ml-1 btn btn-link" title="{{'toggleVisibility' | i18n}}" (click)="togglePassword(true)">
+                                <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="hint">{{'masterPassHint' | i18n}}</label>
+                        <input id="hint" class="form-control" type="text" name="Hint" [(ngModel)]="hint">
+                        <small class="form-text text-muted">{{'masterPassHintDesc' | i18n}}</small>
+                    </div>
+                    <hr>
+                    <div class="d-flex mb-2">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'submit' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                        </button>
+                        <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            {{'cancel' | i18n}}
+                        </a>
+                    </div>
+                    <small class="text-muted" *ngIf="showTerms">
+                        {{'submitAgreePolicies' | i18n}}
+                        <a href="https://bitwarden.com/terms/" target="_blank" rel="noopener">{{'termsOfService' | i18n}}</a>,
+                        <a href="https://bitwarden.com/privacy/" target="_blank" rel="noopener">{{'privacyPolicy' | i18n}}</a>
+                    </small>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>

src/app/accounts/register.component.ts

@@ -0,0 +1,50 @@
+import { Component } from '@angular/core';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { AuthService } from 'jslib/abstractions/auth.service';
+import { CryptoService } from 'jslib/abstractions/crypto.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { StateService } from 'jslib/abstractions/state.service';
+
+import { RegisterComponent as BaseRegisterComponent } from 'jslib/angular/components/register.component';
+
+@Component({
+    selector: 'app-register',
+    templateUrl: 'register.component.html',
+})
+export class RegisterComponent extends BaseRegisterComponent {
+    showCreateOrgMessage = false;
+    showTerms = true;
+
+    constructor(authService: AuthService, router: Router,
+        analytics: Angulartics2, toasterService: ToasterService,
+        i18nService: I18nService, cryptoService: CryptoService,
+        apiService: ApiService, private route: ActivatedRoute,
+        stateService: StateService, platformUtilsService: PlatformUtilsService) {
+        super(authService, router, analytics, toasterService, i18nService, cryptoService, apiService, stateService);
+        this.showTerms = !platformUtilsService.isSelfHost();
+    }
+
+    ngOnInit() {
+        this.route.queryParams.subscribe((qParams) => {
+            if (qParams.email != null && qParams.email.indexOf('@') > -1) {
+                this.email = qParams.email;
+            }
+            if (qParams.premium != null) {
+                this.stateService.save('loginRedirect', { route: '/settings/premium' });
+            } else if (qParams.org != null) {
+                this.showCreateOrgMessage = true;
+                this.stateService.save('loginRedirect',
+                    { route: '/settings/create-organization', qParams: { plan: qParams.org } });
+            }
+        });
+    }
+}

src/app/accounts/two-factor-options.component.html

@@ -0,0 +1,26 @@
+<div class="modal fade">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h2 class="modal-title">{{'twoStepOptions' | i18n}}</h2>
+                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="list-group list-group-flush">
+                <a href="#" appStopClick *ngFor="let p of providers" (click)="choose(p)" class="list-group-item list-group-item-action">
+                    <img [src]="'images/two-factor/' + p.type + '.png'" alt="" class="pull-right">
+                    <h3>{{p.name}}</h3>
+                    {{p.description}}
+                </a>
+                <a href="#" appStopClick class="list-group-item list-group-item-action" (click)="recover()">
+                    <h3>{{'recoveryCodeTitle' | i18n}}</h3>
+                    {{'recoveryCodeDesc' | i18n}}
+                </a>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
+            </div>
+        </div>
+    </div>
+</div>

src/app/accounts/two-factor-options.component.ts

@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { AuthService } from 'jslib/abstractions/auth.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+
+import {
+    TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent,
+} from 'jslib/angular/components/two-factor-options.component';
+
+@Component({
+    selector: 'app-two-factor-options',
+    templateUrl: 'two-factor-options.component.html',
+})
+export class TwoFactorOptionsComponent extends BaseTwoFactorOptionsComponent {
+    constructor(authService: AuthService, router: Router,
+        analytics: Angulartics2, toasterService: ToasterService,
+        i18nService: I18nService, platformUtilsService: PlatformUtilsService) {
+        super(authService, router, analytics, toasterService, i18nService, platformUtilsService, window);
+    }
+}

src/app/accounts/two-factor.component.html

@@ -0,0 +1,77 @@
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate autocomplete="off">
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5" [ngClass]="{'col-9': selectedProviderType === providerType.Duo || selectedProviderType === providerType.OrganizationDuo}">
+            <p class="lead text-center mb-4">{{title}}</p>
+            <div class="card d-block">
+                <div class="card-body">
+                    <ng-container *ngIf="selectedProviderType === providerType.Email || selectedProviderType === providerType.Authenticator">
+                        <p *ngIf="selectedProviderType === providerType.Authenticator">{{'enterVerificationCodeApp' | i18n}}</p>
+                        <p *ngIf="selectedProviderType === providerType.Email">
+                            {{'enterVerificationCodeEmail' | i18n : twoFactorEmail}}
+                        </p>
+                        <div class="form-group">
+                            <label for="code" class="sr-only">{{'verificationCode' | i18n}}</label>
+                            <input id="code" type="text" name="Code" class="form-control" [(ngModel)]="token" required appAutofocus inputmode="tel" appInputVerbatim>
+                            <small class="form-text" *ngIf="selectedProviderType === providerType.Email">
+                                <a href="#" appStopClick (click)="sendEmail(true)" [appApiAction]="emailPromise" *ngIf="selectedProviderType === providerType.Email">
+                                    {{'sendVerificationCodeEmailAgain' | i18n}}
+                                </a>
+                            </small>
+                        </div>
+                    </ng-container>
+                    <ng-container *ngIf="selectedProviderType === providerType.Yubikey">
+                        <p class="text-center">{{'insertYubiKey' | i18n}}</p>
+                        <img src="../../images/yubikey.jpg" class="rounded img-fluid mb-3" alt="">
+                        <div class="form-group">
+                            <label for="code" class="sr-only">{{'verificationCode' | i18n}}</label>
+                            <input id="code" type="password" name="Code" class="form-control" [(ngModel)]="token" required appAutofocus appInputVerbatim
+                                autocomplete="new-password">
+                        </div>
+                    </ng-container>
+                    <ng-container *ngIf="selectedProviderType === providerType.U2f">
+                        <p class="text-center" *ngIf="!u2fReady">
+                            <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
+                        </p>
+                        <ng-container *ngIf="u2fReady">
+                            <p class="text-center">{{'insertU2f' | i18n}}</p>
+                            <img src="../../images/u2fkey.jpg" alt="" class="rounded img-fluid mb-3">
+                        </ng-container>
+                    </ng-container>
+                    <ng-container *ngIf="selectedProviderType === providerType.Duo ||
+                        selectedProviderType === providerType.OrganizationDuo">
+                        <div id="duo-frame" class="mb-3">
+                            <iframe id="duo_iframe"></iframe>
+                        </div>
+                    </ng-container>
+                    <i class="fa fa-spinner text-muted fa-spin pull-right" title="{{'loading' | i18n}}" *ngIf="form.loading && selectedProviderType === providerType.U2f"></i>
+                    <div class="form-check" *ngIf="selectedProviderType != null">
+                        <input id="remember" type="checkbox" name="Remember" class="form-check-input" [(ngModel)]="remember">
+                        <label for="remember" class="form-check-label">{{'rememberMe' | i18n}}</label>
+                    </div>
+                    <ng-container *ngIf="selectedProviderType == null">
+                        <p>{{'noTwoStepProviders' | i18n}}</p>
+                        <p>{{'noTwoStepProviders2' | i18n}}</p>
+                    </ng-container>
+                    <hr>
+                    <div class="d-flex mb-3">
+                        <button type="submit" class="btn btn-primary btn-block btn-submit" [disabled]="form.loading" *ngIf="selectedProviderType != null && selectedProviderType !== providerType.Duo && 
+                        selectedProviderType !== providerType.OrganizationDuo && selectedProviderType !== providerType.U2f">
+                            <span>
+                                <i class="fa fa-sign-in"></i> {{'continue' | i18n}}
+                            </span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                        </button>
+                        <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            {{'cancel' | i18n}}
+                        </a>
+                    </div>
+                    <div class="text-center">
+                        <a href="#" appStopClick (click)="anotherMethod()">{{'useAnotherTwoStepMethod' | i18n}}</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
+<ng-template #twoFactorOptions></ng-template>
+<iframe id="u2f_iframe" hidden></iframe>

src/app/accounts/two-factor.component.ts

@@ -0,0 +1,75 @@
+import {
+    Component,
+    ComponentFactoryResolver,
+    ViewChild,
+    ViewContainerRef,
+} from '@angular/core';
+
+import { Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { TwoFactorOptionsComponent } from './two-factor-options.component';
+
+import { ModalComponent } from '../modal.component';
+
+import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { AuthService } from 'jslib/abstractions/auth.service';
+import { EnvironmentService } from 'jslib/abstractions/environment.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { StateService } from 'jslib/abstractions/state.service';
+
+import { TwoFactorComponent as BaseTwoFactorComponent } from 'jslib/angular/components/two-factor.component';
+
+@Component({
+    selector: 'app-two-factor',
+    templateUrl: 'two-factor.component.html',
+})
+export class TwoFactorComponent extends BaseTwoFactorComponent {
+    @ViewChild('twoFactorOptions', { read: ViewContainerRef }) twoFactorOptionsModal: ViewContainerRef;
+
+    constructor(authService: AuthService, router: Router,
+        analytics: Angulartics2, toasterService: ToasterService,
+        i18nService: I18nService, apiService: ApiService,
+        platformUtilsService: PlatformUtilsService, private stateService: StateService,
+        environmentService: EnvironmentService, private componentFactoryResolver: ComponentFactoryResolver) {
+        super(authService, router, analytics, toasterService, i18nService, apiService,
+            platformUtilsService, window, environmentService);
+        this.onSuccessfulLoginNavigate = this.goAfterLogIn;
+    }
+
+    anotherMethod() {
+        const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
+        const modal = this.twoFactorOptionsModal.createComponent(factory).instance;
+        const childComponent = modal.show<TwoFactorOptionsComponent>(TwoFactorOptionsComponent,
+            this.twoFactorOptionsModal);
+
+        childComponent.onProviderSelected.subscribe(async (provider: TwoFactorProviderType) => {
+            modal.close();
+            this.selectedProviderType = provider;
+            await this.init();
+        });
+        childComponent.onRecoverSelected.subscribe(() => {
+            modal.close();
+        });
+    }
+
+    async goAfterLogIn() {
+        const invite = await this.stateService.get<any>('orgInvitation');
+        if (invite != null) {
+            this.router.navigate(['accept-organization'], { queryParams: invite });
+        } else {
+            const loginRedirect = await this.stateService.get<any>('loginRedirect');
+            if (loginRedirect != null) {
+                this.router.navigate([loginRedirect.route], { queryParams: loginRedirect.qParams });
+                await this.stateService.remove('loginRedirect');
+            } else {
+                this.router.navigate([this.successRoute]);
+            }
+        }
+    }
+}

src/app/accounts/verify-email-token.component.html

@@ -0,0 +1,8 @@
+<div class="mt-5 d-flex justify-content-center">
+    <div>
+        <img src="../../images/logo-dark@2x.png" class="mb-4 logo" alt="Bitwarden">
+        <p class="text-center">
+            <i class="fa fa-spinner fa-spin fa-2x text-muted" title="{{'loading' | i18n}}"></i>
+        </p>
+    </div>
+</div>

src/app/accounts/verify-email-token.component.ts

@@ -0,0 +1,51 @@
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { UserService } from 'jslib/abstractions/user.service';
+
+import { VerifyEmailRequest } from 'jslib/models/request/verifyEmailRequest';
+
+@Component({
+    selector: 'app-verify-email-token',
+    templateUrl: 'verify-email-token.component.html',
+})
+export class VerifyEmailTokenComponent implements OnInit {
+    constructor(private router: Router, private toasterService: ToasterService,
+        private i18nService: I18nService, private route: ActivatedRoute,
+        private apiService: ApiService, private userService: UserService) { }
+
+    ngOnInit() {
+        let fired = false;
+        this.route.queryParams.subscribe(async (qParams) => {
+            if (fired) {
+                return;
+            }
+            fired = true;
+            if (qParams.userId != null && qParams.token != null) {
+                try {
+                    await this.apiService.postAccountVerifyEmailToken(
+                        new VerifyEmailRequest(qParams.userId, qParams.token));
+                    const authed = await this.userService.isAuthenticated();
+                    if (authed) {
+                        await this.apiService.refreshIdentityToken();
+                    }
+                    this.toasterService.popAsync('success', null, this.i18nService.t('emailVerified'));
+                    this.router.navigate(['/']);
+                    return;
+                } catch { }
+            }
+            this.toasterService.popAsync('error', null, this.i18nService.t('emailVerifiedFailed'));
+            this.router.navigate(['/']);
+        });
+    }
+}

src/app/accounts/verify-recover-delete.component.html

@@ -0,0 +1,26 @@
+<form #form (ngSubmit)="submit()" [appApiAction]="formPromise" class="container" ngNativeValidate>
+    <div class="row justify-content-md-center mt-5">
+        <div class="col-5">
+            <p class="lead text-center mb-4">{{'deleteAccount' | i18n}}</p>
+            <div class="card">
+                <div class="card-body">
+                    <app-callout type="warning">{{'deleteAccountWarning' | i18n}}</app-callout>
+                    <p class="text-center">
+                        <strong>{{email}}</strong>
+                    </p>
+                    <p>{{'deleteRecoverConfirmDesc' | i18n}}</p>
+                    <hr>
+                    <div class="d-flex">
+                        <button type="submit" class="btn btn-danger btn-block btn-submit" [disabled]="form.loading">
+                            <span>{{'deleteAccount' | i18n}}</span>
+                            <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                        </button>
+                        <a routerLink="/" class="btn btn-outline-secondary btn-block ml-2 mt-0">
+                            {{'cancel' | i18n}}
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>

src/app/accounts/verify-recover-delete.component.ts

@@ -0,0 +1,62 @@
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+import { VerifyDeleteRecoverRequest } from 'jslib/models/request/verifyDeleteRecoverRequest';
+
+@Component({
+    selector: 'app-verify-recover-delete',
+    templateUrl: 'verify-recover-delete.component.html',
+})
+export class VerifyRecoverDeleteComponent implements OnInit {
+    email: string;
+    formPromise: Promise<any>;
+
+    private userId: string;
+    private token: string;
+
+    constructor(private router: Router, private apiService: ApiService,
+        private analytics: Angulartics2, private toasterService: ToasterService,
+        private i18nService: I18nService, private route: ActivatedRoute) {
+    }
+
+    ngOnInit() {
+        let fired = false;
+        this.route.queryParams.subscribe(async (qParams) => {
+            if (fired) {
+                return;
+            }
+            fired = true;
+            if (qParams.userId != null && qParams.token != null && qParams.email != null) {
+                this.userId = qParams.userId;
+                this.token = qParams.token;
+                this.email = qParams.email;
+            } else {
+                this.router.navigate(['/']);
+            }
+        });
+    }
+
+    async submit() {
+        try {
+            const request = new VerifyDeleteRecoverRequest(this.userId, this.token);
+            this.formPromise = this.apiService.postAccountRecoverDeleteToken(request);
+            await this.formPromise;
+            this.analytics.eventTrack.next({ action: 'Recovered Delete' });
+            this.toasterService.popAsync('success', this.i18nService.t('accountDeleted'),
+                this.i18nService.t('accountDeletedDesc'));
+            this.router.navigate(['/']);
+        } catch { }
+    }
+}

src/app/accounts/views/accountsLogin.html

@@ -1,7 +0,0 @@
-<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>

src/app/accounts/views/accountsLoginInfo.html

@@ -1,41 +0,0 @@
-<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 occured</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">Create a new account</a></li>
-        <li><a ui-sref="frontend.passwordHint">Get master password hint</a></li>
-    </ul>
-</form>

src/app/accounts/views/accountsLoginTwoFactor.html

@@ -1,25 +0,0 @@
-<p class="login-box-msg">Enter your two-step verification code.</p>
-<form name="twoFactorForm" ng-submit="twoFactorForm.$valid && twoFactor(model)" api-form="twoFactorPromise">
-    <div class="callout callout-danger validation-errors" ng-show="twoFactorForm.$errors">
-        <h4>Errors have occured</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="model.code"
-               required api-field />
-        <span class="fa fa-lock form-control-feedback"></span>
-    </div>
-    <div class="row">
-        <div class="col-xs-7">
-            <a ui-sref="frontend.recover">Lost authenticator app?</a>
-        </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>

src/app/accounts/views/accountsPasswordHint.html

@@ -1,39 +0,0 @@
-<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 occured</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>

src/app/accounts/views/accountsRecover.html

@@ -1,52 +0,0 @@
-<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">Lost your authenticator app?</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 occured</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>

src/app/accounts/views/accountsRegister.html

@@ -1,73 +0,0 @@
-<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">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-danger validation-errors" ng-show="registerForm.$errors">
-                <h4>Errors have occured</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"
-                       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">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>
-        </form>
-    </div>
-</div>

src/app/apiInterceptor.js

@@ -1,29 +0,0 @@
-angular
-    .module('bit')
-
-    .factory('apiInterceptor', function ($injector, $q, toastr) {
-        return {
-            request: function (config) {
-                return config;
-            },
-            response: function (response) {
-                if (response.status === 401 || response.status === 403) {
-                    $injector.get('authService').logOut();
-                    $injector.get('$state').go('frontend.login.info').then(function () {
-                        toastr.warning('Your login session has expired.', 'Logged out');
-                    });
-                }
-
-                return response || $q.when(response);
-            },
-            responseError: function (rejection) {
-                if (rejection.status === 401 || rejection.status === 403) {
-                    $injector.get('authService').logOut();
-                    $injector.get('$state').go('frontend.login.info').then(function () {
-                        toastr.warning('Your login session has expired.', 'Logged out');
-                    });
-                }
-                return $q.reject(rejection);
-            }
-        };
-    });

src/app/app-routing.module.ts

@@ -0,0 +1,214 @@
+import { NgModule } from '@angular/core';
+import {
+    RouterModule,
+    Routes,
+} from '@angular/router';
+
+import { FrontendLayoutComponent } from './layouts/frontend-layout.component';
+import { OrganizationLayoutComponent } from './layouts/organization-layout.component';
+import { UserLayoutComponent } from './layouts/user-layout.component';
+
+import { AcceptOrganizationComponent } from './accounts/accept-organization.component';
+import { HintComponent } from './accounts/hint.component';
+import { LockComponent } from './accounts/lock.component';
+import { LoginComponent } from './accounts/login.component';
+import { RecoverDeleteComponent } from './accounts/recover-delete.component';
+import { RecoverTwoFactorComponent } from './accounts/recover-two-factor.component';
+import { RegisterComponent } from './accounts/register.component';
+import { TwoFactorComponent } from './accounts/two-factor.component';
+import { VerifyEmailTokenComponent } from './accounts/verify-email-token.component';
+import { VerifyRecoverDeleteComponent } from './accounts/verify-recover-delete.component';
+
+import { CollectionsComponent as OrgManageCollectionsComponent } from './organizations/manage/collections.component';
+import { EventsComponent as OrgEventsComponent } from './organizations/manage/events.component';
+import { GroupsComponent as OrgGroupsComponent } from './organizations/manage/groups.component';
+import { ManageComponent as OrgManageComponent } from './organizations/manage/manage.component';
+import { PeopleComponent as OrgPeopleComponent } from './organizations/manage/people.component';
+
+import { AccountComponent as OrgAccountComponent } from './organizations/settings/account.component';
+import { OrganizationBillingComponent } from './organizations/settings/organization-billing.component';
+import { SettingsComponent as OrgSettingsComponent } from './organizations/settings/settings.component';
+import {
+    TwoFactorSetupComponent as OrgTwoFactorSetupComponent,
+} from './organizations/settings/two-factor-setup.component';
+
+import { ExportComponent as OrgExportComponent } from './organizations/tools/export.component';
+import { ImportComponent as OrgImportComponent } from './organizations/tools/import.component';
+import { ToolsComponent as OrgToolsComponent } from './organizations/tools/tools.component';
+
+import { VaultComponent as OrgVaultComponent } from './organizations/vault/vault.component';
+
+import { AccountComponent } from './settings/account.component';
+import { CreateOrganizationComponent } from './settings/create-organization.component';
+import { DomainRulesComponent } from './settings/domain-rules.component';
+import { OptionsComponent } from './settings/options.component';
+import { OrganizationsComponent } from './settings/organizations.component';
+import { PremiumComponent } from './settings/premium.component';
+import { SettingsComponent } from './settings/settings.component';
+import { TwoFactorSetupComponent } from './settings/two-factor-setup.component';
+import { UserBillingComponent } from './settings/user-billing.component';
+
+import { BreachReportComponent } from './tools/breach-report.component';
+import { ExportComponent } from './tools/export.component';
+import { ImportComponent } from './tools/import.component';
+import { PasswordGeneratorComponent } from './tools/password-generator.component';
+import { ToolsComponent } from './tools/tools.component';
+
+import { VaultComponent } from './vault/vault.component';
+
+import { OrganizationGuardService } from './services/organization-guard.service';
+import { OrganizationTypeGuardService } from './services/organization-type-guard.service';
+import { UnauthGuardService } from './services/unauth-guard.service';
+
+import { AuthGuardService } from 'jslib/angular/services/auth-guard.service';
+
+import { OrganizationUserType } from 'jslib/enums/organizationUserType';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: FrontendLayoutComponent,
+        children: [
+            { path: '', pathMatch: 'full', component: LoginComponent, canActivate: [UnauthGuardService] },
+            { path: '2fa', component: TwoFactorComponent, canActivate: [UnauthGuardService] },
+            {
+                path: 'register', component: RegisterComponent,
+                canActivate: [UnauthGuardService],
+                data: { titleId: 'createAccount' },
+            },
+            {
+                path: 'hint', component: HintComponent,
+                canActivate: [UnauthGuardService],
+                data: { titleId: 'passwordHint' },
+            },
+            { path: 'lock', component: LockComponent },
+            { path: 'verify-email', component: VerifyEmailTokenComponent },
+            {
+                path: 'accept-organization',
+                component: AcceptOrganizationComponent,
+                data: { titleId: 'joinOrganization' },
+            },
+            { path: 'recover', pathMatch: 'full', redirectTo: 'recover-2fa' },
+            {
+                path: 'recover-2fa',
+                component: RecoverTwoFactorComponent,
+                canActivate: [UnauthGuardService],
+                data: { titleId: 'recoverAccountTwoStep' },
+            },
+            {
+                path: 'recover-delete',
+                component: RecoverDeleteComponent,
+                canActivate: [UnauthGuardService],
+                data: { titleId: 'deleteAccount' },
+            },
+            {
+                path: 'verify-recover-delete',
+                component: VerifyRecoverDeleteComponent,
+                canActivate: [UnauthGuardService],
+                data: { titleId: 'deleteAccount' },
+            },
+        ],
+    },
+    {
+        path: '',
+        component: UserLayoutComponent,
+        canActivate: [AuthGuardService],
+        children: [
+            { path: 'vault', component: VaultComponent, data: { titleId: 'myVault' } },
+            {
+                path: 'settings',
+                component: SettingsComponent,
+                children: [
+                    { path: '', pathMatch: 'full', redirectTo: 'account' },
+                    { path: 'account', component: AccountComponent, data: { titleId: 'myAccount' } },
+                    { path: 'options', component: OptionsComponent, data: { titleId: 'options' } },
+                    { path: 'domain-rules', component: DomainRulesComponent, data: { titleId: 'domainRules' } },
+                    { path: 'two-factor', component: TwoFactorSetupComponent, data: { titleId: 'twoStepLogin' } },
+                    { path: 'premium', component: PremiumComponent, data: { titleId: 'goPremium' } },
+                    { path: 'billing', component: UserBillingComponent, data: { titleId: 'billingAndLicensing' } },
+                    { path: 'organizations', component: OrganizationsComponent, data: { titleId: 'organizations' } },
+                    {
+                        path: 'create-organization',
+                        component: CreateOrganizationComponent,
+                        data: { titleId: 'newOrganization' },
+                    },
+                ],
+            },
+            {
+                path: 'tools',
+                component: ToolsComponent,
+                canActivate: [AuthGuardService],
+                children: [
+                    { path: '', pathMatch: 'full', redirectTo: 'generator' },
+                    { path: 'import', component: ImportComponent, data: { titleId: 'importData' } },
+                    { path: 'export', component: ExportComponent, data: { titleId: 'exportVault' } },
+                    {
+                        path: 'generator',
+                        component: PasswordGeneratorComponent,
+                        data: { titleId: 'passwordGenerator' },
+                    },
+                    { path: 'breach-report', component: BreachReportComponent, data: { titleId: 'dataBreachReport' } },
+                ],
+            },
+        ],
+    },
+    {
+        path: 'organizations/:organizationId',
+        component: OrganizationLayoutComponent,
+        canActivate: [AuthGuardService, OrganizationGuardService],
+        children: [
+            { path: '', pathMatch: 'full', redirectTo: 'vault' },
+            { path: 'vault', component: OrgVaultComponent, data: { titleId: 'vault' } },
+            {
+                path: 'tools',
+                component: OrgToolsComponent,
+                canActivate: [OrganizationTypeGuardService],
+                data: { allowedTypes: [OrganizationUserType.Owner, OrganizationUserType.Admin] },
+                children: [
+                    { path: '', pathMatch: 'full', redirectTo: 'import' },
+                    { path: 'import', component: OrgImportComponent, data: { titleId: 'importData' } },
+                    { path: 'export', component: OrgExportComponent, data: { titleId: 'exportVault' } },
+                ],
+            },
+            {
+                path: 'manage',
+                component: OrgManageComponent,
+                canActivate: [OrganizationTypeGuardService],
+                data: { allowedTypes: [OrganizationUserType.Owner, OrganizationUserType.Admin] },
+                children: [
+                    { path: '', pathMatch: 'full', redirectTo: 'people' },
+                    { path: 'collections', component: OrgManageCollectionsComponent, data: { titleId: 'collections' } },
+                    { path: 'events', component: OrgEventsComponent, data: { titleId: 'eventLogs' } },
+                    { path: 'groups', component: OrgGroupsComponent, data: { titleId: 'groups' } },
+                    { path: 'people', component: OrgPeopleComponent, data: { titleId: 'people' } },
+                ],
+            },
+            {
+                path: 'settings',
+                component: OrgSettingsComponent,
+                canActivate: [OrganizationTypeGuardService],
+                data: { allowedTypes: [OrganizationUserType.Owner] },
+                children: [
+                    { path: '', pathMatch: 'full', redirectTo: 'account' },
+                    { path: 'account', component: OrgAccountComponent, data: { titleId: 'myOrganization' } },
+                    { path: 'two-factor', component: OrgTwoFactorSetupComponent, data: { titleId: 'twoStepLogin' } },
+                    {
+                        path: 'billing',
+                        component: OrganizationBillingComponent,
+                        data: { titleId: 'billingAndLicensing' },
+                    },
+                ],
+            },
+        ],
+    },
+    { path: '**', redirectTo: '' },
+];
+
+@NgModule({
+    imports: [RouterModule.forRoot(routes, {
+        useHash: true,
+        /*enableTracing: true,*/
+    })],
+    exports: [RouterModule],
+})
+export class AppRoutingModule { }

src/app/app.component.html

@@ -0,0 +1,2 @@
+<toaster-container [toasterconfig]="toasterConfig"></toaster-container>
+<router-outlet></router-outlet>

src/app/app.component.ts

@@ -0,0 +1,212 @@
+import * as jq from 'jquery';
+import * as _swal from 'sweetalert';
+import { SweetAlert } from 'sweetalert/typings/core';
+
+import {
+    ToasterConfig,
+    ToasterService,
+} from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+
+import {
+    Component,
+    NgZone,
+    OnDestroy,
+    OnInit,
+} from '@angular/core';
+import {
+    NavigationEnd,
+    Router,
+} from '@angular/router';
+
+import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
+
+import { StorageService } from 'jslib/abstractions/storage.service';
+
+import { AuthService } from 'jslib/abstractions/auth.service';
+import { CipherService } from 'jslib/abstractions/cipher.service';
+import { CollectionService } from 'jslib/abstractions/collection.service';
+import { CryptoService } from 'jslib/abstractions/crypto.service';
+import { FolderService } from 'jslib/abstractions/folder.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { LockService } from 'jslib/abstractions/lock.service';
+import { NotificationsService } from 'jslib/abstractions/notifications.service';
+import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { SearchService } from 'jslib/abstractions/search.service';
+import { SettingsService } from 'jslib/abstractions/settings.service';
+import { SyncService } from 'jslib/abstractions/sync.service';
+import { TokenService } from 'jslib/abstractions/token.service';
+import { UserService } from 'jslib/abstractions/user.service';
+
+import { ConstantsService } from 'jslib/services/constants.service';
+
+import { RouterService } from './services/router.service';
+
+const BroadcasterSubscriptionId = 'AppComponent';
+// Hack due to Angular 5.2 bug
+const swal: SweetAlert = _swal as any;
+const IdleTimeout = 60000 * 10; // 10 minutes
+
+@Component({
+    selector: 'app-root',
+    templateUrl: 'app.component.html',
+})
+export class AppComponent implements OnDestroy, OnInit {
+    toasterConfig: ToasterConfig = new ToasterConfig({
+        showCloseButton: true,
+        mouseoverTimerStop: true,
+        animation: 'flyRight',
+        limit: 5,
+    });
+
+    private lastActivity: number = null;
+    private idleTimer: number = null;
+    private isIdle = false;
+
+    constructor(private angulartics2GoogleAnalytics: Angulartics2GoogleAnalytics,
+        private broadcasterService: BroadcasterService, private userService: UserService,
+        private tokenService: TokenService, private folderService: FolderService,
+        private settingsService: SettingsService, private syncService: SyncService,
+        private passwordGenerationService: PasswordGenerationService, private cipherService: CipherService,
+        private authService: AuthService, private router: Router, private analytics: Angulartics2,
+        private toasterService: ToasterService, private i18nService: I18nService,
+        private platformUtilsService: PlatformUtilsService, private ngZone: NgZone,
+        private lockService: LockService, private storageService: StorageService,
+        private cryptoService: CryptoService, private collectionService: CollectionService,
+        private routerService: RouterService, private searchService: SearchService,
+        private notificationsService: NotificationsService) { }
+
+    ngOnInit() {
+        this.ngZone.runOutsideAngular(() => {
+            window.onmousemove = () => this.recordActivity();
+            window.onmousedown = () => this.recordActivity();
+            window.ontouchstart = () => this.recordActivity();
+            window.onclick = () => this.recordActivity();
+            window.onscroll = () => this.recordActivity();
+            window.onkeypress = () => this.recordActivity();
+        });
+
+        this.broadcasterService.subscribe(BroadcasterSubscriptionId, async (message: any) => {
+            this.ngZone.run(async () => {
+                switch (message.command) {
+                    case 'loggedIn':
+                    case 'loggedOut':
+                    case 'unlocked':
+                        this.notificationsService.updateConnection(false);
+                        break;
+                    case 'logout':
+                        this.logOut(!!message.expired);
+                        break;
+                    case 'lockVault':
+                        await this.lockService.lock();
+                        break;
+                    case 'locked':
+                        this.notificationsService.updateConnection(false);
+                        this.router.navigate(['lock']);
+                        break;
+                    case 'syncStarted':
+                        break;
+                    case 'syncCompleted':
+                        break;
+                    case 'upgradeOrganization':
+                        const upgradeConfirmed = await this.platformUtilsService.showDialog(
+                            this.i18nService.t('upgradeOrganizationDesc'), this.i18nService.t('upgradeOrganization'),
+                            this.i18nService.t('upgradeOrganization'), this.i18nService.t('cancel'));
+                        if (upgradeConfirmed) {
+                            this.router.navigate(['organizations', message.organizationId, 'settings', 'billing']);
+                        }
+                        break;
+                    case 'premiumRequired':
+                        const premiumConfirmed = await this.platformUtilsService.showDialog(
+                            this.i18nService.t('premiumRequiredDesc'), this.i18nService.t('premiumRequired'),
+                            this.i18nService.t('learnMore'), this.i18nService.t('cancel'));
+                        if (premiumConfirmed) {
+                            this.router.navigate(['settings/premium']);
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            });
+        });
+
+        this.router.events.subscribe((event) => {
+            if (event instanceof NavigationEnd) {
+                const modals = Array.from(document.querySelectorAll('.modal'));
+                for (const modal of modals) {
+                    (jq(modal) as any).modal('hide');
+                }
+
+                if (document.querySelector('.swal-modal') != null) {
+                    swal.close(undefined);
+                }
+            }
+        });
+    }
+
+    ngOnDestroy() {
+        this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
+    }
+
+    private async logOut(expired: boolean) {
+        const userId = await this.userService.getUserId();
+
+        await Promise.all([
+            this.syncService.setLastSync(new Date(0)),
+            this.tokenService.clearToken(),
+            this.cryptoService.clearKeys(),
+            this.userService.clear(),
+            this.settingsService.clear(userId),
+            this.cipherService.clear(userId),
+            this.folderService.clear(userId),
+            this.collectionService.clear(userId),
+            this.passwordGenerationService.clear(),
+        ]);
+
+        this.searchService.clearIndex();
+        this.authService.logOut(async () => {
+            this.analytics.eventTrack.next({ action: 'Logged Out' });
+            if (expired) {
+                this.toasterService.popAsync('warning', this.i18nService.t('loggedOut'),
+                    this.i18nService.t('loginExpired'));
+            }
+            this.router.navigate(['/']);
+        });
+    }
+
+    private async recordActivity() {
+        const now = (new Date()).getTime();
+        if (this.lastActivity != null && now - this.lastActivity < 250) {
+            return;
+        }
+
+        this.lastActivity = now;
+        this.storageService.save(ConstantsService.lastActiveKey, now);
+
+        // Idle states
+        if (this.isIdle) {
+            this.isIdle = false;
+            this.idleStateChanged();
+        }
+        if (this.idleTimer != null) {
+            window.clearTimeout(this.idleTimer);
+            this.idleTimer = null;
+        }
+        this.idleTimer = window.setTimeout(() => {
+            if (!this.isIdle) {
+                this.isIdle = true;
+                this.idleStateChanged();
+            }
+        }, IdleTimeout);
+    }
+
+    private idleStateChanged() {
+        if (this.isIdle) {
+            this.notificationsService.disconnectFromInactivity();
+        } else {
+            this.notificationsService.reconnectFromActivity();
+        }
+    }
+}

src/app/app.js

@@ -1,20 +0,0 @@
-angular
-    .module('bit', [
-        'ui.router',
-        'ngMessages',
-        'angular-jwt',
-        'angular-md5',
-        'ui.bootstrap.showErrors',
-        'toastr',
-        'angulartics',
-        'angulartics.google.analytics',
-
-        'bit.directives',
-        'bit.services',
-
-        'bit.global',
-        'bit.accounts',
-        'bit.vault',
-        'bit.settings',
-        'bit.tools'
-    ]);

src/app/app.module.ts

@@ -0,0 +1,329 @@
+import 'core-js';
+
+import { ToasterModule } from 'angular2-toaster';
+import { Angulartics2Module } from 'angulartics2';
+import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
+
+import { AppRoutingModule } from './app-routing.module';
+
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+
+import { ServicesModule } from './services/services.module';
+
+import { AppComponent } from './app.component';
+import { ModalComponent } from './modal.component';
+
+import { AvatarComponent } from './components/avatar.component';
+import { CalloutComponent } from './components/callout.component';
+
+import { FooterComponent } from './layouts/footer.component';
+import { FrontendLayoutComponent } from './layouts/frontend-layout.component';
+import { NavbarComponent } from './layouts/navbar.component';
+import { OrganizationLayoutComponent } from './layouts/organization-layout.component';
+import { UserLayoutComponent } from './layouts/user-layout.component';
+
+import { AcceptOrganizationComponent } from './accounts/accept-organization.component';
+import { HintComponent } from './accounts/hint.component';
+import { LockComponent } from './accounts/lock.component';
+import { LoginComponent } from './accounts/login.component';
+import { RecoverDeleteComponent } from './accounts/recover-delete.component';
+import { RecoverTwoFactorComponent } from './accounts/recover-two-factor.component';
+import { RegisterComponent } from './accounts/register.component';
+import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
+import { TwoFactorComponent } from './accounts/two-factor.component';
+import { VerifyEmailTokenComponent } from './accounts/verify-email-token.component';
+import { VerifyRecoverDeleteComponent } from './accounts/verify-recover-delete.component';
+
+import {
+    CollectionAddEditComponent as OrgCollectionAddEditComponent,
+} from './organizations/manage/collection-add-edit.component';
+import { CollectionsComponent as OrgManageCollectionsComponent } from './organizations/manage/collections.component';
+import { EntityEventsComponent as OrgEntityEventsComponent } from './organizations/manage/entity-events.component';
+import { EntityUsersComponent as OrgEntityUsersComponent } from './organizations/manage/entity-users.component';
+import { EventsComponent as OrgEventsComponent } from './organizations/manage/events.component';
+import { GroupAddEditComponent as OrgGroupAddEditComponent } from './organizations/manage/group-add-edit.component';
+import { GroupsComponent as OrgGroupsComponent } from './organizations/manage/groups.component';
+import { ManageComponent as OrgManageComponent } from './organizations/manage/manage.component';
+import { PeopleComponent as OrgPeopleComponent } from './organizations/manage/people.component';
+import { UserAddEditComponent as OrgUserAddEditComponent } from './organizations/manage/user-add-edit.component';
+import { UserGroupsComponent as OrgUserGroupsComponent } from './organizations/manage/user-groups.component';
+
+import { AccountComponent as OrgAccountComponent } from './organizations/settings/account.component';
+import { AdjustSeatsComponent } from './organizations/settings/adjust-seats.component';
+import { DeleteOrganizationComponent } from './organizations/settings/delete-organization.component';
+import { OrganizationBillingComponent } from './organizations/settings/organization-billing.component';
+import { SettingsComponent as OrgSettingComponent } from './organizations/settings/settings.component';
+import {
+    TwoFactorSetupComponent as OrgTwoFactorSetupComponent,
+} from './organizations/settings/two-factor-setup.component';
+
+import { ExportComponent as OrgExportComponent } from './organizations/tools/export.component';
+import { ImportComponent as OrgImportComponent } from './organizations/tools/import.component';
+import { ToolsComponent as OrgToolsComponent } from './organizations/tools/tools.component';
+
+import { AddEditComponent as OrgAddEditComponent } from './organizations/vault/add-edit.component';
+import { AttachmentsComponent as OrgAttachmentsComponent } from './organizations/vault/attachments.component';
+import { CiphersComponent as OrgCiphersComponent } from './organizations/vault/ciphers.component';
+import { CollectionsComponent as OrgCollectionsComponent } from './organizations/vault/collections.component';
+import { GroupingsComponent as OrgGroupingsComponent } from './organizations/vault/groupings.component';
+import { VaultComponent as OrgVaultComponent } from './organizations/vault/vault.component';
+
+import { AccountComponent } from './settings/account.component';
+import { AdjustPaymentComponent } from './settings/adjust-payment.component';
+import { AdjustStorageComponent } from './settings/adjust-storage.component';
+import { ChangeEmailComponent } from './settings/change-email.component';
+import { ChangePasswordComponent } from './settings/change-password.component';
+import { CreateOrganizationComponent } from './settings/create-organization.component';
+import { DeauthorizeSessionsComponent } from './settings/deauthorize-sessions.component';
+import { DeleteAccountComponent } from './settings/delete-account.component';
+import { DomainRulesComponent } from './settings/domain-rules.component';
+import { OptionsComponent } from './settings/options.component';
+import { OrganizationsComponent } from './settings/organizations.component';
+import { PaymentComponent } from './settings/payment.component';
+import { PremiumComponent } from './settings/premium.component';
+import { ProfileComponent } from './settings/profile.component';
+import { PurgeVaultComponent } from './settings/purge-vault.component';
+import { SettingsComponent } from './settings/settings.component';
+import { TwoFactorAuthenticatorComponent } from './settings/two-factor-authenticator.component';
+import { TwoFactorDuoComponent } from './settings/two-factor-duo.component';
+import { TwoFactorEmailComponent } from './settings/two-factor-email.component';
+import { TwoFactorRecoveryComponent } from './settings/two-factor-recovery.component';
+import { TwoFactorSetupComponent } from './settings/two-factor-setup.component';
+import { TwoFactorU2fComponent } from './settings/two-factor-u2f.component';
+import { TwoFactorVerifyComponent } from './settings/two-factor-verify.component';
+import { TwoFactorYubiKeyComponent } from './settings/two-factor-yubikey.component';
+import { UpdateKeyComponent } from './settings/update-key.component';
+import { UpdateLicenseComponent } from './settings/update-license.component';
+import { UserBillingComponent } from './settings/user-billing.component';
+import { VerifyEmailComponent } from './settings/verify-email.component';
+
+import { BreachReportComponent } from './tools/breach-report.component';
+import { ExportComponent } from './tools/export.component';
+import { ImportComponent } from './tools/import.component';
+import { PasswordGeneratorHistoryComponent } from './tools/password-generator-history.component';
+import { PasswordGeneratorComponent } from './tools/password-generator.component';
+import { ToolsComponent } from './tools/tools.component';
+
+import { AddEditComponent } from './vault/add-edit.component';
+import { AttachmentsComponent } from './vault/attachments.component';
+import { BulkDeleteComponent } from './vault/bulk-delete.component';
+import { BulkMoveComponent } from './vault/bulk-move.component';
+import { BulkShareComponent } from './vault/bulk-share.component';
+import { CiphersComponent } from './vault/ciphers.component';
+import { CollectionsComponent } from './vault/collections.component';
+import { FolderAddEditComponent } from './vault/folder-add-edit.component';
+import { GroupingsComponent } from './vault/groupings.component';
+import { ShareComponent } from './vault/share.component';
+import { VaultComponent } from './vault/vault.component';
+
+import { IconComponent } from 'jslib/angular/components/icon.component';
+
+import { ApiActionDirective } from 'jslib/angular/directives/api-action.directive';
+import { AutofocusDirective } from 'jslib/angular/directives/autofocus.directive';
+import { BlurClickDirective } from 'jslib/angular/directives/blur-click.directive';
+import { BoxRowDirective } from 'jslib/angular/directives/box-row.directive';
+import { FallbackSrcDirective } from 'jslib/angular/directives/fallback-src.directive';
+import { InputVerbatimDirective } from 'jslib/angular/directives/input-verbatim.directive';
+import { StopClickDirective } from 'jslib/angular/directives/stop-click.directive';
+import { StopPropDirective } from 'jslib/angular/directives/stop-prop.directive';
+import { TrueFalseValueDirective } from 'jslib/angular/directives/true-false-value.directive';
+
+import { I18nPipe } from 'jslib/angular/pipes/i18n.pipe';
+import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe';
+import { SearchPipe } from 'jslib/angular/pipes/search.pipe';
+
+import { registerLocaleData } from '@angular/common';
+import localeCs from '@angular/common/locales/cs';
+import localeDa from '@angular/common/locales/da';
+import localeDe from '@angular/common/locales/de';
+import localeEs from '@angular/common/locales/es';
+import localeEt from '@angular/common/locales/et';
+import localeFr from '@angular/common/locales/fr';
+import localeIt from '@angular/common/locales/it';
+import localeNb from '@angular/common/locales/nb';
+import localeNl from '@angular/common/locales/nl';
+import localePl from '@angular/common/locales/pl';
+import localePtBr from '@angular/common/locales/pt';
+import localePtPt from '@angular/common/locales/pt-PT';
+import localeRu from '@angular/common/locales/ru';
+import localeSk from '@angular/common/locales/sk';
+import localeSv from '@angular/common/locales/sv';
+import localeZhCn from '@angular/common/locales/zh-Hans';
+
+registerLocaleData(localeCs, 'cs');
+registerLocaleData(localeDa, 'da');
+registerLocaleData(localeDe, 'de');
+registerLocaleData(localeEs, 'es');
+registerLocaleData(localeEt, 'et');
+registerLocaleData(localeFr, 'fr');
+registerLocaleData(localeIt, 'it');
+registerLocaleData(localeNb, 'nb');
+registerLocaleData(localeNl, 'nl');
+registerLocaleData(localePl, 'pl');
+registerLocaleData(localePtBr, 'pt-BR');
+registerLocaleData(localePtPt, 'pt-PT');
+registerLocaleData(localeRu, 'ru');
+registerLocaleData(localeSk, 'sk');
+registerLocaleData(localeSv, 'sv');
+registerLocaleData(localeZhCn, 'zh-CN');
+
+@NgModule({
+    imports: [
+        BrowserModule,
+        BrowserAnimationsModule,
+        FormsModule,
+        AppRoutingModule,
+        ServicesModule,
+        Angulartics2Module.forRoot([Angulartics2GoogleAnalytics], {
+            pageTracking: {
+                clearQueryParams: true,
+            },
+        }),
+        ToasterModule,
+    ],
+    declarations: [
+        AcceptOrganizationComponent,
+        AccountComponent,
+        AddEditComponent,
+        AdjustPaymentComponent,
+        AdjustSeatsComponent,
+        AdjustStorageComponent,
+        ApiActionDirective,
+        AppComponent,
+        AttachmentsComponent,
+        AutofocusDirective,
+        AvatarComponent,
+        BlurClickDirective,
+        BoxRowDirective,
+        BreachReportComponent,
+        BulkDeleteComponent,
+        BulkMoveComponent,
+        BulkShareComponent,
+        CalloutComponent,
+        ChangeEmailComponent,
+        ChangePasswordComponent,
+        CiphersComponent,
+        CollectionsComponent,
+        CreateOrganizationComponent,
+        DeauthorizeSessionsComponent,
+        DeleteAccountComponent,
+        DeleteOrganizationComponent,
+        DomainRulesComponent,
+        ExportComponent,
+        FallbackSrcDirective,
+        FolderAddEditComponent,
+        FooterComponent,
+        FrontendLayoutComponent,
+        GroupingsComponent,
+        HintComponent,
+        IconComponent,
+        I18nPipe,
+        ImportComponent,
+        InputVerbatimDirective,
+        LockComponent,
+        LoginComponent,
+        ModalComponent,
+        NavbarComponent,
+        OptionsComponent,
+        OrgAccountComponent,
+        OrgAddEditComponent,
+        OrganizationBillingComponent,
+        OrgAttachmentsComponent,
+        OrgCiphersComponent,
+        OrgCollectionAddEditComponent,
+        OrgCollectionsComponent,
+        OrgEntityEventsComponent,
+        OrgEntityUsersComponent,
+        OrgEventsComponent,
+        OrgExportComponent,
+        OrgImportComponent,
+        OrgGroupAddEditComponent,
+        OrgGroupingsComponent,
+        OrgGroupsComponent,
+        OrgManageCollectionsComponent,
+        OrgManageComponent,
+        OrgPeopleComponent,
+        OrgSettingComponent,
+        OrgToolsComponent,
+        OrgTwoFactorSetupComponent,
+        OrgUserAddEditComponent,
+        OrgUserGroupsComponent,
+        OrganizationsComponent,
+        OrganizationLayoutComponent,
+        OrgVaultComponent,
+        PasswordGeneratorComponent,
+        PasswordGeneratorHistoryComponent,
+        PaymentComponent,
+        PremiumComponent,
+        ProfileComponent,
+        PurgeVaultComponent,
+        RecoverDeleteComponent,
+        RecoverTwoFactorComponent,
+        RegisterComponent,
+        SearchCiphersPipe,
+        SearchPipe,
+        SettingsComponent,
+        ShareComponent,
+        StopClickDirective,
+        StopPropDirective,
+        ToolsComponent,
+        TrueFalseValueDirective,
+        TwoFactorAuthenticatorComponent,
+        TwoFactorComponent,
+        TwoFactorDuoComponent,
+        TwoFactorEmailComponent,
+        TwoFactorOptionsComponent,
+        TwoFactorRecoveryComponent,
+        TwoFactorSetupComponent,
+        TwoFactorU2fComponent,
+        TwoFactorVerifyComponent,
+        TwoFactorYubiKeyComponent,
+        UpdateKeyComponent,
+        UpdateLicenseComponent,
+        UserBillingComponent,
+        UserLayoutComponent,
+        VaultComponent,
+        VerifyEmailComponent,
+        VerifyEmailTokenComponent,
+        VerifyRecoverDeleteComponent,
+    ],
+    entryComponents: [
+        AddEditComponent,
+        AttachmentsComponent,
+        BulkDeleteComponent,
+        BulkMoveComponent,
+        BulkShareComponent,
+        CollectionsComponent,
+        DeauthorizeSessionsComponent,
+        DeleteAccountComponent,
+        DeleteOrganizationComponent,
+        FolderAddEditComponent,
+        ModalComponent,
+        OrgAddEditComponent,
+        OrgAttachmentsComponent,
+        OrgCollectionAddEditComponent,
+        OrgCollectionsComponent,
+        OrgEntityEventsComponent,
+        OrgEntityUsersComponent,
+        OrgGroupAddEditComponent,
+        OrgUserAddEditComponent,
+        OrgUserGroupsComponent,
+        PasswordGeneratorHistoryComponent,
+        PurgeVaultComponent,
+        ShareComponent,
+        TwoFactorAuthenticatorComponent,
+        TwoFactorDuoComponent,
+        TwoFactorEmailComponent,
+        TwoFactorOptionsComponent,
+        TwoFactorRecoveryComponent,
+        TwoFactorU2fComponent,
+        TwoFactorYubiKeyComponent,
+        UpdateKeyComponent,
+    ],
+    providers: [],
+    bootstrap: [AppComponent],
+})
+export class AppModule { }

src/app/components/avatar.component.ts

@@ -0,0 +1,128 @@
+import {
+    Component,
+    Input,
+    OnChanges,
+    OnInit,
+} from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
+
+import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service';
+import { StateService } from 'jslib/abstractions/state.service';
+
+import { Utils } from 'jslib/misc/utils';
+
+@Component({
+    selector: 'app-avatar',
+    template: '<img [src]="sanitizer.bypassSecurityTrustResourceUrl(src)" title="{{data}}" ' +
+        '[ngClass]="{\'rounded-circle\': circle}">',
+})
+export class AvatarComponent implements OnChanges, OnInit {
+    @Input() data: string;
+    @Input() email: string;
+    @Input() size = 45;
+    @Input() charCount = 2;
+    @Input() textColor = '#ffffff';
+    @Input() fontSize = 20;
+    @Input() fontWeight = 300;
+    @Input() dynamic = false;
+    @Input() circle = false;
+
+    src: string;
+
+    constructor(public sanitizer: DomSanitizer, private cryptoFunctionService: CryptoFunctionService,
+        private stateService: StateService) { }
+
+    ngOnInit() {
+        if (!this.dynamic) {
+            this.generate();
+        }
+    }
+
+    ngOnChanges() {
+        if (this.dynamic) {
+            this.generate();
+        }
+    }
+
+    private async generate() {
+        const enableGravatars = await this.stateService.get<boolean>('enableGravatars');
+        if (enableGravatars && this.email != null) {
+            const hashBytes = await this.cryptoFunctionService.hash(this.email.toLowerCase().trim(), 'md5');
+            const hash = Utils.fromBufferToHex(hashBytes).toLowerCase();
+            this.src = 'https://www.gravatar.com/avatar/' + hash + '?s=' + this.size + '&r=pg&d=retro';
+        } else {
+            let chars: string = null;
+            const upperData = this.data.toUpperCase();
+
+            if (this.charCount > 1) {
+                chars = this.getFirstLetters(upperData, this.charCount);
+            }
+            if (chars == null) {
+                chars = upperData.substr(0, this.charCount);
+            }
+
+            const charObj = this.getCharText(chars);
+            const color = this.stringToColor(upperData);
+            const svg = this.getSvg(this.size, color);
+            svg.appendChild(charObj);
+            const html = window.document.createElement('div').appendChild(svg).outerHTML;
+            const svgHtml = window.btoa(unescape(encodeURIComponent(html)));
+            this.src = 'data:image/svg+xml;base64,' + svgHtml;
+        }
+    }
+
+    private stringToColor(str: string): string {
+        let hash = 0;
+        for (let i = 0; i < str.length; i++) {
+            // tslint:disable-next-line
+            hash = str.charCodeAt(i) + ((hash << 5) - hash);
+        }
+        let color = '#';
+        for (let i = 0; i < 3; i++) {
+            // tslint:disable-next-line
+            const value = (hash >> (i * 8)) & 0xFF;
+            color += ('00' + value.toString(16)).substr(-2);
+        }
+        return color;
+    }
+
+    private getFirstLetters(data: string, count: number): string {
+        const parts = data.split(' ');
+        if (parts.length > 1) {
+            let text = '';
+            for (let i = 0; i < count; i++) {
+                text += parts[i].substr(0, 1);
+            }
+            return text;
+        }
+        return null;
+    }
+
+    private getSvg(size: number, color: string): HTMLElement {
+        const svgTag = window.document.createElement('svg');
+        svgTag.setAttribute('xmlns', 'http://www.w3.org/2000/svg');
+        svgTag.setAttribute('pointer-events', 'none');
+        svgTag.setAttribute('width', size.toString());
+        svgTag.setAttribute('height', size.toString());
+        svgTag.style.backgroundColor = color;
+        svgTag.style.width = size + 'px';
+        svgTag.style.height = size + 'px';
+        return svgTag;
+    }
+
+    private getCharText(character: string): HTMLElement {
+        const textTag = window.document.createElement('text');
+        textTag.setAttribute('text-anchor', 'middle');
+        textTag.setAttribute('y', '50%');
+        textTag.setAttribute('x', '50%');
+        textTag.setAttribute('dy', '0.35em');
+        textTag.setAttribute('pointer-events', 'auto');
+        textTag.setAttribute('fill', this.textColor);
+        textTag.setAttribute('font-family', '"Open Sans","Helvetica Neue",Helvetica,Arial,' +
+            'sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"');
+        textTag.textContent = character;
+        textTag.style.fontWeight = this.fontWeight.toString();
+        textTag.style.fontSize = this.fontSize + 'px';
+        return textTag;
+    }
+}

src/app/components/callout.component.html

@@ -0,0 +1,7 @@
+<div class="callout callout-{{calloutStyle}}" role="alert">
+    <h3 class="callout-heading" *ngIf="title">
+        <i class="fa {{icon}}" *ngIf="icon"></i>
+        {{title}}
+    </h3>
+    <ng-content></ng-content>
+</div>

src/app/components/callout.component.ts

@@ -0,0 +1,53 @@
+import {
+    Component,
+    Input,
+    OnInit,
+} from '@angular/core';
+
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+@Component({
+    selector: 'app-callout',
+    templateUrl: 'callout.component.html',
+})
+export class CalloutComponent implements OnInit {
+    @Input() type = 'info';
+    @Input() icon: string;
+    @Input() title: string;
+
+    calloutStyle: string;
+
+    constructor(private i18nService: I18nService) { }
+
+    ngOnInit() {
+        this.calloutStyle = this.type;
+
+        if (this.type === 'warning' || this.type === 'danger') {
+            if (this.type === 'danger') {
+                this.calloutStyle = 'danger';
+            }
+            if (this.title === undefined) {
+                this.title = this.i18nService.t('warning');
+            }
+            if (this.icon === undefined) {
+                this.icon = 'fa-warning';
+            }
+        } else if (this.type === 'error') {
+            this.calloutStyle = 'danger';
+            if (this.title === undefined) {
+                this.title = this.i18nService.t('error');
+            }
+            if (this.icon === undefined) {
+                this.icon = 'fa-bolt';
+            }
+        } else if (this.type === 'tip') {
+            this.calloutStyle = 'success';
+            if (this.title === undefined) {
+                this.title = this.i18nService.t('tip');
+            }
+            if (this.icon === undefined) {
+                this.icon = 'fa-lightbulb-o';
+            }
+        }
+    }
+}

src/app/config.js

@@ -1,144 +0,0 @@
-angular
-    .module('bit')
-
-    .config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, $uibTooltipProvider, toastrConfig) {
-        jwtInterceptorProvider.urlParam = 'access_token';
-        jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (config, appSettings, tokenService) {
-            if (config.url.indexOf(appSettings.apiUri) === 0) {
-                return tokenService.getToken();
-            }
-        };
-
-        angular.extend(toastrConfig, {
-            closeButton: true,
-            progressBar: true,
-            showMethod: 'slideDown',
-            target: '.toast-target'
-        });
-
-        $uibTooltipProvider.options({
-            popupDelay: 600
-        });
-
-        if ($httpProvider.defaults.headers.post) {
-            $httpProvider.defaults.headers.post = {};
-        }
-
-        $httpProvider.defaults.headers.post['Content-Type'] = 'text/plain; charset=utf-8';
-
-        $httpProvider.interceptors.push('apiInterceptor');
-        $httpProvider.interceptors.push('jwtInterceptor');
-
-        $urlRouterProvider.otherwise('/');
-
-        $stateProvider
-        // Backend
-            .state('backend', {
-                templateUrl: 'app/views/backendLayout.html',
-                abstract: true,
-                data: {
-                    authorize: true
-                }
-            })
-            .state('backend.vault', {
-                url: '^/',
-                templateUrl: 'app/vault/views/vault.html',
-                controller: 'vaultController',
-                data: { pageTitle: 'My Vault' }
-            })
-            .state('backend.settings', {
-                url: '^/settings',
-                templateUrl: 'app/settings/views/settings.html',
-                controller: 'settingsController',
-                data: { pageTitle: 'Settings' }
-            })
-            .state('backend.tools', {
-                url: '^/tools',
-                templateUrl: 'app/tools/views/tools.html',
-                controller: 'toolsController',
-                data: { pageTitle: 'Tools' }
-            })
-
-        // Frontend
-            .state('frontend', {
-                templateUrl: 'app/views/frontendLayout.html',
-                abstract: true,
-                data: {
-                    authorize: false
-                }
-            })
-            .state('frontend.login', {
-                templateUrl: 'app/accounts/views/accountsLogin.html',
-                controller: 'accountsLoginController',
-                data: {
-                    bodyClass: 'login-page'
-                }
-            })
-            .state('frontend.login.info', {
-                url: '^/login',
-                templateUrl: 'app/accounts/views/accountsLoginInfo.html',
-                data: {
-                    pageTitle: 'Log In'
-                }
-            })
-            .state('frontend.login.twoFactor', {
-                url: '^/login/two-factor',
-                templateUrl: 'app/accounts/views/accountsLoginTwoFactor.html',
-                data: {
-                    pageTitle: 'Log In (Two Factor)',
-                    authorizeTwoFactor: true
-                }
-            })
-            .state('frontend.logout', {
-                url: '^/logout',
-                controller: 'accountsLogoutController',
-                data: {
-                    authorize: true
-                }
-            })
-            .state('frontend.passwordHint', {
-                url: '^/password-hint',
-                templateUrl: 'app/accounts/views/accountsPasswordHint.html',
-                controller: 'accountsPasswordHintController',
-                data: {
-                    pageTitle: 'Master Password Hint',
-                    bodyClass: 'login-page'
-                }
-            })
-            .state('frontend.recover', {
-                url: '^/recover',
-                templateUrl: 'app/accounts/views/accountsRecover.html',
-                controller: 'accountsRecoverController',
-                data: {
-                    pageTitle: 'Recover Account',
-                    bodyClass: 'login-page'
-                }
-            })
-            .state('frontend.register', {
-                url: '^/register',
-                templateUrl: 'app/accounts/views/accountsRegister.html',
-                controller: 'accountsRegisterController',
-                data: {
-                    pageTitle: 'Register',
-                    bodyClass: 'register-page'
-                }
-            });
-    })
-    .run(function ($rootScope, authService, jwtHelper, tokenService, $state) {
-        $rootScope.$on('$stateChangeStart', function (event, toState, toParams) {
-            if (!toState.data || !toState.data.authorize) {
-                if (authService.isAuthenticated() && !jwtHelper.isTokenExpired(tokenService.getToken())) {
-                    event.preventDefault();
-                    $state.go('backend.vault');
-                }
-
-                return;
-            }
-
-            if (!authService.isAuthenticated() || jwtHelper.isTokenExpired(tokenService.getToken())) {
-                event.preventDefault();
-                authService.logOut();
-                $state.go('frontend.login.info');
-            }
-        });
-    });

src/app/directives/apiFieldDirective.js

@@ -1,30 +0,0 @@
-angular
-    .module('bit.directives')
-
-    .directive('apiField', function () {
-        var linkFn = function (scope, element, attrs, ngModel) {
-            ngModel.$registerApiError = registerApiError;
-            ngModel.$validators.apiValidate = apiValidator;
-
-            function apiValidator() {
-                ngModel.$setValidity('api', true);
-                return true;
-            }
-
-            function registerApiError() {
-                ngModel.$setValidity('api', false);
-            }
-        };
-
-        return {
-            require: 'ngModel',
-            restrict: 'A',
-            compile: function (elem, attrs) {
-                if (!attrs.name || attrs.name === '') {
-                    throw 'api-field element does not have a valid name attribute';
-                }
-
-                return linkFn;
-            }
-        };
-    });

src/app/directives/apiFormDirective.js

@@ -1,35 +0,0 @@
-angular
-    .module('bit.directives')
-
-    .directive('apiForm', function ($rootScope, validationService) {
-        return {
-            require: 'form',
-            restrict: 'A',
-            link: function (scope, element, attrs, formCtrl) {
-                var watchPromise = attrs.apiForm || null;
-                if (watchPromise !== void 0) {
-                    scope.$watch(watchPromise, formSubmitted.bind(null, formCtrl, scope));
-                }
-            }
-        };
-
-        function formSubmitted(form, scope, promise) {
-            if (!promise || !promise.then) {
-                return;
-            }
-
-            // reset errors
-            form.$errors = null;
-
-            // start loading
-            form.$loading = true;
-
-            promise.then(function success(response) {
-                form.$loading = false;
-            }, function failure(reason) {
-                form.$loading = false;
-                validationService.addErrors(form, reason);
-                scope.$broadcast('show-errors-check-validity');
-            });
-        }
-    });

src/app/directives/directivesModule.js

@@ -1,2 +0,0 @@
-angular
-    .module('bit.directives', []);

src/app/directives/masterPasswordDirective.js

@@ -1,40 +0,0 @@
-angular
-    .module('bit.directives')
-
-    .directive('masterPassword', function (cryptoService, authService) {
-        return {
-            require: 'ngModel',
-            restrict: 'A',
-            link: function (scope, elem, attr, ngModel) {
-                var profile = authService.getUserProfile();
-                if (!profile) {
-                    return;
-                }
-
-                // For DOM -> model validation
-                ngModel.$parsers.unshift(function (value) {
-                    if (!value) {
-                        return undefined;
-                    }
-
-                    var key = cryptoService.makeKey(value, profile.email, true);
-                    var valid = key === cryptoService.getKey(true);
-                    ngModel.$setValidity('masterPassword', valid);
-                    return valid ? value : undefined;
-                });
-
-                // For model -> DOM validation
-                ngModel.$formatters.unshift(function (value) {
-                    if (!value) {
-                        return undefined;
-                    }
-
-                    var key = cryptoService.makeKey(value, profile.email, true);
-                    var valid = key === cryptoService.getKey(true);
-
-                    ngModel.$setValidity('masterPassword', valid);
-                    return value;
-                });
-            }
-        };
-    });

src/app/directives/pageTitleDirective.js

@@ -1,22 +0,0 @@
-angular
-    .module('bit.directives')
-
-    .directive('pageTitle', function ($rootScope, $timeout, appSettings) {
-        return {
-            link: function (scope, element) {
-                var listener = function (event, toState, toParams, fromState, fromParams) {
-                    // Default title
-                    var title = 'bitwarden Password Manager';
-                    if (toState.data && toState.data.pageTitle) {
-                        title = toState.data.pageTitle + ' - bitwarden Password Manager';
-                    }
-
-                    $timeout(function () {
-                        element.text(title);
-                    });
-                };
-
-                $rootScope.$on('$stateChangeStart', listener);
-            }
-        };
-    });

src/app/directives/passwordMeterDirective.js

@@ -1,73 +0,0 @@
-angular
-    .module('bit.directives')
-
-    .directive('passwordMeter', function () {
-        return {
-            template: '<div class="progress {{outerClass}}"><div class="progress-bar progress-bar-{{valueClass}}" ' +
-                'role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100" ' +
-                'ng-style="{width : ( value + \'%\' ) }"><span class="sr-only">{{value}}%</span></div></div>',
-            restrict: 'A',
-            scope: {
-                password: '=passwordMeter',
-                username: '=passwordMeterUsername',
-                outerClass: '@?'
-            },
-            link: function (scope) {
-                var measureStrength = function (username, password) {
-                    if (!password || password === username) {
-                        return 0;
-                    }
-
-                    var strength = password.length;
-
-                    if (username && username !== '') {
-                        if (username.indexOf(password) !== -1) strength -= 15;
-                        if (password.indexOf(username) !== -1) strength -= username.length;
-                    }
-
-                    if (password.length > 0 && password.length <= 4) strength += password.length;
-                    else if (password.length >= 5 && password.length <= 7) strength += 6;
-                    else if (password.length >= 8 && password.length <= 15) strength += 12;
-                    else if (password.length >= 16) strength += 18;
-
-                    if (password.match(/[a-z]/)) strength += 1;
-                    if (password.match(/[A-Z]/)) strength += 5;
-                    if (password.match(/\d/)) strength += 5;
-                    if (password.match(/.*\d.*\d.*\d/)) strength += 5;
-                    if (password.match(/[!,@,#,$,%,^,&,*,?,_,~]/)) strength += 5;
-                    if (password.match(/.*[!,@,#,$,%,^,&,*,?,_,~].*[!,@,#,$,%,^,&,*,?,_,~]/)) strength += 5;
-                    if (password.match(/(?=.*[a-z])(?=.*[A-Z])/)) strength += 2;
-                    if (password.match(/(?=.*\d)(?=.*[a-z])(?=.*[A-Z])/)) strength += 2;
-                    if (password.match(/(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!,@,#,$,%,^,&,*,?,_,~])/)) strength += 2;
-
-                    strength = Math.round(strength * 2);
-                    return Math.max(0, Math.min(100, strength));
-                };
-
-                var getClass = function (strength) {
-                    switch (Math.round(strength / 33)) {
-                        case 0:
-                        case 1:
-                            return 'danger';
-                        case 2:
-                            return 'warning';
-                        case 3:
-                            return 'success';
-                    }
-                };
-
-                var updateMeter = function (scope) {
-                    scope.value = measureStrength(scope.username, scope.password);
-                    scope.valueClass = getClass(scope.value);
-                };
-
-                scope.$watch('password', function () {
-                    updateMeter(scope);
-                });
-
-                scope.$watch('username', function () {
-                    updateMeter(scope);
-                });
-            },
-        };
-    });

src/app/directives/passwordViewerDirective.js

@@ -1,27 +0,0 @@
-angular
-    .module('bit.directives')
-
-    .directive('passwordViewer', function () {
-        return {
-            restrict: 'A',
-            link: function (scope, element, attr) {
-                var passwordViewer = attr.passwordViewer;
-                if (!passwordViewer) {
-                    return;
-                }
-
-                element.onclick = function (event) { };
-                element.on('click', function (event) {
-                    var passwordElement = $(passwordViewer);
-                    if (passwordElement && passwordElement.attr('type') === 'password') {
-                        element.removeClass('fa-eye').addClass('fa-eye-slash');
-                        passwordElement.attr('type', 'text');
-                    }
-                    else if (passwordElement && passwordElement.attr('type') === 'text') {
-                        element.removeClass('fa-eye-slash').addClass('fa-eye');
-                        passwordElement.attr('type', 'password');
-                    }
-                });
-            }
-        };
-    });

src/app/dummy.module.ts

@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+
+import { ModalComponent } from 'jslib/angular/components/modal.component';
+
+@NgModule({
+    imports: [],
+    declarations: [
+        ModalComponent,
+    ],
+})
+export class DummyModule {
+}

src/app/global/globalModule.js

@@ -1,2 +0,0 @@
-angular
-    .module('bit.global', []);

src/app/global/mainController.js

@@ -1,82 +0,0 @@
-angular
-    .module('bit.global')
-
-    .controller('mainController', function ($scope, $state, authService, appSettings, toastr) {
-        var vm = this;
-        vm.bodyClass = '';
-        vm.userProfile = null;
-        vm.searchVaultText = null;
-        vm.version = appSettings.version;
-
-        $scope.currentYear = new Date().getFullYear();
-
-        $scope.$on('$viewContentLoaded', function () {
-            if ($.AdminLTE) {
-                if ($.AdminLTE.layout) {
-                    $.AdminLTE.layout.fix();
-                    $.AdminLTE.layout.fixSidebar();
-                }
-
-                if ($.AdminLTE.pushMenu) {
-                    $.AdminLTE.pushMenu.expandOnHover();
-                }
-            }
-        });
-
-        $scope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) {
-            vm.searchVaultText = null;
-            vm.userProfile = authService.getUserProfile();
-
-            if (toState.data.bodyClass) {
-                vm.bodyClass = toState.data.bodyClass;
-                return;
-            }
-            else {
-                vm.bodyClass = '';
-            }
-        });
-
-        $scope.searchVault = function () {
-            $state.go('backend.vault');
-        };
-
-        $scope.addSite = function () {
-            $scope.$broadcast('vaultAddSite');
-        };
-
-        $scope.addFolder = function () {
-            $scope.$broadcast('vaultAddFolder');
-        };
-
-        $scope.changeEmail = function () {
-            $scope.$broadcast('settingsChangeEmail');
-        };
-
-        $scope.changePassword = function () {
-            $scope.$broadcast('settingsChangePassword');
-        };
-
-        $scope.sessions = function () {
-            $scope.$broadcast('settingsSessions');
-        };
-
-        $scope.delete = function () {
-            $scope.$broadcast('settingsDelete');
-        };
-
-        $scope.twoFactor = function () {
-            $scope.$broadcast('settingsTwoFactor');
-        };
-
-        $scope.import = function () {
-            $scope.$broadcast('toolsImport');
-        };
-
-        $scope.export = function () {
-            $scope.$broadcast('toolsExport');
-        };
-
-        $scope.audits = function () {
-            $scope.$broadcast('toolsAudits');
-        };
-    });

src/app/global/sideNavController.js

@@ -1,6 +0,0 @@
-angular
-    .module('bit.global')
-
-    .controller('sideNavController', function ($scope, $state) {
-        $scope.$state = $state;
-    });

src/app/global/topNavController.js

@@ -1,6 +0,0 @@
-angular
-    .module('bit.global')
-
-    .controller('topNavController', function ($scope) {
-        
-    });

src/app/layouts/footer.component.html

@@ -0,0 +1,11 @@
+<div class="container footer text-muted">
+    <div class="row">
+        <div class="col">
+            &copy; {{year}}, 8bit Solutions LLC
+        </div>
+        <div class="col text-center"></div>
+        <div class="col text-right">
+            {{'versionNumber' | i18n : version}}
+        </div>
+    </div>
+</div>

src/app/layouts/footer.component.ts

@@ -0,0 +1,22 @@
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+
+@Component({
+    selector: 'app-footer',
+    templateUrl: 'footer.component.html',
+})
+export class FooterComponent implements OnInit {
+    version: string;
+    year: string = '2015';
+
+    constructor(private platformUtilsService: PlatformUtilsService) { }
+
+    ngOnInit() {
+        this.year = new Date().getFullYear().toString();
+        this.version = this.platformUtilsService.getApplicationVersion();
+    }
+}

src/app/layouts/frontend-layout.component.html

@@ -0,0 +1,5 @@
+<router-outlet></router-outlet>
+<div class="container my-5 text-muted text-center">
+    &copy; 2018, 8bit Solutions LLC
+    <br> {{'versionNumber' | i18n : version}}
+</div>

src/app/layouts/frontend-layout.component.ts

@@ -0,0 +1,26 @@
+import {
+    Component,
+    OnDestroy,
+    OnInit,
+} from '@angular/core';
+
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+
+@Component({
+    selector: 'app-frontend-layout',
+    templateUrl: 'frontend-layout.component.html',
+})
+export class FrontendLayoutComponent implements OnInit, OnDestroy {
+    version: string;
+
+    constructor(private platformUtilsService: PlatformUtilsService) { }
+
+    ngOnInit() {
+        this.version = this.platformUtilsService.getApplicationVersion();
+        document.body.classList.add('layout_frontend');
+    }
+
+    ngOnDestroy() {
+        document.body.classList.remove('layout_frontend');
+    }
+}

src/app/layouts/navbar.component.html

@@ -0,0 +1,58 @@
+<nav class="navbar navbar-expand navbar-dark bg-primary" [ngClass]="{'bg-secondary-alt': selfHosted}">
+    <div class="container">
+        <a class="navbar-brand" routerLink="/" title="{{'pageTitle' | i18n : 'Bitwarden'}}">
+            <i class="fa fa-shield"></i>
+        </a>
+        <div class="collapse navbar-collapse">
+            <ul class="navbar-nav">
+                <li class="nav-item" routerLinkActive="active">
+                    <a class="nav-link" routerLink="/vault">{{'myVault' | i18n}}</a>
+                </li>
+                <li class="nav-item" routerLinkActive="active">
+                    <a class="nav-link" routerLink="/tools">{{'tools' | i18n}}</a>
+                </li>
+                <li class="nav-item" routerLinkActive="active">
+                    <a class="nav-link" routerLink="/settings">{{'settings' | i18n}}</a>
+                </li>
+            </ul>
+        </div>
+        <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
+            <li class="nav-item dropdown">
+                <a class="nav-item nav-link dropdown-toggle" href="#" id="nav-profile" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <i class="fa fa-user-circle fa-lg"></i>
+                </a>
+                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-profile">
+                    <div class="dropdown-item-text d-flex align-items-center" *ngIf="name" appStopProp>
+                        <app-avatar [data]="name" [email]="email" size="25" fontSize="14" [circle]="true"></app-avatar>
+                        <div class="ml-2 overflow-hidden">
+                            <span>{{'loggedInAs' | i18n}}</span>
+                            <small class="text-muted">{{name}}</small>
+                        </div>
+                    </div>
+                    <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" href="#" routerLink="/settings/account">
+                        <i class="fa fa-fw fa-user"></i>
+                        {{'myAccount' | i18n}}
+                    </a>
+                    <a class="dropdown-item" href="https://help.bitwarden.com" target="_blank" rel="noopener">
+                        <i class="fa fa-fw fa-question-circle"></i>
+                        {{'getHelp' | i18n}}
+                    </a>
+                    <a class="dropdown-item" href="https://bitwarden.com#download" target="_blank" rel="noopener">
+                        <i class="fa fa-fw fa-download"></i>
+                        {{'getApps' | i18n}}
+                    </a>
+                    <div class="dropdown-divider"></div>
+                    <button type="button" class="dropdown-item" (click)="lock()">
+                        <i class="fa fa-fw fa-lock"></i>
+                        {{'lockNow' | i18n}}
+                    </button>
+                    <button type="button" class="dropdown-item" (click)="logOut()">
+                        <i class="fa fa-fw fa-sign-out"></i>
+                        {{'logOut' | i18n}}
+                    </button>
+                </div>
+            </li>
+        </ul>
+    </div>
+</nav>

src/app/layouts/navbar.component.ts

@@ -0,0 +1,39 @@
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+
+import { MessagingService } from 'jslib/abstractions/messaging.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { TokenService } from 'jslib/abstractions/token.service';
+
+@Component({
+    selector: 'app-navbar',
+    templateUrl: 'navbar.component.html',
+})
+export class NavbarComponent implements OnInit {
+    selfHosted = false;
+    name: string;
+    email: string;
+
+    constructor(private messagingService: MessagingService, private platformUtilsService: PlatformUtilsService,
+        private tokenService: TokenService) {
+        this.selfHosted = this.platformUtilsService.isSelfHost();
+    }
+
+    async ngOnInit() {
+        this.name = await this.tokenService.getName();
+        this.email = await this.tokenService.getEmail();
+        if (this.name == null || this.name.trim() === '') {
+            this.name = this.email;
+        }
+    }
+
+    lock() {
+        this.messagingService.send('lockVault');
+    }
+
+    logOut() {
+        this.messagingService.send('logout');
+    }
+}

src/app/layouts/organization-layout.component.html

@@ -0,0 +1,46 @@
+<app-navbar></app-navbar>
+<div class="org-nav" *ngIf="organization">
+    <div class="container d-flex flex-column">
+        <div class="my-auto d-flex align-items-center pl-1">
+            <app-avatar [data]="organization.name" size="45" [circle]="true"></app-avatar>
+            <div class="org-name ml-3">
+                <span>{{organization.name}}</span>
+                <small class="text-muted">{{'organization' | i18n}}</small>
+            </div>
+            <div class="ml-auto card border-danger text-danger bg-transparent" *ngIf="!organization.enabled">
+                <div class="card-body py-2">
+                    <i class="fa fa-exclamation-triangle"></i>
+                    {{'organizationIsDisabled' | i18n}}
+                </div>
+            </div>
+        </div>
+        <ul class="nav nav-tabs" *ngIf="organization.isAdmin">
+            <li class="nav-item">
+                <a class="nav-link" routerLink="vault" routerLinkActive="active">
+                    <i class="fa fa-lock"></i>
+                    {{'vault' | i18n}}
+                </a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" routerLink="manage" routerLinkActive="active">
+                    <i class="fa fa-sliders"></i>
+                    {{'manage' | i18n}}
+                </a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" routerLink="tools" routerLinkActive="active">
+                    <i class="fa fa-wrench"></i>
+                    {{'tools' | i18n}}
+                </a>
+            </li>
+            <li class="nav-item" *ngIf="organization.isOwner">
+                <a class="nav-link" routerLink="settings" routerLinkActive="active">
+                    <i class="fa fa-cogs"></i>
+                    {{'settings' | i18n}}
+                </a>
+            </li>
+        </ul>
+    </div>
+</div>
+<router-outlet></router-outlet>
+<app-footer></app-footer>

src/app/layouts/organization-layout.component.ts

@@ -0,0 +1,33 @@
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+import { UserService } from 'jslib/abstractions/user.service';
+
+import { Organization } from 'jslib/models/domain/organization';
+
+@Component({
+    selector: 'app-organization-layout',
+    templateUrl: 'organization-layout.component.html',
+})
+export class OrganizationLayoutComponent implements OnInit {
+    organization: Organization;
+
+    private organizationId: string;
+
+    constructor(private route: ActivatedRoute, private userService: UserService) { }
+
+    ngOnInit() {
+        document.body.classList.remove('layout_frontend');
+        this.route.params.subscribe(async (params) => {
+            this.organizationId = params.organizationId;
+            await this.load();
+        });
+    }
+
+    async load() {
+        this.organization = await this.userService.getOrganization(this.organizationId);
+    }
+}

src/app/layouts/user-layout.component.html

@@ -0,0 +1,3 @@
+<app-navbar></app-navbar>
+<router-outlet></router-outlet>
+<app-footer></app-footer>

src/app/layouts/user-layout.component.ts

@@ -0,0 +1,14 @@
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+
+@Component({
+    selector: 'app-user-layout',
+    templateUrl: 'user-layout.component.html',
+})
+export class UserLayoutComponent implements OnInit {
+    ngOnInit() {
+        document.body.classList.remove('layout_frontend');
+    }
+}

src/app/main.ts

@@ -0,0 +1,17 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import 'bootstrap';
+import 'jquery';
+import 'popper.js';
+
+// tslint:disable-next-line
+require('../scss/styles.scss');
+
+import { AppModule } from './app.module';
+
+if (process.env.ENV === 'production') {
+    enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule);

src/app/modal.component.ts

@@ -0,0 +1,66 @@
+import * as jq from 'jquery';
+
+import {
+    Component,
+    ComponentFactoryResolver,
+    Type,
+    ViewContainerRef,
+} from '@angular/core';
+
+import { ModalComponent as BaseModalComponent } from 'jslib/angular/components/modal.component';
+import { Utils } from 'jslib/misc/utils';
+
+@Component({
+    selector: 'app-modal',
+    template: `<ng-template #container></ng-template>`,
+})
+export class ModalComponent extends BaseModalComponent {
+    el: any = null;
+
+    constructor(componentFactoryResolver: ComponentFactoryResolver) {
+        super(componentFactoryResolver);
+    }
+
+    ngOnDestroy() { /* Nothing */ }
+
+    show<T>(type: Type<T>, parentContainer: ViewContainerRef, fade: boolean = true): T {
+        this.parentContainer = parentContainer;
+        this.fade = fade;
+
+        const factory = this.componentFactoryResolver.resolveComponentFactory<T>(type);
+        const componentRef = this.container.createComponent<T>(factory);
+
+        const modals = Array.from(document.querySelectorAll('.modal'));
+        if (modals.length > 0) {
+            this.el = jq(modals[0]);
+            this.el.modal('show');
+
+            this.el.on('show.bs.modal', () => {
+                this.onShow.emit();
+            });
+            this.el.on('shown.bs.modal', () => {
+                this.onShown.emit();
+                if (!Utils.isMobileBrowser) {
+                    this.el.find('*[appAutoFocus]').focus();
+                }
+            });
+            this.el.on('hide.bs.modal', () => {
+                this.onClose.emit();
+            });
+            this.el.on('hidden.bs.modal', () => {
+                this.onClosed.emit();
+                if (this.parentContainer != null) {
+                    this.parentContainer.clear();
+                }
+            });
+        }
+
+        return componentRef.instance;
+    }
+
+    close() {
+        if (this.el != null) {
+            this.el.modal('hide');
+        }
+    }
+}

src/app/organizations/manage/collection-add-edit.component.html

@@ -0,0 +1,76 @@
+<div class="modal fade">
+    <div class="modal-dialog">
+        <form class="modal-content" #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
+            <div class="modal-header">
+                <h2 class="modal-title">{{title}}</h2>
+                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body" *ngIf="loading">
+                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
+            </div>
+            <div class="modal-body" *ngIf="!loading">
+                <div class="form-group">
+                    <label for="name">{{'name' | i18n}}</label>
+                    <input id="name" class="form-control" type="text" name="Name" [(ngModel)]="name" required>
+                </div>
+                <ng-container *ngIf="accessGroups">
+                    <h3 class="mt-4 d-flex mb-0">
+                        {{'groupAccess' | i18n}}
+                        <div class="ml-auto" *ngIf="groups && groups.length">
+                            <button type="button" (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
+                                {{'selectAll' | i18n}}
+                            </button>
+                            <button type="button" (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
+                                {{'unselectAll' | i18n}}
+                            </button>
+                        </div>
+                    </h3>
+                    <div *ngIf="!groups || !groups.length">
+                        {{'noGroupsInList' | i18n}}
+                    </div>
+                    <table class="table table-hover table-list mb-0" *ngIf="groups && groups.length">
+                        <thead>
+                            <tr>
+                                <th>&nbsp;</th>
+                                <th>{{'name' | i18n}}</th>
+                                <th width="100" class="text-center">{{'readOnly' | i18n}}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr *ngFor="let g of groups; let i = index">
+                                <td class="table-list-checkbox" (click)="check(g)">
+                                    <input type="checkbox" [(ngModel)]="g.checked" name="Groups[{{i}}].Checked" [disabled]="g.accessAll">
+                                </td>
+                                <td (click)="check(g)">
+                                    <span appStopProp>
+                                        {{g.name}}
+                                        <i class="fa fa-th text-muted fa-fw" *ngIf="g.accessAll" title="This group can access all items"></i>
+                                    </span>
+                                </td>
+                                <td class="text-center">
+                                    <input type="checkbox" [(ngModel)]="g.readOnly" name="Groups[{{i}}].ReadOnly" [disabled]="!g.checked || g.accessAll">
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </ng-container>
+            </div>
+            <div class="modal-footer">
+                <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                    <span>{{'save' | i18n}}</span>
+                </button>
+                <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'cancel' | i18n}}</button>
+                <div class="ml-auto">
+                    <button #deleteBtn type="button" (click)="delete()" class="btn btn-outline-danger" title="{{'delete' | i18n}}" *ngIf="editMode"
+                        [disabled]="deleteBtn.loading" [appApiAction]="deletePromise">
+                        <i class="fa fa-trash-o fa-lg fa-fw" [hidden]="deleteBtn.loading"></i>
+                        <i class="fa fa-spinner fa-spin fa-lg fa-fw" [hidden]="!deleteBtn.loading" title="{{'loading' | i18n}}"></i>
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>

src/app/organizations/manage/collection-add-edit.component.ts

@@ -0,0 +1,145 @@
+import {
+    Component,
+    EventEmitter,
+    Input,
+    OnInit,
+    Output,
+} from '@angular/core';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { CryptoService } from 'jslib/abstractions/crypto.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { UserService } from 'jslib/abstractions/user.service';
+
+import { CipherString } from 'jslib/models/domain/cipherString';
+import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey';
+import { CollectionRequest } from 'jslib/models/request/collectionRequest';
+import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest';
+import { GroupResponse } from 'jslib/models/response/groupResponse';
+
+import { Utils } from 'jslib/misc/utils';
+
+@Component({
+    selector: 'app-collection-add-edit',
+    templateUrl: 'collection-add-edit.component.html',
+})
+export class CollectionAddEditComponent implements OnInit {
+    @Input() collectionId: string;
+    @Input() organizationId: string;
+    @Output() onSavedCollection = new EventEmitter();
+    @Output() onDeletedCollection = new EventEmitter();
+
+    loading = true;
+    editMode: boolean = false;
+    accessGroups: boolean = false;
+    title: string;
+    name: string;
+    groups: GroupResponse[] = [];
+    formPromise: Promise<any>;
+    deletePromise: Promise<any>;
+
+    private orgKey: SymmetricCryptoKey;
+
+    constructor(private apiService: ApiService, private i18nService: I18nService,
+        private analytics: Angulartics2, private toasterService: ToasterService,
+        private platformUtilsService: PlatformUtilsService, private cryptoService: CryptoService,
+        private userService: UserService) { }
+
+    async ngOnInit() {
+        const organization = await this.userService.getOrganization(this.organizationId);
+        this.accessGroups = organization.useGroups;
+        this.editMode = this.loading = this.collectionId != null;
+        if (this.accessGroups) {
+            const groupsResponse = await this.apiService.getGroups(this.organizationId);
+            this.groups = groupsResponse.data.map((r) => r).sort(Utils.getSortFunction(this.i18nService, 'name'));
+        }
+        this.orgKey = await this.cryptoService.getOrgKey(this.organizationId);
+
+        if (this.editMode) {
+            this.editMode = true;
+            this.title = this.i18nService.t('editCollection');
+            try {
+                const collection = await this.apiService.getCollectionDetails(this.organizationId, this.collectionId);
+                this.name = await this.cryptoService.decryptToUtf8(new CipherString(collection.name), this.orgKey);
+                if (collection.groups != null && this.groups.length > 0) {
+                    collection.groups.forEach((s) => {
+                        const group = this.groups.filter((g) => !g.accessAll && g.id === s.id);
+                        if (group != null && group.length > 0) {
+                            (group[0] as any).checked = true;
+                            (group[0] as any).readOnly = s.readOnly;
+                        }
+                    });
+                }
+            } catch { }
+        } else {
+            this.title = this.i18nService.t('addCollection');
+        }
+
+        this.groups.forEach((g) => {
+            if (g.accessAll) {
+                (g as any).checked = true;
+            }
+        });
+
+        this.loading = false;
+    }
+
+    check(g: GroupResponse, select?: boolean) {
+        if (g.accessAll) {
+            return;
+        }
+        (g as any).checked = select == null ? !(g as any).checked : select;
+        if (!(g as any).checked) {
+            (g as any).readOnly = false;
+        }
+    }
+
+    selectAll(select: boolean) {
+        this.groups.forEach((g) => this.check(g, select));
+    }
+
+    async submit() {
+        const request = new CollectionRequest();
+        request.name = (await this.cryptoService.encrypt(this.name, this.orgKey)).encryptedString;
+        request.groups = this.groups.filter((g) => (g as any).checked && !g.accessAll)
+            .map((g) => new SelectionReadOnlyRequest(g.id, !!(g as any).readOnly));
+
+        try {
+            if (this.editMode) {
+                this.formPromise = this.apiService.putCollection(this.organizationId, this.collectionId, request);
+            } else {
+                this.formPromise = this.apiService.postCollection(this.organizationId, request);
+            }
+            await this.formPromise;
+            this.analytics.eventTrack.next({ action: this.editMode ? 'Edited Collection' : 'Created Collection' });
+            this.toasterService.popAsync('success', null,
+                this.i18nService.t(this.editMode ? 'editedCollectionId' : 'createdCollectionId', this.name));
+            this.onSavedCollection.emit();
+        } catch { }
+    }
+
+    async delete() {
+        if (!this.editMode) {
+            return;
+        }
+
+        const confirmed = await this.platformUtilsService.showDialog(
+            this.i18nService.t('deleteCollectionConfirmation'), this.name,
+            this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
+        if (!confirmed) {
+            return false;
+        }
+
+        try {
+            this.deletePromise = this.apiService.deleteCollection(this.organizationId, this.collectionId);
+            await this.deletePromise;
+            this.analytics.eventTrack.next({ action: 'Deleted Collection' });
+            this.toasterService.popAsync('success', null, this.i18nService.t('deletedCollectionId', this.name));
+            this.onDeletedCollection.emit();
+        } catch { }
+    }
+}

src/app/organizations/manage/collections.component.html

@@ -0,0 +1,45 @@
+<div class="page-header d-flex">
+    <h1>{{'collections' | i18n}}</h1>
+    <div class="ml-auto d-flex">
+        <div>
+            <label class="sr-only" for="search">{{'search' | i18n}}</label>
+            <input type="search" class="form-control form-control-sm" id="search" placeholder="{{'search' | i18n}}" [(ngModel)]="searchText">
+        </div>
+        <button type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="add()">
+            <i class="fa fa-plus fa-fw"></i>
+            {{'newCollection' | i18n}}
+        </button>
+    </div>
+</div>
+<i class="fa fa-spinner fa-spin text-muted" *ngIf="loading"></i>
+<ng-container *ngIf="!loading && (collections | search:searchText:'name':'id') as searchedCollections">
+    <p *ngIf="!searchedCollections.length">{{'noCollectionsInList' | i18n}}</p>
+    <table class="table table-hover table-list" *ngIf="searchedCollections.length">
+        <tbody>
+            <tr *ngFor="let c of searchedCollections">
+                <td>
+                    <a href="#" appStopClick (click)="edit(c)">{{c.name}}</a>
+                </td>
+                <td class="table-list-options">
+                    <div class="dropdown" appListDropdown>
+                        <button class="btn btn-outline-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <i class="fa fa-cog fa-lg"></i>
+                        </button>
+                        <div class="dropdown-menu dropdown-menu-right">
+                            <a class="dropdown-item" href="#" appStopClick (click)="users(c)">
+                                <i class="fa fa-fw fa-users"></i>
+                                {{'users' | i18n}}
+                            </a>
+                            <a class="dropdown-item text-danger" href="#" appStopClick (click)="delete(c)">
+                                <i class="fa fa-fw fa-trash-o"></i>
+                                {{'delete' | i18n}}
+                            </a>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</ng-container>
+<ng-template #addEdit></ng-template>
+<ng-template #usersTemplate></ng-template>

src/app/organizations/manage/collections.component.ts

@@ -0,0 +1,137 @@
+import {
+    Component,
+    ComponentFactoryResolver,
+    OnInit,
+    ViewChild,
+    ViewContainerRef,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { CollectionService } from 'jslib/abstractions/collection.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+
+import { CollectionData } from 'jslib/models/data/collectionData';
+import { Collection } from 'jslib/models/domain/collection';
+import { CollectionDetailsResponse } from 'jslib/models/response/collectionResponse';
+import { CollectionView } from 'jslib/models/view/collectionView';
+
+import { ModalComponent } from '../../modal.component';
+import { CollectionAddEditComponent } from './collection-add-edit.component';
+import { EntityUsersComponent } from './entity-users.component';
+
+@Component({
+    selector: 'app-org-manage-collections',
+    templateUrl: 'collections.component.html',
+})
+export class CollectionsComponent implements OnInit {
+    @ViewChild('addEdit', { read: ViewContainerRef }) addEditModalRef: ViewContainerRef;
+    @ViewChild('usersTemplate', { read: ViewContainerRef }) usersModalRef: ViewContainerRef;
+
+    loading = true;
+    organizationId: string;
+    collections: CollectionView[];
+    searchText: string;
+
+    private modal: ModalComponent = null;
+
+    constructor(private apiService: ApiService, private route: ActivatedRoute,
+        private collectionService: CollectionService, private componentFactoryResolver: ComponentFactoryResolver,
+        private analytics: Angulartics2, private toasterService: ToasterService,
+        private i18nService: I18nService, private platformUtilsService: PlatformUtilsService) { }
+
+    async ngOnInit() {
+        this.route.parent.parent.params.subscribe(async (params) => {
+            this.organizationId = params.organizationId;
+            await this.load();
+            this.route.queryParams.subscribe(async (qParams) => {
+                this.searchText = qParams.search;
+            });
+        });
+    }
+
+    async load() {
+        const response = await this.apiService.getCollections(this.organizationId);
+        const collections = response.data.map((r) =>
+            new Collection(new CollectionData(r as CollectionDetailsResponse)));
+        this.collections = await this.collectionService.decryptMany(collections);
+        this.loading = false;
+    }
+
+    edit(collection: CollectionView) {
+        if (this.modal != null) {
+            this.modal.close();
+        }
+
+        const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
+        this.modal = this.addEditModalRef.createComponent(factory).instance;
+        const childComponent = this.modal.show<CollectionAddEditComponent>(
+            CollectionAddEditComponent, this.addEditModalRef);
+
+        childComponent.organizationId = this.organizationId;
+        childComponent.collectionId = collection != null ? collection.id : null;
+        childComponent.onSavedCollection.subscribe(() => {
+            this.modal.close();
+            this.load();
+        });
+        childComponent.onDeletedCollection.subscribe(() => {
+            this.modal.close();
+            this.removeCollection(collection);
+        });
+
+        this.modal.onClosed.subscribe(() => {
+            this.modal = null;
+        });
+    }
+
+    add() {
+        this.edit(null);
+    }
+
+    async delete(collection: CollectionView) {
+        const confirmed = await this.platformUtilsService.showDialog(
+            this.i18nService.t('deleteCollectionConfirmation'), collection.name,
+            this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
+        if (!confirmed) {
+            return false;
+        }
+
+        try {
+            await this.apiService.deleteCollection(this.organizationId, collection.id);
+            this.analytics.eventTrack.next({ action: 'Deleted Collection' });
+            this.toasterService.popAsync('success', null, this.i18nService.t('deletedCollectionId', collection.name));
+            this.removeCollection(collection);
+        } catch { }
+    }
+
+    users(collection: CollectionView) {
+        if (this.modal != null) {
+            this.modal.close();
+        }
+
+        const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent);
+        this.modal = this.usersModalRef.createComponent(factory).instance;
+        const childComponent = this.modal.show<EntityUsersComponent>(
+            EntityUsersComponent, this.usersModalRef);
+
+        childComponent.organizationId = this.organizationId;
+        childComponent.entity = 'collection';
+        childComponent.entityId = collection.id;
+        childComponent.entityName = collection.name;
+
+        this.modal.onClosed.subscribe(() => {
+            this.modal = null;
+        });
+    }
+
+    private removeCollection(collection: CollectionView) {
+        const index = this.collections.indexOf(collection);
+        if (index > -1) {
+            this.collections.splice(index, 1);
+        }
+    }
+}

src/app/organizations/manage/entity-events.component.html

@@ -0,0 +1,72 @@
+<div class="modal fade">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h2 class="modal-title">
+                    {{'eventLogs' | i18n}}
+                    <small class="text-muted" *ngIf="name">{{name}}</small>
+                </h2>
+                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body" *ngIf="!loaded">
+                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
+            </div>
+            <div class="modal-body" *ngIf="loaded">
+                <div class="d-flex">
+                    <div class="form-inline">
+                        <label class="sr-only" for="start">{{'startDate' | i18n}}</label>
+                        <input type="datetime-local" class="form-control form-control-sm" id="start" placeholder="{{'startDate' | i18n}}" [(ngModel)]="start"
+                            placeholder="YYYY-MM-DDTHH:MM">
+                        <span class="mx-2">-</span>
+                        <label class="sr-only" for="end">{{'endDate' | i18n}}</label>
+                        <input type="datetime-local" class="form-control form-control-sm" id="end" placeholder="{{'endDate' | i18n}}" [(ngModel)]="end"
+                            placeholder="YYYY-MM-DDTHH:MM">
+                    </div>
+                    <button #refreshBtn [appApiAction]="refreshPromise" type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="loadEvents(true)"
+                        [disabled]="loaded && refreshBtn.loading">
+                        <i class="fa fa-refresh fa-fw" [ngClass]="{'fa-spin': loaded && refreshBtn.loading}"></i>
+                        {{'refresh' | i18n}}
+                    </button>
+                </div>
+                <hr>
+                <div *ngIf="!events || !events.length">
+                    {{'noEventsInList' | i18n}}
+                </div>
+                <table class="table table-hover mb-0" *ngIf="events && events.length">
+                    <thead>
+                        <tr>
+                            <th class="border-top-0" width="210">{{'timestamp' | i18n}}</th>
+                            <th class="border-top-0" width="40">
+                                <span class="sr-only">{{'device' | i18n}}</span>
+                            </th>
+                            <th class="border-top-0" width="150" *ngIf="showUser">{{'user' | i18n}}</th>
+                            <th class="border-top-0">{{'event' | i18n}}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr *ngFor="let e of events">
+                            <td>{{e.date | date:'medium'}}</td>
+                            <td>
+                                <i class="text-muted fa fa-lg {{e.appIcon}}" title="{{e.appName}}, {{e.ip}}"></i>
+                            </td>
+                            <td *ngIf="showUser">
+                                <span title="{{e.userEmail}}">{{e.userName}}</span>
+                            </td>
+                            <td [innerHTML]="e.message"></td>
+                        </tr>
+                    </tbody>
+                </table>
+                <button #moreBtn [appApiAction]="morePromise" type="button" class="btn btn-block btn-link btn-submit" (click)="loadEvents(false)"
+                    [disabled]="loaded && moreBtn.loading" *ngIf="continuationToken">
+                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                    <span>{{'loadMore' | i18n}}</span>
+                </button>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
+            </div>
+        </div>
+    </div>
+</div>

src/app/organizations/manage/entity-events.component.ts

@@ -0,0 +1,125 @@
+import {
+    Component,
+    Input,
+    OnInit,
+} from '@angular/core';
+
+import { ToasterService } from 'angular2-toaster';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+import { EventService } from '../../services/event.service';
+
+import { EventResponse } from 'jslib/models/response/eventResponse';
+import { ListResponse } from 'jslib/models/response/listResponse';
+
+@Component({
+    selector: 'app-entity-events',
+    templateUrl: 'entity-events.component.html',
+})
+export class EntityEventsComponent implements OnInit {
+    @Input() name: string;
+    @Input() entity: 'user' | 'cipher';
+    @Input() entityId: string;
+    @Input() organizationId: string;
+    @Input() showUser = false;
+
+    loading = true;
+    loaded = false;
+    events: any[];
+    start: string;
+    end: string;
+    continuationToken: string;
+    refreshPromise: Promise<any>;
+    morePromise: Promise<any>;
+
+    private orgUsersUserIdMap = new Map<string, any>();
+    private orgUsersIdMap = new Map<string, any>();
+
+    constructor(private apiService: ApiService, private i18nService: I18nService,
+        private eventService: EventService, private toasterService: ToasterService) { }
+
+    async ngOnInit() {
+        const defaultDates = this.eventService.getDefaultDateFilters();
+        this.start = defaultDates[0];
+        this.end = defaultDates[1];
+        await this.load();
+    }
+
+    async load() {
+        if (this.showUser) {
+            const response = await this.apiService.getOrganizationUsers(this.organizationId);
+            response.data.forEach((u) => {
+                const name = u.name == null || u.name.trim() === '' ? u.email : u.name;
+                this.orgUsersIdMap.set(u.id, { name: name, email: u.email });
+                this.orgUsersUserIdMap.set(u.userId, { name: name, email: u.email });
+            });
+        }
+        await this.loadEvents(true);
+        this.loaded = true;
+    }
+
+    async loadEvents(clearExisting: boolean) {
+        if (this.refreshPromise != null || this.morePromise != null) {
+            return;
+        }
+
+        let dates: string[] = null;
+        try {
+            dates = this.eventService.formatDateFilters(this.start, this.end);
+        } catch (e) {
+            this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'),
+                this.i18nService.t('invalidDateRange'));
+            return;
+        }
+
+        this.loading = true;
+        let response: ListResponse<EventResponse>;
+        try {
+            let promise: Promise<any>;
+            if (this.entity === 'user') {
+                promise = this.apiService.getEventsOrganizationUser(this.organizationId, this.entityId,
+                    dates[0], dates[1], clearExisting ? null : this.continuationToken);
+            } else {
+                promise = this.apiService.getEventsCipher(this.entityId,
+                    dates[0], dates[1], clearExisting ? null : this.continuationToken);
+            }
+            if (clearExisting) {
+                this.refreshPromise = promise;
+            } else {
+                this.morePromise = promise;
+            }
+            response = await promise;
+        } catch { }
+
+        this.continuationToken = response.continuationToken;
+        const events = response.data.map((r) => {
+            const userId = r.actingUserId == null ? r.userId : r.actingUserId;
+            const eventInfo = this.eventService.getEventInfo(r);
+            const user = this.showUser && userId != null && this.orgUsersUserIdMap.has(userId) ?
+                this.orgUsersUserIdMap.get(userId) : null;
+            return {
+                message: eventInfo.message,
+                appIcon: eventInfo.appIcon,
+                appName: eventInfo.appName,
+                userId: userId,
+                userName: user != null ? user.name : this.showUser ? this.i18nService.t('unknown') : null,
+                userEmail: user != null ? user.email : this.showUser ? '' : null,
+                date: r.date,
+                ip: r.ipAddress,
+                type: r.type,
+            };
+        });
+
+        if (!clearExisting && this.events != null && this.events.length > 0) {
+            this.events = this.events.concat(events);
+        } else {
+            this.events = events;
+        }
+
+        this.loading = false;
+        this.morePromise = null;
+        this.refreshPromise = null;
+    }
+}

src/app/organizations/manage/entity-users.component.html

@@ -0,0 +1,57 @@
+<div class="modal fade">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h2 class="modal-title">
+                    {{'userAccess' | i18n}}
+                    <small>{{entityName}}</small>
+                </h2>
+                <button type="button" class="close" data-dismiss="modal" attr.aria-label="{{'close' | i18n}}">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body" *ngIf="loading">
+                <i class="fa fa-spinner fa-spin text-muted" title="{{'loading' | i18n}}"></i>
+            </div>
+            <div class="modal-body" *ngIf="!loading">
+                <ng-container *ngIf="!users || !users.length">
+                    {{'noUsersInList' | i18n}}
+                </ng-container>
+                <table class="table table-hover table-list mb-0" *ngIf="users && users.length">
+                    <tbody>
+                        <tr *ngFor="let u of users">
+                            <td width="30">
+                                <app-avatar [data]="u.name || u.email" [email]="u.email" size="25" [circle]="true" [fontSize]="14"></app-avatar>
+                            </td>
+                            <td>
+                                {{u.email}}
+                                <span class="badge badge-secondary" *ngIf="u.status === organizationUserStatusType.Invited">{{'invited' | i18n}}</span>
+                                <span class="badge badge-warning" *ngIf="u.status === organizationUserStatusType.Accepted">{{'accepted' | i18n}}</span>
+                                <small class="text-muted d-block" *ngIf="u.name">{{u.name}}</small>
+                            </td>
+                            <td *ngIf="entity === 'collection'">
+                                <i class="fa fa-th" *ngIf="u.accessAll" title="{{'userAccessAllItems' | i18n}}"></i>
+                                <i class="fa fa-eye" *ngIf="u.readOnly" title="{{'readOnly' | i18n}}"></i>
+                            </td>
+                            <td>
+                                <span *ngIf="u.type === organizationUserType.Owner">{{'owner' | i18n}}</span>
+                                <span *ngIf="u.type === organizationUserType.Admin">{{'admin' | i18n}}</span>
+                                <span *ngIf="u.type === organizationUserType.User">{{'user' | i18n}}</span>
+                            </td>
+                            <td class="table-list-options wider">
+                                <button type="button" class="btn btn-sm btn-outline-danger btn-submit" (click)="remove(u)" #removeBtn [disabled]="removeBtn.loading"
+                                    [appApiAction]="actionPromise" *ngIf="entity !== 'collection' || !u.accessAll">
+                                    <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+                                    <span>{{'remove' | i18n}}</span>
+                                </button>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{'close' | i18n}}</button>
+            </div>
+        </div>
+    </div>
+</div>

src/app/organizations/manage/entity-users.component.ts

@@ -0,0 +1,94 @@
+import {
+    Component,
+    EventEmitter,
+    Input,
+    OnInit,
+    Output,
+} from '@angular/core';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+
+import { OrganizationUserStatusType } from 'jslib/enums/organizationUserStatusType';
+import { OrganizationUserType } from 'jslib/enums/organizationUserType';
+
+import { Utils } from 'jslib/misc/utils';
+
+@Component({
+    selector: 'app-entity-users',
+    templateUrl: 'entity-users.component.html',
+})
+export class EntityUsersComponent implements OnInit {
+    @Input() entity: 'group' | 'collection';
+    @Input() entityId: string;
+    @Input() entityName: string;
+    @Input() organizationId: string;
+    @Output() onRemovedUser = new EventEmitter();
+
+    organizationUserType = OrganizationUserType;
+    organizationUserStatusType = OrganizationUserStatusType;
+
+    loading = true;
+    users: any[] = [];
+    actionPromise: Promise<any>;
+
+    constructor(private apiService: ApiService, private i18nService: I18nService,
+        private analytics: Angulartics2, private toasterService: ToasterService,
+        private platformUtilsService: PlatformUtilsService) { }
+
+    async ngOnInit() {
+        await this.loadUsers();
+        this.loading = false;
+    }
+
+    async loadUsers() {
+        let users: any[] = [];
+        if (this.entity === 'group') {
+            const response = await this.apiService.getGroupUsers(this.organizationId, this.entityId);
+            users = response.data.map((r) => r);
+        } else if (this.entity === 'collection') {
+            const response = await this.apiService.getCollectionUsers(this.organizationId, this.entityId);
+            users = response.data.map((r) => r);
+        }
+        users.sort(Utils.getSortFunction(this.i18nService, 'email'));
+        this.users = users;
+    }
+
+    async remove(user: any) {
+        if (this.actionPromise != null || (this.entity === 'collection' && user.accessAll)) {
+            return;
+        }
+
+        const confirmed = await this.platformUtilsService.showDialog(
+            this.i18nService.t('removeUserConfirmation'), user.email,
+            this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
+        if (!confirmed) {
+            return false;
+        }
+
+        try {
+            if (this.entity === 'group') {
+                this.actionPromise = this.apiService.deleteGroupUser(this.organizationId, this.entityId,
+                    user.organizationUserId);
+                await this.actionPromise;
+                this.analytics.eventTrack.next({ action: 'Removed User From Group' });
+            } else if (this.entity === 'collection') {
+                this.actionPromise = this.apiService.deleteCollectionUser(this.organizationId, this.entityId,
+                    user.organizationUserId);
+                await this.actionPromise;
+                this.analytics.eventTrack.next({ action: 'Removed User From Collection' });
+            }
+
+            this.toasterService.popAsync('success', null, this.i18nService.t('removedUserId', user.email));
+            this.onRemovedUser.emit();
+            const index = this.users.indexOf(user);
+            if (index > -1) {
+                this.users.splice(index, 1);
+            }
+        } catch { }
+    }
+}

src/app/organizations/manage/events.component.html

@@ -0,0 +1,52 @@
+<div class="page-header d-flex">
+    <h1>{{'eventLogs' | i18n}}</h1>
+    <div class="ml-auto d-flex">
+        <div class="form-inline">
+            <label class="sr-only" for="start">{{'startDate' | i18n}}</label>
+            <input type="datetime-local" class="form-control form-control-sm" id="start" placeholder="{{'startDate' | i18n}}" [(ngModel)]="start"
+                placeholder="YYYY-MM-DDTHH:MM">
+            <span class="mx-2">-</span>
+            <label class="sr-only" for="end">{{'endDate' | i18n}}</label>
+            <input type="datetime-local" class="form-control form-control-sm" id="end" placeholder="{{'endDate' | i18n}}" [(ngModel)]="end"
+                placeholder="YYYY-MM-DDTHH:MM">
+        </div>
+        <button #refreshBtn [appApiAction]="refreshPromise" type="button" class="btn btn-sm btn-outline-primary ml-3" (click)="loadEvents(true)"
+            [disabled]="loaded && refreshBtn.loading">
+            <i class="fa fa-refresh fa-fw" [ngClass]="{'fa-spin': loaded && refreshBtn.loading}"></i>
+            {{'refresh' | i18n}}
+        </button>
+    </div>
+</div>
+<i class="fa fa-spinner fa-spin text-muted" *ngIf="!loaded" title="{{'loading' | i18n}}"></i>
+<ng-container *ngIf="loaded">
+    <p *ngIf="!events || !events.length">{{'noEventsInList' | i18n}}</p>
+    <table class="table table-hover" *ngIf="events && events.length">
+        <thead>
+            <tr>
+                <th class="border-top-0" width="210">{{'timestamp' | i18n}}</th>
+                <th class="border-top-0" width="40">
+                    <span class="sr-only">{{'device' | i18n}}</span>
+                </th>
+                <th class="border-top-0" width="150">{{'user' | i18n}}</th>
+                <th class="border-top-0">{{'event' | i18n}}</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let e of events">
+                <td>{{e.date | date:'medium'}}</td>
+                <td>
+                    <i class="text-muted fa fa-lg {{e.appIcon}}" title="{{e.appName}}, {{e.ip}}"></i>
+                </td>
+                <td>
+                    <span title="{{e.userEmail}}">{{e.userName}}</span>
+                </td>
+                <td [innerHTML]="e.message"></td>
+            </tr>
+        </tbody>
+    </table>
+    <button #moreBtn [appApiAction]="morePromise" type="button" class="btn btn-block btn-link btn-submit" (click)="loadEvents(false)"
+        [disabled]="loaded && moreBtn.loading" *ngIf="continuationToken">
+        <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"></i>
+        <span>{{'loadMore' | i18n}}</span>
+    </button>
+</ng-container>

src/app/organizations/manage/events.component.ts

@@ -0,0 +1,123 @@
+import {
+    Component,
+    OnInit,
+} from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+import { ToasterService } from 'angular2-toaster';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+import { UserService } from 'jslib/abstractions/user.service';
+
+import { EventService } from '../../services/event.service';
+
+import { EventResponse } from 'jslib/models/response/eventResponse';
+import { ListResponse } from 'jslib/models/response/listResponse';
+
+@Component({
+    selector: 'app-org-events',
+    templateUrl: 'events.component.html',
+})
+export class EventsComponent implements OnInit {
+    loading = true;
+    loaded = false;
+    organizationId: string;
+    events: any[];
+    start: string;
+    end: string;
+    continuationToken: string;
+    refreshPromise: Promise<any>;
+    morePromise: Promise<any>;
+
+    private orgUsersUserIdMap = new Map<string, any>();
+    private orgUsersIdMap = new Map<string, any>();
+
+    constructor(private apiService: ApiService, private route: ActivatedRoute,
+        private eventService: EventService, private i18nService: I18nService,
+        private toasterService: ToasterService, private userService: UserService,
+        private router: Router) { }
+
+    async ngOnInit() {
+        this.route.parent.parent.params.subscribe(async (params) => {
+            this.organizationId = params.organizationId;
+            const organization = await this.userService.getOrganization(this.organizationId);
+            if (organization == null || !organization.useEvents) {
+                this.router.navigate(['/organizations', this.organizationId]);
+                return;
+            }
+            const defaultDates = this.eventService.getDefaultDateFilters();
+            this.start = defaultDates[0];
+            this.end = defaultDates[1];
+            await this.load();
+        });
+    }
+
+    async load() {
+        const response = await this.apiService.getOrganizationUsers(this.organizationId);
+        response.data.forEach((u) => {
+            const name = u.name == null || u.name.trim() === '' ? u.email : u.name;
+            this.orgUsersIdMap.set(u.id, { name: name, email: u.email });
+            this.orgUsersUserIdMap.set(u.userId, { name: name, email: u.email });
+        });
+        await this.loadEvents(true);
+        this.loaded = true;
+    }
+
+    async loadEvents(clearExisting: boolean) {
+        if (this.refreshPromise != null || this.morePromise != null) {
+            return;
+        }
+
+        let dates: string[] = null;
+        try {
+            dates = this.eventService.formatDateFilters(this.start, this.end);
+        } catch (e) {
+            this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'),
+                this.i18nService.t('invalidDateRange'));
+            return;
+        }
+
+        this.loading = true;
+        let response: ListResponse<EventResponse>;
+        try {
+            const promise = this.apiService.getEventsOrganization(this.organizationId, dates[0], dates[1],
+                clearExisting ? null : this.continuationToken);
+            if (clearExisting) {
+                this.refreshPromise = promise;
+            } else {
+                this.morePromise = promise;
+            }
+            response = await promise;
+        } catch { }
+
+        this.continuationToken = response.continuationToken;
+        const events = response.data.map((r) => {
+            const userId = r.actingUserId == null ? r.userId : r.actingUserId;
+            const eventInfo = this.eventService.getEventInfo(r);
+            const user = userId != null && this.orgUsersUserIdMap.has(userId) ?
+                this.orgUsersUserIdMap.get(userId) : null;
+            return {
+                message: eventInfo.message,
+                appIcon: eventInfo.appIcon,
+                appName: eventInfo.appName,
+                userId: userId,
+                userName: user != null ? user.name : this.i18nService.t('unknown'),
+                userEmail: user != null ? user.email : '',
+                date: r.date,
+                ip: r.ipAddress,
+                type: r.type,
+            };
+        });
+
+        if (!clearExisting && this.events != null && this.events.length > 0) {
+            this.events = this.events.concat(events);
+        } else {
+            this.events = events;
+        }
+
+        this.loading = false;
+        this.morePromise = null;
+        this.refreshPromise = null;
+    }
+}