bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-22 19:23:24 +00:00
Code Issues Releases Wiki Activity

Changes after npm run prettier

Browse Source
This commit is contained in:
Daniel James Smith
2021-12-16 15:13:39 +01:00
parent 3b15f451d6
commit b73fbf75e3
495 changed files with 28253 additions and 26714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@@ -1,4 +1,5 @@
## Type of change ## Type of change
- [ ] Bug fix - [ ] Bug fix
- [ ] New feature development - [ ] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
@@ -6,22 +7,22 @@
- [ ] Other - [ ] Other
## Objective ## Objective
<!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding--> <!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding-->
## Code changes ## Code changes
<!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes--> <!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes-->
<!--Also refer to any related changes or PRs in other repositories--> <!--Also refer to any related changes or PRs in other repositories-->
* **file.ext:** Description of what was changed and why - **file.ext:** Description of what was changed and why
## Testing requirements ## Testing requirements
<!--What functionality requires testing by QA? This includes testing new behavior and regression testing--> <!--What functionality requires testing by QA? This includes testing new behavior and regression testing-->
## Before you submit ## Before you submit
- [ ] I have checked for **linting** errors (`npm run lint`) (required) - [ ] I have checked for **linting** errors (`npm run lint`) (required)
- [ ] I have added **unit tests** where it makes sense to do so (encouraged but not required) - [ ] I have added **unit tests** where it makes sense to do so (encouraged but not required)
- [ ] This change requires a **documentation update** (notify the documentation team) - [ ] This change requires a **documentation update** (notify the documentation team)

5
.github/workflows/build.yml vendored
View File

@@ -20,7 +20,6 @@ jobs:
- name: Print lines of code - name: Print lines of code
run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git run: cloc --include-lang TypeScript,JavaScript,HTML,Sass,CSS --vcs git
build: build:
name: Build jslib name: Build jslib
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@@ -33,7 +32,7 @@ jobs:
- name: Set up Node - name: Set up Node
uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
with: with:
node-version: '16' node-version: "16"
- name: Install node-gyp - name: Install node-gyp
run: | run: |
@@ -106,7 +105,7 @@ jobs:
secrets: "devops-alerts-slack-webhook-url" secrets: "devops-alerts-slack-webhook-url"
- name: Notify Slack on failure - name: Notify Slack on failure
uses: act10ns/slack@e4e71685b9b239384b0f676a63c32367f59c2522 # v1.2.2 uses: act10ns/slack@e4e71685b9b239384b0f676a63c32367f59c2522 # v1.2.2
if: failure() if: failure()
env: env:
SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }} SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }}

32
.vscode/launch.json vendored
View File

@@ -1,18 +1,16 @@
{ {
// Use IntelliSense to learn about possible attributes. // Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes. // Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"name": "Jasmine Individual Test", "name": "Jasmine Individual Test",
"program": "${workspaceRoot}\\node_modules\\jasmine\\bin\\jasmine.js", "program": "${workspaceRoot}\\node_modules\\jasmine\\bin\\jasmine.js",
"preLaunchTask": "npm run build", "preLaunchTask": "npm run build",
"args": [ "args": ["${workspaceFolder}/dist\\spec\\node\\services\\nodeCryptoFunction.service.spec.js"]
"${workspaceFolder}/dist\\spec\\node\\services\\nodeCryptoFunction.service.spec.js" }
] ]
} }
]
}

22
.vscode/tasks.json vendored
View File

@@ -1,12 +1,12 @@
{ {
// See https://go.microsoft.com/fwlink/?LinkId=733558 // See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format // for the documentation about the tasks.json format
"version": "2.0.0", "version": "2.0.0",
"tasks": [ "tasks": [
{ {
"label": "npm run build", "label": "npm run build",
"type": "shell", "type": "shell",
"command": "npm run build" "command": "npm run build"
} }
] ]
} }

54
CONTRIBUTING.md
View File

@@ -6,15 +6,11 @@ Please visit our [Community Forums](https://community.bitwarden.com/) for genera
Here is how you can get involved: Here is how you can get involved:
* **Request a new feature:** Go to the [Feature Requests category](https://community.bitwarden.com/c/feature-requests/) of the Community Forums. Please search existing feature requests before making a new one - **Request a new feature:** Go to the [Feature Requests category](https://community.bitwarden.com/c/feature-requests/) of the Community Forums. Please search existing feature requests before making a new one
- **Write code for a new feature:** Make a new post in the [Github Contributions category](https://community.bitwarden.com/c/github-contributions/) of the Community Forums. Include a description of your proposed contribution, screeshots, and links to any relevant feature requests. This helps get feedback from the community and Bitwarden team members before you start writing code
* **Write code for a new feature:** Make a new post in the [Github Contributions category](https://community.bitwarden.com/c/github-contributions/) of the Community Forums. Include a description of your proposed contribution, screeshots, and links to any relevant feature requests. This helps get feedback from the community and Bitwarden team members before you start writing code - **Report a bug or submit a bugfix:** Use Github issues and pull requests
- **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help)
* **Report a bug or submit a bugfix:** Use Github issues and pull requests - **Help other users:** Go to the [User-to-User Support category](https://community.bitwarden.com/c/support/) on the Community Forums
* **Write documentation:** Submit a pull request to the [Bitwarden help repository](https://github.com/bitwarden/help)
* **Help other users:** Go to the [User-to-User Support category](https://community.bitwarden.com/c/support/) on the Community Forums
## Contributor Agreement ## Contributor Agreement
@@ -22,9 +18,9 @@ Please sign the [Contributor Agreement](https://cla-assistant.io/bitwarden/jslib
## Pull Request Guidelines ## Pull Request Guidelines
* use `npm run lint` and fix any linting suggestions before submitting a pull request - use `npm run lint` and fix any linting suggestions before submitting a pull request
* commit any pull requests against the `master` branch - commit any pull requests against the `master` branch
* include a link to your Community Forums post - include a link to your Community Forums post
# Introduction to jslib and git submodules # Introduction to jslib and git submodules
@@ -33,36 +29,39 @@ jslib is a repository that contains shared code for all Bitwarden Typescript/Jav
If you haven't worked with submodules before, you should start by reading some basic guides (such as the [git scm chapter](https://git-scm.com/book/en/v2/Git-Tools-Submodules) or the [Atlassian tutorial](https://www.atlassian.com/git/tutorials/git-submodule)). If you haven't worked with submodules before, you should start by reading some basic guides (such as the [git scm chapter](https://git-scm.com/book/en/v2/Git-Tools-Submodules) or the [Atlassian tutorial](https://www.atlassian.com/git/tutorials/git-submodule)).
# Setting up your Local Dev environment for jslib # Setting up your Local Dev environment for jslib
In order to easily develop local changes to jslib across each of the TypeScript/JavaScript clients, we recommend using symlinks for the submodule so that you only have to make the change once for it to be reflected across all your local repos. In order to easily develop local changes to jslib across each of the TypeScript/JavaScript clients, we recommend using symlinks for the submodule so that you only have to make the change once for it to be reflected across all your local repos.
## Prerequisites ## Prerequisites
1. git bash or other git command line 1. git bash or other git command line
2. In order for this to work well, you need to use a consistent relative directory structure. Repos should be cloned in the following way: 2. In order for this to work well, you need to use a consistent relative directory structure. Repos should be cloned in the following way:
* `./<your project(s) directory>`; we'll call this `/dev` ('cause why not) - `./<your project(s) directory>`; we'll call this `/dev` ('cause why not)
* jslib - `git clone https://github.com/bitwarden/jslib.git` (/dev/jslib) - jslib - `git clone https://github.com/bitwarden/jslib.git` (/dev/jslib)
* web - `git clone --recurse-submodules https://github.com/bitwarden/web.git` (/dev/web) - web - `git clone --recurse-submodules https://github.com/bitwarden/web.git` (/dev/web)
* desktop - `git clone --recurse-submodules https://github.com/bitwarden/desktop.git` (/dev/desktop) - desktop - `git clone --recurse-submodules https://github.com/bitwarden/desktop.git` (/dev/desktop)
* browser - `git clone --recurse-submodules https://github.com/bitwarden/browser.git` (/dev/browser) - browser - `git clone --recurse-submodules https://github.com/bitwarden/browser.git` (/dev/browser)
* cli - `git clone --recurse-submodules https://github.com/bitwarden/cli` (/dev/cli) - cli - `git clone --recurse-submodules https://github.com/bitwarden/cli` (/dev/cli)
You should notice web, desktop, browser and cli each reference jslib as a git submodule. If you've already cloned the repos but didn't use `--recurse-submodules` then you'll need to init the submodule with `npm run sub:init`. You should notice web, desktop, browser and cli each reference jslib as a git submodule. If you've already cloned the repos but didn't use `--recurse-submodules` then you'll need to init the submodule with `npm run sub:init`.
## Configure Symlinks ## Configure Symlinks
Using `git clone` will make symlinks added to your repo be seen by git as plain text file paths. We need to prevent that. In the project root run, `git config core.symlinks true`. Using `git clone` will make symlinks added to your repo be seen by git as plain text file paths. We need to prevent that. In the project root run, `git config core.symlinks true`.
For each project other than jslib, run the following: For each project other than jslib, run the following:
* For macOS/Linux: `npm run symlink:mac` - For macOS/Linux: `npm run symlink:mac`
* For Windows: `npm run symlink:win` - For Windows: `npm run symlink:win`
Your client repos will now be pointing to your local jslib repo. You can now make changes in jslib and they will be immediately shared by the clients (just like they will be in production). Your client repos will now be pointing to your local jslib repo. You can now make changes in jslib and they will be immediately shared by the clients (just like they will be in production).
## Committing and pushing jslib changes ## Committing and pushing jslib changes
* You work on jslib like any other repo. Check out a new branch, make some commits, and push to remote when you're ready to submit a PR. - You work on jslib like any other repo. Check out a new branch, make some commits, and push to remote when you're ready to submit a PR.
* Do not commit your jslib changes in the client repo. Your changes to the client and your changes to jslib should stay completely separate. - Do not commit your jslib changes in the client repo. Your changes to the client and your changes to jslib should stay completely separate.
* When submitting a client PR that depends on a jslib PR, please include a link to the jslib PR so that the reviewer knows there are jslib changes. - When submitting a client PR that depends on a jslib PR, please include a link to the jslib PR so that the reviewer knows there are jslib changes.
### Updating jslib on a feature branch ### Updating jslib on a feature branch
@@ -70,8 +69,8 @@ If you've submitted a client PR and a jslib PR, your jslib PR will be approved a
1. If you've symlinked the client's jslib directory following the steps above, you'll need to delete that symlink and then run `npm run sub:init`. 1. If you've symlinked the client's jslib directory following the steps above, you'll need to delete that symlink and then run `npm run sub:init`.
2. Update the jslib submodule: 2. Update the jslib submodule:
* if you're working on your own fork, run `git submodule update --remote --reference upstream`. - if you're working on your own fork, run `git submodule update --remote --reference upstream`.
* if you're working on a branch on the official repo, run `npm run sub:update` - if you're working on a branch on the official repo, run `npm run sub:update`
3. To check you've done this correctly, you can `cd` into your jslib directory and run `git log`. You should see your recent changes in the log. This will also show you the most recent commit hash, which should match the most recent commit hash on [Github](https://github.com/bitwarden/jslib). 3. To check you've done this correctly, you can `cd` into your jslib directory and run `git log`. You should see your recent changes in the log. This will also show you the most recent commit hash, which should match the most recent commit hash on [Github](https://github.com/bitwarden/jslib).
4. Add your changes: `git add jslib` 4. Add your changes: `git add jslib`
5. Commit your changes: `git commit -m "update jslib version"` 5. Commit your changes: `git commit -m "update jslib version"`
@@ -89,7 +88,8 @@ If you've made changes to jslib without needing to make any changes to the clien
4. Create a new PR to the client repo. Please include a link to your jslib PR so that reviewers know why you're updating jslib. 4. Create a new PR to the client repo. Please include a link to your jslib PR so that reviewers know why you're updating jslib.
## Merge Conflicts ## Merge Conflicts
At times when you need to perform a `git merge master` into your feature or local branch, and there are conflicting version references to the *jslib* repo from your other clients, you will not be able to use the traditional merge or stage functions you would normally use for a file.
At times when you need to perform a `git merge master` into your feature or local branch, and there are conflicting version references to the _jslib_ repo from your other clients, you will not be able to use the traditional merge or stage functions you would normally use for a file.
To resolve you must use either `git reset` or update the index directly using `git update-index`. You can use (depending on whether you have symlink'd jslib) one of the following: To resolve you must use either `git reset` or update the index directly using `git update-index`. You can use (depending on whether you have symlink'd jslib) one of the following:

2
SECURITY.md
View File

@@ -7,7 +7,7 @@ notify us. We welcome working with you to resolve the issue promptly. Thanks in
- Let us know as soon as possible upon discovery of a potential security issue, and we'll make every - 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. 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 - 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. 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 - 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 degradation of our service. Only interact with accounts you own or with explicit permission of the
account holder. account holder.

192
angular/src/components/add-edit-custom-fields.component.ts
View File

@@ -1,124 +1,120 @@
import { import { Directive, Input, OnChanges, SimpleChanges } from "@angular/core";
Directive,
Input,
OnChanges,
SimpleChanges,
} from '@angular/core';
import { import { CdkDragDrop, moveItemInArray } from "@angular/cdk/drag-drop";
CdkDragDrop,
moveItemInArray,
} from '@angular/cdk/drag-drop';
import { EventService } from 'jslib-common/abstractions/event.service'; import { EventService } from "jslib-common/abstractions/event.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { CipherView } from 'jslib-common/models/view/cipherView'; import { CipherView } from "jslib-common/models/view/cipherView";
import { FieldView } from 'jslib-common/models/view/fieldView'; import { FieldView } from "jslib-common/models/view/fieldView";
import { CipherType } from 'jslib-common/enums/cipherType'; import { CipherType } from "jslib-common/enums/cipherType";
import { EventType } from 'jslib-common/enums/eventType'; import { EventType } from "jslib-common/enums/eventType";
import { FieldType } from 'jslib-common/enums/fieldType'; import { FieldType } from "jslib-common/enums/fieldType";
import { Utils } from 'jslib-common/misc/utils'; import { Utils } from "jslib-common/misc/utils";
@Directive() @Directive()
export class AddEditCustomFieldsComponent implements OnChanges { export class AddEditCustomFieldsComponent implements OnChanges {
@Input() cipher: CipherView; @Input() cipher: CipherView;
@Input() thisCipherType: CipherType; @Input() thisCipherType: CipherType;
@Input() editMode: boolean; @Input() editMode: boolean;
addFieldType: FieldType = FieldType.Text; addFieldType: FieldType = FieldType.Text;
addFieldTypeOptions: any[]; addFieldTypeOptions: any[];
addFieldLinkedTypeOption: any; addFieldLinkedTypeOption: any;
linkedFieldOptions: any[] = []; linkedFieldOptions: any[] = [];
cipherType = CipherType; cipherType = CipherType;
fieldType = FieldType; fieldType = FieldType;
eventType = EventType; eventType = EventType;
constructor(private i18nService: I18nService, private eventService: EventService) { constructor(private i18nService: I18nService, private eventService: EventService) {
this.addFieldTypeOptions = [ this.addFieldTypeOptions = [
{ name: i18nService.t('cfTypeText'), value: FieldType.Text }, { name: i18nService.t("cfTypeText"), value: FieldType.Text },
{ name: i18nService.t('cfTypeHidden'), value: FieldType.Hidden }, { name: i18nService.t("cfTypeHidden"), value: FieldType.Hidden },
{ name: i18nService.t('cfTypeBoolean'), value: FieldType.Boolean }, { name: i18nService.t("cfTypeBoolean"), value: FieldType.Boolean },
]; ];
this.addFieldLinkedTypeOption = { name: this.i18nService.t('cfTypeLinked'), value: FieldType.Linked }; this.addFieldLinkedTypeOption = {
name: this.i18nService.t("cfTypeLinked"),
value: FieldType.Linked,
};
}
ngOnChanges(changes: SimpleChanges) {
if (changes.thisCipherType != null) {
this.setLinkedFieldOptions();
if (!changes.thisCipherType.firstChange) {
this.resetCipherLinkedFields();
}
}
}
addField() {
if (this.cipher.fields == null) {
this.cipher.fields = [];
} }
ngOnChanges(changes: SimpleChanges) { const f = new FieldView();
if (changes.thisCipherType != null) { f.type = this.addFieldType;
this.setLinkedFieldOptions(); f.newField = true;
if (!changes.thisCipherType.firstChange) { if (f.type === FieldType.Linked) {
this.resetCipherLinkedFields(); f.linkedId = this.linkedFieldOptions[0].value;
}
}
} }
addField() { this.cipher.fields.push(f);
if (this.cipher.fields == null) { }
this.cipher.fields = [];
}
const f = new FieldView(); removeField(field: FieldView) {
f.type = this.addFieldType; const i = this.cipher.fields.indexOf(field);
f.newField = true; if (i > -1) {
this.cipher.fields.splice(i, 1);
}
}
if (f.type === FieldType.Linked) { toggleFieldValue(field: FieldView) {
f.linkedId = this.linkedFieldOptions[0].value; const f = field as any;
} f.showValue = !f.showValue;
if (this.editMode && f.showValue) {
this.eventService.collect(EventType.Cipher_ClientToggledHiddenFieldVisible, this.cipher.id);
}
}
this.cipher.fields.push(f); trackByFunction(index: number, item: any) {
return index;
}
drop(event: CdkDragDrop<string[]>) {
moveItemInArray(this.cipher.fields, event.previousIndex, event.currentIndex);
}
private setLinkedFieldOptions() {
if (this.cipher.linkedFieldOptions == null) {
return;
} }
removeField(field: FieldView) { const options: any = [];
const i = this.cipher.fields.indexOf(field); this.cipher.linkedFieldOptions.forEach((linkedFieldOption, id) =>
if (i > -1) { options.push({ name: this.i18nService.t(linkedFieldOption.i18nKey), value: id })
this.cipher.fields.splice(i, 1); );
} this.linkedFieldOptions = options.sort(Utils.getSortFunction(this.i18nService, "name"));
}
private resetCipherLinkedFields() {
if (this.cipher.fields == null || this.cipher.fields.length === 0) {
return;
} }
toggleFieldValue(field: FieldView) { // Delete any Linked custom fields if the item type does not support them
const f = (field as any); if (this.cipher.linkedFieldOptions == null) {
f.showValue = !f.showValue; this.cipher.fields = this.cipher.fields.filter((f) => f.type !== FieldType.Linked);
if (this.editMode && f.showValue) { return;
this.eventService.collect(EventType.Cipher_ClientToggledHiddenFieldVisible, this.cipher.id);
}
} }
trackByFunction(index: number, item: any) { this.cipher.fields
return index; .filter((f) => f.type === FieldType.Linked)
} .forEach((f) => (f.linkedId = this.linkedFieldOptions[0].value));
}
drop(event: CdkDragDrop<string[]>) {
moveItemInArray(this.cipher.fields, event.previousIndex, event.currentIndex);
}
private setLinkedFieldOptions() {
if (this.cipher.linkedFieldOptions == null) {
return;
}
const options: any = [];
this.cipher.linkedFieldOptions.forEach((linkedFieldOption, id) =>
options.push({ name: this.i18nService.t(linkedFieldOption.i18nKey), value: id }));
this.linkedFieldOptions = options.sort(Utils.getSortFunction(this.i18nService, 'name'));
}
private resetCipherLinkedFields() {
if (this.cipher.fields == null || this.cipher.fields.length === 0) {
return;
}
// Delete any Linked custom fields if the item type does not support them
if (this.cipher.linkedFieldOptions == null) {
this.cipher.fields = this.cipher.fields.filter(f => f.type !== FieldType.Linked);
return;
}
this.cipher.fields
.filter(f => f.type === FieldType.Linked)
.forEach(f => f.linkedId = this.linkedFieldOptions[0].value);
}
} }

60
angular/src/components/callout.component.html
View File

@@ -1,27 +1,35 @@
<div #callout class="callout callout-{{calloutStyle}}" [ngClass]="{'clickable': clickable}" <div
[attr.role]="useAlertRole ? 'alert' : null"> #callout
<h3 class="callout-heading" *ngIf="title"> class="callout callout-{{ calloutStyle }}"
<i class="fa {{icon}}" *ngIf="icon" aria-hidden="true"></i> [ngClass]="{ clickable: clickable }"
{{title}} [attr.role]="useAlertRole ? 'alert' : null"
</h3> >
<div class="enforced-policy-options" *ngIf="enforcedPolicyOptions"> <h3 class="callout-heading" *ngIf="title">
{{enforcedPolicyMessage}} <i class="fa {{ icon }}" *ngIf="icon" aria-hidden="true"></i>
<ul> {{ title }}
<li *ngIf="enforcedPolicyOptions?.minComplexity > 0"> </h3>
{{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}} <div class="enforced-policy-options" *ngIf="enforcedPolicyOptions">
</li> {{ enforcedPolicyMessage }}
<li *ngIf="enforcedPolicyOptions?.minLength > 0"> <ul>
{{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}} <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
</li> {{ "policyInEffectMinComplexity" | i18n: getPasswordScoreAlertDisplay() }}
<li *ngIf="enforcedPolicyOptions?.requireUpper"> </li>
{{'policyInEffectUppercase' | i18n}}</li> <li *ngIf="enforcedPolicyOptions?.minLength > 0">
<li *ngIf="enforcedPolicyOptions?.requireLower"> {{ "policyInEffectMinLength" | i18n: enforcedPolicyOptions?.minLength.toString() }}
{{'policyInEffectLowercase' | i18n}}</li> </li>
<li *ngIf="enforcedPolicyOptions?.requireNumbers"> <li *ngIf="enforcedPolicyOptions?.requireUpper">
{{'policyInEffectNumbers' | i18n}}</li> {{ "policyInEffectUppercase" | i18n }}
<li *ngIf="enforcedPolicyOptions?.requireSpecial"> </li>
{{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}</li> <li *ngIf="enforcedPolicyOptions?.requireLower">
</ul> {{ "policyInEffectLowercase" | i18n }}
</div> </li>
<ng-content></ng-content> <li *ngIf="enforcedPolicyOptions?.requireNumbers">
{{ "policyInEffectNumbers" | i18n }}
</li>
<li *ngIf="enforcedPolicyOptions?.requireSpecial">
{{ "policyInEffectSpecial" | i18n: "!@#$%^&*" }}
</li>
</ul>
</div>
<ng-content></ng-content>
</div> </div>

134
angular/src/components/callout.component.ts
View File

@@ -1,83 +1,79 @@
import { import { Component, Input, OnInit } from "@angular/core";
Component,
Input,
OnInit,
} from '@angular/core';
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { MasterPasswordPolicyOptions } from 'jslib-common/models/domain/masterPasswordPolicyOptions'; import { MasterPasswordPolicyOptions } from "jslib-common/models/domain/masterPasswordPolicyOptions";
@Component({ @Component({
selector: 'app-callout', selector: "app-callout",
templateUrl: 'callout.component.html', templateUrl: "callout.component.html",
}) })
export class CalloutComponent implements OnInit { export class CalloutComponent implements OnInit {
@Input() type = 'info'; @Input() type = "info";
@Input() icon: string; @Input() icon: string;
@Input() title: string; @Input() title: string;
@Input() clickable: boolean; @Input() clickable: boolean;
@Input() enforcedPolicyOptions: MasterPasswordPolicyOptions; @Input() enforcedPolicyOptions: MasterPasswordPolicyOptions;
@Input() enforcedPolicyMessage: string; @Input() enforcedPolicyMessage: string;
@Input() useAlertRole = false; @Input() useAlertRole = false;
calloutStyle: string; calloutStyle: string;
constructor(private i18nService: I18nService) { } constructor(private i18nService: I18nService) {}
ngOnInit() { ngOnInit() {
this.calloutStyle = this.type; this.calloutStyle = this.type;
if (this.enforcedPolicyMessage === undefined) { if (this.enforcedPolicyMessage === undefined) {
this.enforcedPolicyMessage = this.i18nService.t('masterPasswordPolicyInEffect'); this.enforcedPolicyMessage = this.i18nService.t("masterPasswordPolicyInEffect");
}
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';
}
}
} }
getPasswordScoreAlertDisplay() { if (this.type === "warning" || this.type === "danger") {
if (this.enforcedPolicyOptions == null) { if (this.type === "danger") {
return ''; this.calloutStyle = "danger";
} }
if (this.title === undefined) {
let str: string; this.title = this.i18nService.t("warning");
switch (this.enforcedPolicyOptions.minComplexity) { }
case 4: if (this.icon === undefined) {
str = this.i18nService.t('strong'); this.icon = "fa-warning";
break; }
case 3: } else if (this.type === "error") {
str = this.i18nService.t('good'); this.calloutStyle = "danger";
break; if (this.title === undefined) {
default: this.title = this.i18nService.t("error");
str = this.i18nService.t('weak'); }
break; if (this.icon === undefined) {
} this.icon = "fa-bolt";
return str + ' (' + this.enforcedPolicyOptions.minComplexity + ')'; }
} 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";
}
} }
}
getPasswordScoreAlertDisplay() {
if (this.enforcedPolicyOptions == null) {
return "";
}
let str: string;
switch (this.enforcedPolicyOptions.minComplexity) {
case 4:
str = this.i18nService.t("strong");
break;
case 3:
str = this.i18nService.t("good");
break;
default:
str = this.i18nService.t("weak");
break;
}
return str + " (" + this.enforcedPolicyOptions.minComplexity + ")";
}
} }

78
angular/src/components/captchaProtected.component.ts
View File

@@ -1,47 +1,55 @@
import { Directive, Input } from '@angular/core'; import { Directive, Input } from "@angular/core";
import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; import { EnvironmentService } from "jslib-common/abstractions/environment.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { CaptchaIFrame } from 'jslib-common/misc/captcha_iframe'; import { CaptchaIFrame } from "jslib-common/misc/captcha_iframe";
import { Utils } from 'jslib-common/misc/utils'; import { Utils } from "jslib-common/misc/utils";
@Directive() @Directive()
export abstract class CaptchaProtectedComponent { export abstract class CaptchaProtectedComponent {
@Input() captchaSiteKey: string = null; @Input() captchaSiteKey: string = null;
captchaToken: string = null; captchaToken: string = null;
captcha: CaptchaIFrame; captcha: CaptchaIFrame;
constructor(protected environmentService: EnvironmentService, protected i18nService: I18nService, constructor(
protected platformUtilsService: PlatformUtilsService) { } protected environmentService: EnvironmentService,
protected i18nService: I18nService,
protected platformUtilsService: PlatformUtilsService
) {}
async setupCaptcha() { async setupCaptcha() {
const webVaultUrl = this.environmentService.getWebVaultUrl(); const webVaultUrl = this.environmentService.getWebVaultUrl();
this.captcha = new CaptchaIFrame(window, webVaultUrl, this.captcha = new CaptchaIFrame(
this.i18nService, (token: string) => { window,
this.captchaToken = token; webVaultUrl,
}, (error: string) => { this.i18nService,
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), error); (token: string) => {
}, (info: string) => { this.captchaToken = token;
this.platformUtilsService.showToast('info', this.i18nService.t('info'), info); },
} (error: string) => {
); this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), error);
},
(info: string) => {
this.platformUtilsService.showToast("info", this.i18nService.t("info"), info);
}
);
}
showCaptcha() {
return !Utils.isNullOrWhitespace(this.captchaSiteKey);
}
protected handleCaptchaRequired(response: { captchaSiteKey: string }): boolean {
if (Utils.isNullOrWhitespace(response.captchaSiteKey)) {
return false;
} }
showCaptcha() { this.captchaSiteKey = response.captchaSiteKey;
return !Utils.isNullOrWhitespace(this.captchaSiteKey); this.captcha.init(response.captchaSiteKey);
} return true;
}
protected handleCaptchaRequired(response: { captchaSiteKey: string; }): boolean {
if (Utils.isNullOrWhitespace(response.captchaSiteKey)) {
return false;
}
this.captchaSiteKey = response.captchaSiteKey;
this.captcha.init(response.captchaSiteKey);
return true;
}
} }

149
angular/src/components/ciphers.component.ts
View File

@@ -1,95 +1,94 @@
import { import { Directive, EventEmitter, Input, Output } from "@angular/core";
Directive,
EventEmitter,
Input,
Output,
} from '@angular/core';
import { SearchService } from 'jslib-common/abstractions/search.service'; import { SearchService } from "jslib-common/abstractions/search.service";
import { CipherView } from 'jslib-common/models/view/cipherView'; import { CipherView } from "jslib-common/models/view/cipherView";
@Directive() @Directive()
export class CiphersComponent { export class CiphersComponent {
@Input() activeCipherId: string = null; @Input() activeCipherId: string = null;
@Output() onCipherClicked = new EventEmitter<CipherView>(); @Output() onCipherClicked = new EventEmitter<CipherView>();
@Output() onCipherRightClicked = new EventEmitter<CipherView>(); @Output() onCipherRightClicked = new EventEmitter<CipherView>();
@Output() onAddCipher = new EventEmitter(); @Output() onAddCipher = new EventEmitter();
@Output() onAddCipherOptions = new EventEmitter(); @Output() onAddCipherOptions = new EventEmitter();
loaded: boolean = false; loaded: boolean = false;
ciphers: CipherView[] = []; ciphers: CipherView[] = [];
searchText: string; searchText: string;
searchPlaceholder: string = null; searchPlaceholder: string = null;
filter: (cipher: CipherView) => boolean = null; filter: (cipher: CipherView) => boolean = null;
deleted: boolean = false; deleted: boolean = false;
protected searchPending = false; protected searchPending = false;
private searchTimeout: any = null; private searchTimeout: any = null;
constructor(protected searchService: SearchService) { } constructor(protected searchService: SearchService) {}
async load(filter: (cipher: CipherView) => boolean = null, deleted: boolean = false) { async load(filter: (cipher: CipherView) => boolean = null, deleted: boolean = false) {
this.deleted = deleted || false; this.deleted = deleted || false;
await this.applyFilter(filter); await this.applyFilter(filter);
this.loaded = true; this.loaded = true;
}
async reload(filter: (cipher: CipherView) => boolean = null, deleted: boolean = false) {
this.loaded = false;
this.ciphers = [];
await this.load(filter, deleted);
}
async refresh() {
await this.reload(this.filter, this.deleted);
}
async applyFilter(filter: (cipher: CipherView) => boolean = null) {
this.filter = filter;
await this.search(null);
}
async search(timeout: number = null, indexedCiphers?: CipherView[]) {
this.searchPending = false;
if (this.searchTimeout != null) {
clearTimeout(this.searchTimeout);
} }
if (timeout == null) {
async reload(filter: (cipher: CipherView) => boolean = null, deleted: boolean = false) { await this.doSearch(indexedCiphers);
this.loaded = false; return;
this.ciphers = [];
await this.load(filter, deleted);
} }
this.searchPending = true;
this.searchTimeout = setTimeout(async () => {
await this.doSearch(indexedCiphers);
this.searchPending = false;
}, timeout);
}
async refresh() { selectCipher(cipher: CipherView) {
await this.reload(this.filter, this.deleted); this.onCipherClicked.emit(cipher);
} }
async applyFilter(filter: (cipher: CipherView) => boolean = null) { rightClickCipher(cipher: CipherView) {
this.filter = filter; this.onCipherRightClicked.emit(cipher);
await this.search(null); }
}
async search(timeout: number = null, indexedCiphers?: CipherView[]) { addCipher() {
this.searchPending = false; this.onAddCipher.emit();
if (this.searchTimeout != null) { }
clearTimeout(this.searchTimeout);
}
if (timeout == null) {
await this.doSearch(indexedCiphers);
return;
}
this.searchPending = true;
this.searchTimeout = setTimeout(async () => {
await this.doSearch(indexedCiphers);
this.searchPending = false;
}, timeout);
}
selectCipher(cipher: CipherView) { addCipherOptions() {
this.onCipherClicked.emit(cipher); this.onAddCipherOptions.emit();
} }
rightClickCipher(cipher: CipherView) { isSearching() {
this.onCipherRightClicked.emit(cipher); return !this.searchPending && this.searchService.isSearchable(this.searchText);
} }
addCipher() { protected deletedFilter: (cipher: CipherView) => boolean = (c) => c.isDeleted === this.deleted;
this.onAddCipher.emit();
}
addCipherOptions() { protected async doSearch(indexedCiphers?: CipherView[]) {
this.onAddCipherOptions.emit(); this.ciphers = await this.searchService.searchCiphers(
} this.searchText,
[this.filter, this.deletedFilter],
isSearching() { indexedCiphers
return !this.searchPending && this.searchService.isSearchable(this.searchText); );
} }
protected deletedFilter: (cipher: CipherView) => boolean = c => c.isDeleted === this.deleted;
protected async doSearch(indexedCiphers?: CipherView[]) {
this.ciphers = await this.searchService.searchCiphers(this.searchText, [this.filter, this.deletedFilter], indexedCiphers);
}
} }

146
angular/src/components/collections.component.ts
View File

@@ -1,90 +1,94 @@
import { import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
Directive,
EventEmitter,
Input,
OnInit,
Output,
} from '@angular/core';
import { CipherService } from 'jslib-common/abstractions/cipher.service'; import { CipherService } from "jslib-common/abstractions/cipher.service";
import { CollectionService } from 'jslib-common/abstractions/collection.service'; import { CollectionService } from "jslib-common/abstractions/collection.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { LogService } from 'jslib-common/abstractions/log.service'; import { LogService } from "jslib-common/abstractions/log.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { CipherView } from 'jslib-common/models/view/cipherView'; import { CipherView } from "jslib-common/models/view/cipherView";
import { CollectionView } from 'jslib-common/models/view/collectionView'; import { CollectionView } from "jslib-common/models/view/collectionView";
import { Cipher } from 'jslib-common/models/domain/cipher'; import { Cipher } from "jslib-common/models/domain/cipher";
@Directive() @Directive()
export class CollectionsComponent implements OnInit { export class CollectionsComponent implements OnInit {
@Input() cipherId: string; @Input() cipherId: string;
@Input() allowSelectNone = false; @Input() allowSelectNone = false;
@Output() onSavedCollections = new EventEmitter(); @Output() onSavedCollections = new EventEmitter();
formPromise: Promise<any>; formPromise: Promise<any>;
cipher: CipherView; cipher: CipherView;
collectionIds: string[]; collectionIds: string[];
collections: CollectionView[] = []; collections: CollectionView[] = [];
protected cipherDomain: Cipher; protected cipherDomain: Cipher;
constructor(protected collectionService: CollectionService, protected platformUtilsService: PlatformUtilsService, constructor(
protected i18nService: I18nService, protected cipherService: CipherService, private logService: LogService) { } protected collectionService: CollectionService,
protected platformUtilsService: PlatformUtilsService,
protected i18nService: I18nService,
protected cipherService: CipherService,
private logService: LogService
) {}
async ngOnInit() { async ngOnInit() {
await this.load(); await this.load();
}
async load() {
this.cipherDomain = await this.loadCipher();
this.collectionIds = this.loadCipherCollections();
this.cipher = await this.cipherDomain.decrypt();
this.collections = await this.loadCollections();
this.collections.forEach((c) => ((c as any).checked = false));
if (this.collectionIds != null) {
this.collections.forEach((c) => {
(c as any).checked = this.collectionIds != null && this.collectionIds.indexOf(c.id) > -1;
});
} }
}
async load() { async submit() {
this.cipherDomain = await this.loadCipher(); const selectedCollectionIds = this.collections
this.collectionIds = this.loadCipherCollections(); .filter((c) => !!(c as any).checked)
this.cipher = await this.cipherDomain.decrypt(); .map((c) => c.id);
this.collections = await this.loadCollections(); if (!this.allowSelectNone && selectedCollectionIds.length === 0) {
this.platformUtilsService.showToast(
this.collections.forEach(c => (c as any).checked = false); "error",
if (this.collectionIds != null) { this.i18nService.t("errorOccurred"),
this.collections.forEach(c => { this.i18nService.t("selectOneCollection")
(c as any).checked = this.collectionIds != null && this.collectionIds.indexOf(c.id) > -1; );
}); return;
}
} }
this.cipherDomain.collectionIds = selectedCollectionIds;
async submit() { try {
const selectedCollectionIds = this.collections this.formPromise = this.saveCollections();
.filter(c => !!(c as any).checked) await this.formPromise;
.map(c => c.id); this.onSavedCollections.emit();
if (!this.allowSelectNone && selectedCollectionIds.length === 0) { this.platformUtilsService.showToast("success", null, this.i18nService.t("editedItem"));
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), } catch (e) {
this.i18nService.t('selectOneCollection')); this.logService.error(e);
return;
}
this.cipherDomain.collectionIds = selectedCollectionIds;
try {
this.formPromise = this.saveCollections();
await this.formPromise;
this.onSavedCollections.emit();
this.platformUtilsService.showToast('success', null, this.i18nService.t('editedItem'));
} catch (e) {
this.logService.error(e);
}
} }
}
protected loadCipher() { protected loadCipher() {
return this.cipherService.get(this.cipherId); return this.cipherService.get(this.cipherId);
} }
protected loadCipherCollections() { protected loadCipherCollections() {
return this.cipherDomain.collectionIds; return this.cipherDomain.collectionIds;
} }
protected async loadCollections() { protected async loadCollections() {
const allCollections = await this.collectionService.getAllDecrypted(); const allCollections = await this.collectionService.getAllDecrypted();
return allCollections.filter(c => !c.readOnly && c.organizationId === this.cipher.organizationId); return allCollections.filter(
} (c) => !c.readOnly && c.organizationId === this.cipher.organizationId
);
}
protected saveCollections() { protected saveCollections() {
return this.cipherService.saveCollectionsWithServer(this.cipherDomain); return this.cipherService.saveCollectionsWithServer(this.cipherDomain);
} }
} }

102
angular/src/components/environment.component.ts
View File

@@ -1,65 +1,63 @@
import { import { Directive, EventEmitter, Output } from "@angular/core";
Directive,
EventEmitter,
Output,
} from '@angular/core';
import { EnvironmentService } from 'jslib-common/abstractions/environment.service'; import { EnvironmentService } from "jslib-common/abstractions/environment.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
@Directive() @Directive()
export class EnvironmentComponent { export class EnvironmentComponent {
@Output() onSaved = new EventEmitter(); @Output() onSaved = new EventEmitter();
iconsUrl: string; iconsUrl: string;
identityUrl: string; identityUrl: string;
apiUrl: string; apiUrl: string;
webVaultUrl: string; webVaultUrl: string;
notificationsUrl: string; notificationsUrl: string;
baseUrl: string; baseUrl: string;
showCustom = false; showCustom = false;
constructor(protected platformUtilsService: PlatformUtilsService, protected environmentService: EnvironmentService, constructor(
protected i18nService: I18nService) { protected platformUtilsService: PlatformUtilsService,
protected environmentService: EnvironmentService,
protected i18nService: I18nService
) {
const urls = this.environmentService.getUrls();
const urls = this.environmentService.getUrls(); this.baseUrl = urls.base || "";
this.webVaultUrl = urls.webVault || "";
this.apiUrl = urls.api || "";
this.identityUrl = urls.identity || "";
this.iconsUrl = urls.icons || "";
this.notificationsUrl = urls.notifications || "";
}
this.baseUrl = urls.base || ''; async submit() {
this.webVaultUrl = urls.webVault || ''; const resUrls = await this.environmentService.setUrls({
this.apiUrl = urls.api || ''; base: this.baseUrl,
this.identityUrl = urls.identity || ''; api: this.apiUrl,
this.iconsUrl = urls.icons || ''; identity: this.identityUrl,
this.notificationsUrl = urls.notifications || ''; webVault: this.webVaultUrl,
} icons: this.iconsUrl,
notifications: this.notificationsUrl,
});
async submit() { // re-set urls since service can change them, ex: prefixing https://
const resUrls = await this.environmentService.setUrls({ this.baseUrl = resUrls.base;
base: this.baseUrl, this.apiUrl = resUrls.api;
api: this.apiUrl, this.identityUrl = resUrls.identity;
identity: this.identityUrl, this.webVaultUrl = resUrls.webVault;
webVault: this.webVaultUrl, this.iconsUrl = resUrls.icons;
icons: this.iconsUrl, this.notificationsUrl = resUrls.notifications;
notifications: this.notificationsUrl,
});
// re-set urls since service can change them, ex: prefixing https:// this.platformUtilsService.showToast("success", null, this.i18nService.t("environmentSaved"));
this.baseUrl = resUrls.base; this.saved();
this.apiUrl = resUrls.api; }
this.identityUrl = resUrls.identity;
this.webVaultUrl = resUrls.webVault;
this.iconsUrl = resUrls.icons;
this.notificationsUrl = resUrls.notifications;
this.platformUtilsService.showToast('success', null, this.i18nService.t('environmentSaved')); toggleCustom() {
this.saved(); this.showCustom = !this.showCustom;
} }
toggleCustom() { protected saved() {
this.showCustom = !this.showCustom; this.onSaved.emit();
} }
protected saved() {
this.onSaved.emit();
}
} }

242
angular/src/components/export.component.ts
View File

@@ -1,140 +1,156 @@
import { import { Directive, EventEmitter, OnInit, Output } from "@angular/core";
Directive, import { FormBuilder } from "@angular/forms";
EventEmitter,
OnInit,
Output,
} from '@angular/core';
import { FormBuilder } from '@angular/forms';
import { CryptoService } from 'jslib-common/abstractions/crypto.service'; import { CryptoService } from "jslib-common/abstractions/crypto.service";
import { EventService } from 'jslib-common/abstractions/event.service'; import { EventService } from "jslib-common/abstractions/event.service";
import { ExportService } from 'jslib-common/abstractions/export.service'; import { ExportService } from "jslib-common/abstractions/export.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { LogService } from 'jslib-common/abstractions/log.service'; import { LogService } from "jslib-common/abstractions/log.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { PolicyService } from 'jslib-common/abstractions/policy.service'; import { PolicyService } from "jslib-common/abstractions/policy.service";
import { UserVerificationService } from 'jslib-common/abstractions/userVerification.service'; import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
import { EventType } from 'jslib-common/enums/eventType'; import { EventType } from "jslib-common/enums/eventType";
import { PolicyType } from 'jslib-common/enums/policyType'; import { PolicyType } from "jslib-common/enums/policyType";
@Directive() @Directive()
export class ExportComponent implements OnInit { export class ExportComponent implements OnInit {
@Output() onSaved = new EventEmitter(); @Output() onSaved = new EventEmitter();
formPromise: Promise<string>; formPromise: Promise<string>;
disabledByPolicy: boolean = false; disabledByPolicy: boolean = false;
exportForm = this.fb.group({ exportForm = this.fb.group({
format: ['json'], format: ["json"],
secret: [''], secret: [""],
}); });
formatOptions = [ formatOptions = [
{ name: '.json', value: 'json' }, { name: ".json", value: "json" },
{ name: '.csv', value: 'csv' }, { name: ".csv", value: "csv" },
{ name: '.json (Encrypted)', value: 'encrypted_json' }, { name: ".json (Encrypted)", value: "encrypted_json" },
]; ];
constructor(protected cryptoService: CryptoService, protected i18nService: I18nService, constructor(
protected platformUtilsService: PlatformUtilsService, protected exportService: ExportService, protected cryptoService: CryptoService,
protected eventService: EventService, private policyService: PolicyService, protected win: Window, protected i18nService: I18nService,
private logService: LogService, private userVerificationService: UserVerificationService, protected platformUtilsService: PlatformUtilsService,
private fb: FormBuilder) { } protected exportService: ExportService,
protected eventService: EventService,
private policyService: PolicyService,
protected win: Window,
private logService: LogService,
private userVerificationService: UserVerificationService,
private fb: FormBuilder
) {}
async ngOnInit() { async ngOnInit() {
await this.checkExportDisabled(); await this.checkExportDisabled();
}
async checkExportDisabled() {
this.disabledByPolicy = await this.policyService.policyAppliesToUser(
PolicyType.DisablePersonalVaultExport
);
if (this.disabledByPolicy) {
this.exportForm.disable();
}
}
get encryptedFormat() {
return this.format === "encrypted_json";
}
async submit() {
if (this.disabledByPolicy) {
this.platformUtilsService.showToast(
"error",
null,
this.i18nService.t("personalVaultExportPolicyInEffect")
);
return;
} }
async checkExportDisabled() { const acceptedWarning = await this.warningDialog();
this.disabledByPolicy = await this.policyService.policyAppliesToUser(PolicyType.DisablePersonalVaultExport); if (!acceptedWarning) {
if (this.disabledByPolicy) { return;
this.exportForm.disable();
}
} }
get encryptedFormat() { const secret = this.exportForm.get("secret").value;
return this.format === 'encrypted_json'; try {
await this.userVerificationService.verifyUser(secret);
} catch (e) {
this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), e.message);
return;
} }
async submit() { try {
if (this.disabledByPolicy) { this.formPromise = this.getExportData();
this.platformUtilsService.showToast('error', null, this.i18nService.t('personalVaultExportPolicyInEffect')); const data = await this.formPromise;
return; this.downloadFile(data);
} this.saved();
await this.collectEvent();
const acceptedWarning = await this.warningDialog(); this.exportForm.get("secret").setValue("");
if (!acceptedWarning) { } catch (e) {
return; this.logService.error(e);
}
const secret = this.exportForm.get('secret').value;
try {
await this.userVerificationService.verifyUser(secret);
} catch (e) {
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), e.message);
return;
}
try {
this.formPromise = this.getExportData();
const data = await this.formPromise;
this.downloadFile(data);
this.saved();
await this.collectEvent();
this.exportForm.get('secret').setValue('');
} catch (e) {
this.logService.error(e);
}
} }
}
async warningDialog() { async warningDialog() {
if (this.encryptedFormat) { if (this.encryptedFormat) {
return await this.platformUtilsService.showDialog( return await this.platformUtilsService.showDialog(
'<p>' + this.i18nService.t('encExportKeyWarningDesc') + "<p>" +
'<p>' + this.i18nService.t('encExportAccountWarningDesc'), this.i18nService.t("encExportKeyWarningDesc") +
this.i18nService.t('confirmVaultExport'), this.i18nService.t('exportVault'), "<p>" +
this.i18nService.t('cancel'), 'warning', this.i18nService.t("encExportAccountWarningDesc"),
true); this.i18nService.t("confirmVaultExport"),
} else { this.i18nService.t("exportVault"),
return await this.platformUtilsService.showDialog( this.i18nService.t("cancel"),
this.i18nService.t('exportWarningDesc'), "warning",
this.i18nService.t('confirmVaultExport'), this.i18nService.t('exportVault'), true
this.i18nService.t('cancel'), 'warning'); );
} } else {
return await this.platformUtilsService.showDialog(
this.i18nService.t("exportWarningDesc"),
this.i18nService.t("confirmVaultExport"),
this.i18nService.t("exportVault"),
this.i18nService.t("cancel"),
"warning"
);
} }
}
protected saved() { protected saved() {
this.onSaved.emit(); this.onSaved.emit();
} }
protected getExportData() { protected getExportData() {
return this.exportService.getExport(this.format); return this.exportService.getExport(this.format);
} }
protected getFileName(prefix?: string) { protected getFileName(prefix?: string) {
let extension = this.format; let extension = this.format;
if (this.format === 'encrypted_json') { if (this.format === "encrypted_json") {
if (prefix == null) { if (prefix == null) {
prefix = 'encrypted'; prefix = "encrypted";
} else { } else {
prefix = 'encrypted_' + prefix; prefix = "encrypted_" + prefix;
} }
extension = 'json'; extension = "json";
}
return this.exportService.getFileName(prefix, extension);
} }
return this.exportService.getFileName(prefix, extension);
}
protected async collectEvent(): Promise<any> { protected async collectEvent(): Promise<any> {
await this.eventService.collect(EventType.User_ClientExportedVault); await this.eventService.collect(EventType.User_ClientExportedVault);
} }
get format() { get format() {
return this.exportForm.get('format').value; return this.exportForm.get("format").value;
} }
private downloadFile(csv: string): void { private downloadFile(csv: string): void {
const fileName = this.getFileName(); const fileName = this.getFileName();
this.platformUtilsService.saveFile(this.win, csv, { type: 'text/plain' }, fileName); this.platformUtilsService.saveFile(this.win, csv, { type: "text/plain" }, fileName);
} }
} }

152
angular/src/components/folder-add-edit.component.ts
View File

@@ -1,89 +1,97 @@
import { import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
Directive,
EventEmitter,
Input,
OnInit,
Output,
} from '@angular/core';
import { FolderService } from 'jslib-common/abstractions/folder.service'; import { FolderService } from "jslib-common/abstractions/folder.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { LogService } from 'jslib-common/abstractions/log.service'; import { LogService } from "jslib-common/abstractions/log.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { FolderView } from 'jslib-common/models/view/folderView'; import { FolderView } from "jslib-common/models/view/folderView";
@Directive() @Directive()
export class FolderAddEditComponent implements OnInit { export class FolderAddEditComponent implements OnInit {
@Input() folderId: string; @Input() folderId: string;
@Output() onSavedFolder = new EventEmitter<FolderView>(); @Output() onSavedFolder = new EventEmitter<FolderView>();
@Output() onDeletedFolder = new EventEmitter<FolderView>(); @Output() onDeletedFolder = new EventEmitter<FolderView>();
editMode: boolean = false; editMode: boolean = false;
folder: FolderView = new FolderView(); folder: FolderView = new FolderView();
title: string; title: string;
formPromise: Promise<any>; formPromise: Promise<any>;
deletePromise: Promise<any>; deletePromise: Promise<any>;
constructor(protected folderService: FolderService, protected i18nService: I18nService, constructor(
protected platformUtilsService: PlatformUtilsService, private logService: LogService) { } protected folderService: FolderService,
protected i18nService: I18nService,
protected platformUtilsService: PlatformUtilsService,
private logService: LogService
) {}
async ngOnInit() { async ngOnInit() {
await this.init(); await this.init();
}
async submit(): Promise<boolean> {
if (this.folder.name == null || this.folder.name === "") {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("nameRequired")
);
return false;
} }
async submit(): Promise<boolean> { try {
if (this.folder.name == null || this.folder.name === '') { const folder = await this.folderService.encrypt(this.folder);
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), this.formPromise = this.folderService.saveWithServer(folder);
this.i18nService.t('nameRequired')); await this.formPromise;
return false; this.platformUtilsService.showToast(
} "success",
null,
try { this.i18nService.t(this.editMode ? "editedFolder" : "addedFolder")
const folder = await this.folderService.encrypt(this.folder); );
this.formPromise = this.folderService.saveWithServer(folder); this.onSavedFolder.emit(this.folder);
await this.formPromise; return true;
this.platformUtilsService.showToast('success', null, } catch (e) {
this.i18nService.t(this.editMode ? 'editedFolder' : 'addedFolder')); this.logService.error(e);
this.onSavedFolder.emit(this.folder);
return true;
} catch (e) {
this.logService.error(e);
}
return false;
} }
async delete(): Promise<boolean> { return false;
const confirmed = await this.platformUtilsService.showDialog( }
this.i18nService.t('deleteFolderConfirmation'), this.i18nService.t('deleteFolder'),
this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
if (!confirmed) {
return false;
}
try { async delete(): Promise<boolean> {
this.deletePromise = this.folderService.deleteWithServer(this.folder.id); const confirmed = await this.platformUtilsService.showDialog(
await this.deletePromise; this.i18nService.t("deleteFolderConfirmation"),
this.platformUtilsService.showToast('success', null, this.i18nService.t('deletedFolder')); this.i18nService.t("deleteFolder"),
this.onDeletedFolder.emit(this.folder); this.i18nService.t("yes"),
} catch (e) { this.i18nService.t("no"),
this.logService.error(e); "warning"
} );
if (!confirmed) {
return true; return false;
} }
protected async init() { try {
this.editMode = this.folderId != null; this.deletePromise = this.folderService.deleteWithServer(this.folder.id);
await this.deletePromise;
if (this.editMode) { this.platformUtilsService.showToast("success", null, this.i18nService.t("deletedFolder"));
this.editMode = true; this.onDeletedFolder.emit(this.folder);
this.title = this.i18nService.t('editFolder'); } catch (e) {
const folder = await this.folderService.get(this.folderId); this.logService.error(e);
this.folder = await folder.decrypt();
} else {
this.title = this.i18nService.t('addFolder');
}
} }
return true;
}
protected async init() {
this.editMode = this.folderId != null;
if (this.editMode) {
this.editMode = true;
this.title = this.i18nService.t("editFolder");
const folder = await this.folderService.get(this.folderId);
this.folder = await folder.decrypt();
} else {
this.title = this.i18nService.t("addFolder");
}
}
} }

84
angular/src/components/hint.component.ts
View File

@@ -1,46 +1,56 @@
import { Router } from '@angular/router'; import { Router } from "@angular/router";
import { PasswordHintRequest } from 'jslib-common/models/request/passwordHintRequest'; import { PasswordHintRequest } from "jslib-common/models/request/passwordHintRequest";
import { ApiService } from 'jslib-common/abstractions/api.service'; import { ApiService } from "jslib-common/abstractions/api.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { LogService } from 'jslib-common/abstractions/log.service'; import { LogService } from "jslib-common/abstractions/log.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
export class HintComponent { export class HintComponent {
email: string = ''; email: string = "";
formPromise: Promise<any>; formPromise: Promise<any>;
protected successRoute = 'login'; protected successRoute = "login";
protected onSuccessfulSubmit: () => void; protected onSuccessfulSubmit: () => void;
constructor(protected router: Router, protected i18nService: I18nService, constructor(
protected apiService: ApiService, protected platformUtilsService: PlatformUtilsService, protected router: Router,
private logService: LogService) { } protected i18nService: I18nService,
protected apiService: ApiService,
protected platformUtilsService: PlatformUtilsService,
private logService: LogService
) {}
async submit() { async submit() {
if (this.email == null || this.email === '') { if (this.email == null || this.email === "") {
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), this.platformUtilsService.showToast(
this.i18nService.t('emailRequired')); "error",
return; this.i18nService.t("errorOccurred"),
} this.i18nService.t("emailRequired")
if (this.email.indexOf('@') === -1) { );
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), return;
this.i18nService.t('invalidEmail'));
return;
}
try {
this.formPromise = this.apiService.postPasswordHint(new PasswordHintRequest(this.email));
await this.formPromise;
this.platformUtilsService.showToast('success', null, this.i18nService.t('masterPassSent'));
if (this.onSuccessfulSubmit != null) {
this.onSuccessfulSubmit();
} else if (this.router != null) {
this.router.navigate([this.successRoute]);
}
} catch (e) {
this.logService.error(e);
}
} }
if (this.email.indexOf("@") === -1) {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("invalidEmail")
);
return;
}
try {
this.formPromise = this.apiService.postPasswordHint(new PasswordHintRequest(this.email));
await this.formPromise;
this.platformUtilsService.showToast("success", null, this.i18nService.t("masterPassSent"));
if (this.onSuccessfulSubmit != null) {
this.onSuccessfulSubmit();
} else if (this.router != null) {
this.router.navigate([this.successRoute]);
}
} catch (e) {
this.logService.error(e);
}
}
} }

4
angular/src/components/icon.component.html
View File

@@ -1,4 +1,4 @@
<div class="icon" aria-hidden="true"> <div class="icon" aria-hidden="true">
<img [src]="image" appFallbackSrc="{{fallbackImage}}" *ngIf="imageEnabled && image" alt="" /> <img [src]="image" appFallbackSrc="{{ fallbackImage }}" *ngIf="imageEnabled && image" alt="" />
<i class="fa fa-fw fa-lg {{icon}}" *ngIf="!imageEnabled || !image"></i> <i class="fa fa-fw fa-lg {{ icon }}" *ngIf="!imageEnabled || !image"></i>
</div> </div>

114
angular/src/components/modal/dynamic-modal.component.ts
View File

@@ -1,76 +1,80 @@
import { import {
AfterViewInit, AfterViewInit,
ChangeDetectorRef, ChangeDetectorRef,
Component, Component,
ComponentRef, ComponentRef,
ElementRef, ElementRef,
OnDestroy, OnDestroy,
Type, Type,
ViewChild, ViewChild,
ViewContainerRef ViewContainerRef,
} from '@angular/core'; } from "@angular/core";
import { import { ConfigurableFocusTrap, ConfigurableFocusTrapFactory } from "@angular/cdk/a11y";
ConfigurableFocusTrap,
ConfigurableFocusTrapFactory,
} from '@angular/cdk/a11y';
import { ModalService } from '../../services/modal.service'; import { ModalService } from "../../services/modal.service";
import { ModalRef } from './modal.ref'; import { ModalRef } from "./modal.ref";
@Component({ @Component({
selector: 'app-modal', selector: "app-modal",
template: '<ng-template #modalContent></ng-template>', template: "<ng-template #modalContent></ng-template>",
}) })
export class DynamicModalComponent implements AfterViewInit, OnDestroy { export class DynamicModalComponent implements AfterViewInit, OnDestroy {
componentRef: ComponentRef<any>; componentRef: ComponentRef<any>;
@ViewChild('modalContent', { read: ViewContainerRef, static: true }) modalContentRef: ViewContainerRef; @ViewChild("modalContent", { read: ViewContainerRef, static: true })
modalContentRef: ViewContainerRef;
childComponentType: Type<any>; childComponentType: Type<any>;
setComponentParameters: (component: any) => void; setComponentParameters: (component: any) => void;
private focusTrap: ConfigurableFocusTrap; private focusTrap: ConfigurableFocusTrap;
constructor(private modalService: ModalService, private cd: ChangeDetectorRef, constructor(
private el: ElementRef<HTMLElement>, private focusTrapFactory: ConfigurableFocusTrapFactory, private modalService: ModalService,
public modalRef: ModalRef) { } private cd: ChangeDetectorRef,
private el: ElementRef<HTMLElement>,
private focusTrapFactory: ConfigurableFocusTrapFactory,
public modalRef: ModalRef
) {}
ngAfterViewInit() { ngAfterViewInit() {
this.loadChildComponent(this.childComponentType); this.loadChildComponent(this.childComponentType);
if (this.setComponentParameters != null) { if (this.setComponentParameters != null) {
this.setComponentParameters(this.componentRef.instance); this.setComponentParameters(this.componentRef.instance);
}
this.cd.detectChanges();
this.modalRef.created(this.el.nativeElement);
this.focusTrap = this.focusTrapFactory.create(this.el.nativeElement.querySelector('.modal-dialog'));
if (this.el.nativeElement.querySelector('[appAutoFocus]') == null) {
this.focusTrap.focusFirstTabbableElementWhenReady();
}
} }
this.cd.detectChanges();
loadChildComponent(componentType: Type<any>) { this.modalRef.created(this.el.nativeElement);
const componentFactory = this.modalService.resolveComponentFactory(componentType); this.focusTrap = this.focusTrapFactory.create(
this.el.nativeElement.querySelector(".modal-dialog")
this.modalContentRef.clear(); );
this.componentRef = this.modalContentRef.createComponent(componentFactory); if (this.el.nativeElement.querySelector("[appAutoFocus]") == null) {
this.focusTrap.focusFirstTabbableElementWhenReady();
} }
}
ngOnDestroy() { loadChildComponent(componentType: Type<any>) {
if (this.componentRef) { const componentFactory = this.modalService.resolveComponentFactory(componentType);
this.componentRef.destroy();
}
this.focusTrap.destroy();
}
close() { this.modalContentRef.clear();
this.modalRef.close(); this.componentRef = this.modalContentRef.createComponent(componentFactory);
} }
getFocus() { ngOnDestroy() {
const autoFocusEl = this.el.nativeElement.querySelector('[appAutoFocus]') as HTMLElement; if (this.componentRef) {
autoFocusEl?.focus(); this.componentRef.destroy();
} }
this.focusTrap.destroy();
}
close() {
this.modalRef.close();
}
getFocus() {
const autoFocusEl = this.el.nativeElement.querySelector("[appAutoFocus]") as HTMLElement;
autoFocusEl?.focus();
}
} }

17
angular/src/components/modal/modal-injector.ts
View File

@@ -1,15 +1,10 @@
import { import { InjectFlags, InjectionToken, Injector, Type } from "@angular/core";
InjectFlags,
InjectionToken,
Injector,
Type
} from '@angular/core';
export class ModalInjector implements Injector { export class ModalInjector implements Injector {
constructor(private _parentInjector: Injector, private _additionalTokens: WeakMap<any, any>) {} constructor(private _parentInjector: Injector, private _additionalTokens: WeakMap<any, any>) {}
get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T; get<T>(token: Type<T> | InjectionToken<T>, notFoundValue?: T, flags?: InjectFlags): T;
get(token: any, notFoundValue?: any, flags?: any) { get(token: any, notFoundValue?: any, flags?: any) {
return this._additionalTokens.get(token) ?? this._parentInjector.get<any>(token, notFoundValue); return this._additionalTokens.get(token) ?? this._parentInjector.get<any>(token, notFoundValue);
} }
} }

50
angular/src/components/password-generator-history.component.ts
View File

@@ -1,32 +1,38 @@
import { Directive, OnInit } from '@angular/core'; import { Directive, OnInit } from "@angular/core";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { GeneratedPasswordHistory } from 'jslib-common/models/domain/generatedPasswordHistory'; import { GeneratedPasswordHistory } from "jslib-common/models/domain/generatedPasswordHistory";
@Directive() @Directive()
export class PasswordGeneratorHistoryComponent implements OnInit { export class PasswordGeneratorHistoryComponent implements OnInit {
history: GeneratedPasswordHistory[] = []; history: GeneratedPasswordHistory[] = [];
constructor(protected passwordGenerationService: PasswordGenerationService, constructor(
protected platformUtilsService: PlatformUtilsService, protected i18nService: I18nService, protected passwordGenerationService: PasswordGenerationService,
private win: Window) { } protected platformUtilsService: PlatformUtilsService,
protected i18nService: I18nService,
private win: Window
) {}
async ngOnInit() { async ngOnInit() {
this.history = await this.passwordGenerationService.getHistory(); this.history = await this.passwordGenerationService.getHistory();
} }
clear() { clear() {
this.history = []; this.history = [];
this.passwordGenerationService.clear(); this.passwordGenerationService.clear();
} }
copy(password: string) { copy(password: string) {
const copyOptions = this.win != null ? { window: this.win } : null; const copyOptions = this.win != null ? { window: this.win } : null;
this.platformUtilsService.copyToClipboard(password, copyOptions); this.platformUtilsService.copyToClipboard(password, copyOptions);
this.platformUtilsService.showToast('info', null, this.platformUtilsService.showToast(
this.i18nService.t('valueCopied', this.i18nService.t('password'))); "info",
} null,
this.i18nService.t("valueCopied", this.i18nService.t("password"))
);
}
} }

173
angular/src/components/password-generator.component.ts
View File

@@ -1,101 +1,106 @@
import { import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
Directive,
EventEmitter,
Input,
OnInit,
Output,
} from '@angular/core';
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PasswordGenerationService } from 'jslib-common/abstractions/passwordGeneration.service'; import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { PasswordGeneratorPolicyOptions } from 'jslib-common/models/domain/passwordGeneratorPolicyOptions'; import { PasswordGeneratorPolicyOptions } from "jslib-common/models/domain/passwordGeneratorPolicyOptions";
@Directive() @Directive()
export class PasswordGeneratorComponent implements OnInit { export class PasswordGeneratorComponent implements OnInit {
@Input() showSelect: boolean = false; @Input() showSelect: boolean = false;
@Output() onSelected = new EventEmitter<string>(); @Output() onSelected = new EventEmitter<string>();
passTypeOptions: any[]; passTypeOptions: any[];
options: any = {}; options: any = {};
password: string = '-'; password: string = "-";
showOptions = false; showOptions = false;
avoidAmbiguous = false; avoidAmbiguous = false;
enforcedPolicyOptions: PasswordGeneratorPolicyOptions; enforcedPolicyOptions: PasswordGeneratorPolicyOptions;
constructor(protected passwordGenerationService: PasswordGenerationService, constructor(
protected platformUtilsService: PlatformUtilsService, protected i18nService: I18nService, protected passwordGenerationService: PasswordGenerationService,
private win: Window) { protected platformUtilsService: PlatformUtilsService,
this.passTypeOptions = [ protected i18nService: I18nService,
{ name: i18nService.t('password'), value: 'password' }, private win: Window
{ name: i18nService.t('passphrase'), value: 'passphrase' }, ) {
]; this.passTypeOptions = [
} { name: i18nService.t("password"), value: "password" },
{ name: i18nService.t("passphrase"), value: "passphrase" },
];
}
async ngOnInit() { async ngOnInit() {
const optionsResponse = await this.passwordGenerationService.getOptions(); const optionsResponse = await this.passwordGenerationService.getOptions();
this.options = optionsResponse[0]; this.options = optionsResponse[0];
this.enforcedPolicyOptions = optionsResponse[1]; this.enforcedPolicyOptions = optionsResponse[1];
this.avoidAmbiguous = !this.options.ambiguous; this.avoidAmbiguous = !this.options.ambiguous;
this.options.type = this.options.type === 'passphrase' ? 'passphrase' : 'password'; this.options.type = this.options.type === "passphrase" ? "passphrase" : "password";
this.password = await this.passwordGenerationService.generatePassword(this.options); this.password = await this.passwordGenerationService.generatePassword(this.options);
await this.passwordGenerationService.addHistory(this.password); await this.passwordGenerationService.addHistory(this.password);
}
async sliderChanged() {
this.saveOptions(false);
await this.passwordGenerationService.addHistory(this.password);
}
async sliderInput() {
this.normalizeOptions();
this.password = await this.passwordGenerationService.generatePassword(this.options);
}
async saveOptions(regenerate: boolean = true) {
this.normalizeOptions();
await this.passwordGenerationService.saveOptions(this.options);
if (regenerate) {
await this.regenerate();
} }
}
async sliderChanged() { async regenerate() {
this.saveOptions(false); this.password = await this.passwordGenerationService.generatePassword(this.options);
await this.passwordGenerationService.addHistory(this.password); await this.passwordGenerationService.addHistory(this.password);
} }
async sliderInput() { copy() {
this.normalizeOptions(); const copyOptions = this.win != null ? { window: this.win } : null;
this.password = await this.passwordGenerationService.generatePassword(this.options); this.platformUtilsService.copyToClipboard(this.password, copyOptions);
} this.platformUtilsService.showToast(
"info",
null,
this.i18nService.t("valueCopied", this.i18nService.t("password"))
);
}
async saveOptions(regenerate: boolean = true) { select() {
this.normalizeOptions(); this.onSelected.emit(this.password);
await this.passwordGenerationService.saveOptions(this.options); }
if (regenerate) { toggleOptions() {
await this.regenerate(); this.showOptions = !this.showOptions;
}
private normalizeOptions() {
// Application level normalize options depedent on class variables
this.options.ambiguous = !this.avoidAmbiguous;
if (
!this.options.uppercase &&
!this.options.lowercase &&
!this.options.number &&
!this.options.special
) {
this.options.lowercase = true;
if (this.win != null) {
const lowercase = this.win.document.querySelector("#lowercase") as HTMLInputElement;
if (lowercase) {
lowercase.checked = true;
} }
}
} }
async regenerate() { this.passwordGenerationService.normalizeOptions(this.options, this.enforcedPolicyOptions);
this.password = await this.passwordGenerationService.generatePassword(this.options); }
await this.passwordGenerationService.addHistory(this.password);
}
copy() {
const copyOptions = this.win != null ? { window: this.win } : null;
this.platformUtilsService.copyToClipboard(this.password, copyOptions);
this.platformUtilsService.showToast('info', null,
this.i18nService.t('valueCopied', this.i18nService.t('password')));
}
select() {
this.onSelected.emit(this.password);
}
toggleOptions() {
this.showOptions = !this.showOptions;
}
private normalizeOptions() {
// Application level normalize options depedent on class variables
this.options.ambiguous = !this.avoidAmbiguous;
if (!this.options.uppercase && !this.options.lowercase && !this.options.number && !this.options.special) {
this.options.lowercase = true;
if (this.win != null) {
const lowercase = this.win.document.querySelector('#lowercase') as HTMLInputElement;
if (lowercase) {
lowercase.checked = true;
}
}
}
this.passwordGenerationService.normalizeOptions(this.options, this.enforcedPolicyOptions);
}
} }

53
angular/src/components/password-history.component.ts
View File

@@ -1,33 +1,40 @@
import { Directive, OnInit } from '@angular/core'; import { Directive, OnInit } from "@angular/core";
import { CipherService } from 'jslib-common/abstractions/cipher.service'; import { CipherService } from "jslib-common/abstractions/cipher.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { PasswordHistoryView } from 'jslib-common/models/view/passwordHistoryView'; import { PasswordHistoryView } from "jslib-common/models/view/passwordHistoryView";
@Directive() @Directive()
export class PasswordHistoryComponent implements OnInit { export class PasswordHistoryComponent implements OnInit {
cipherId: string; cipherId: string;
history: PasswordHistoryView[] = []; history: PasswordHistoryView[] = [];
constructor(protected cipherService: CipherService, protected platformUtilsService: PlatformUtilsService, constructor(
protected i18nService: I18nService, private win: Window) { } protected cipherService: CipherService,
protected platformUtilsService: PlatformUtilsService,
protected i18nService: I18nService,
private win: Window
) {}
async ngOnInit() { async ngOnInit() {
await this.init(); await this.init();
} }
copy(password: string) { copy(password: string) {
const copyOptions = this.win != null ? { window: this.win } : null; const copyOptions = this.win != null ? { window: this.win } : null;
this.platformUtilsService.copyToClipboard(password, copyOptions); this.platformUtilsService.copyToClipboard(password, copyOptions);
this.platformUtilsService.showToast('info', null, this.platformUtilsService.showToast(
this.i18nService.t('valueCopied', this.i18nService.t('password'))); "info",
} null,
this.i18nService.t("valueCopied", this.i18nService.t("password"))
);
}
protected async init() { protected async init() {
const cipher = await this.cipherService.get(this.cipherId); const cipher = await this.cipherService.get(this.cipherId);
const decCipher = await cipher.decrypt(); const decCipher = await cipher.decrypt();
this.history = decCipher.passwordHistory == null ? [] : decCipher.passwordHistory; this.history = decCipher.passwordHistory == null ? [] : decCipher.passwordHistory;
} }
} }

46
angular/src/components/password-reprompt.component.ts
View File

@@ -1,30 +1,36 @@
import { Directive } from '@angular/core'; import { Directive } from "@angular/core";
import { CryptoService } from 'jslib-common/abstractions/crypto.service'; import { CryptoService } from "jslib-common/abstractions/crypto.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { ModalRef } from './modal/modal.ref'; import { ModalRef } from "./modal/modal.ref";
@Directive() @Directive()
export class PasswordRepromptComponent { export class PasswordRepromptComponent {
showPassword = false;
masterPassword = "";
showPassword = false; constructor(
masterPassword = ''; private modalRef: ModalRef,
private cryptoService: CryptoService,
private platformUtilsService: PlatformUtilsService,
private i18nService: I18nService
) {}
constructor(private modalRef: ModalRef, private cryptoService: CryptoService, private platformUtilsService: PlatformUtilsService, togglePassword() {
private i18nService: I18nService) {} this.showPassword = !this.showPassword;
}
togglePassword() { async submit() {
this.showPassword = !this.showPassword; if (!(await this.cryptoService.compareAndUpdateKeyHash(this.masterPassword, null))) {
this.platformUtilsService.showToast(
"error",
this.i18nService.t("errorOccurred"),
this.i18nService.t("invalidMasterPassword")
);
return;
} }
async submit() { this.modalRef.close(true);
if (!await this.cryptoService.compareAndUpdateKeyHash(this.masterPassword, null)) { }
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'),
this.i18nService.t('invalidMasterPassword'));
return;
}
this.modalRef.close(true);
}
} }

595
angular/src/components/send/efflux-dates.component.ts
View File

@@ -1,341 +1,354 @@
import { DatePipe } from '@angular/common'; import { DatePipe } from "@angular/common";
import { import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core";
Directive, import { FormControl, FormGroup } from "@angular/forms";
EventEmitter,
Input,
OnInit,
Output
} from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
// Different BrowserPath = different controls. // Different BrowserPath = different controls.
enum BrowserPath { enum BrowserPath {
// Native datetime-locale. // Native datetime-locale.
// We are happy. // We are happy.
Default = 'default', Default = "default",
// Native date and time inputs, but no datetime-locale. // Native date and time inputs, but no datetime-locale.
// We use individual date and time inputs and create a datetime programatically on submit. // We use individual date and time inputs and create a datetime programatically on submit.
Firefox = 'firefox', Firefox = "firefox",
// No native date, time, or datetime-locale inputs. // No native date, time, or datetime-locale inputs.
// We use a polyfill for dates and a dropdown for times. // We use a polyfill for dates and a dropdown for times.
Safari = 'safari', Safari = "safari",
} }
enum DateField { enum DateField {
DeletionDate = 'deletion', DeletionDate = "deletion",
ExpriationDate = 'expiration', ExpriationDate = "expiration",
} }
// Value = hours // Value = hours
enum DatePreset { enum DatePreset {
OneHour = 1, OneHour = 1,
OneDay = 24, OneDay = 24,
TwoDays = 48, TwoDays = 48,
ThreeDays = 72, ThreeDays = 72,
SevenDays = 168, SevenDays = 168,
ThirtyDays = 720, ThirtyDays = 720,
Custom = 0, Custom = 0,
Never = null, Never = null,
} }
// TimeOption is used for the dropdown implementation of custom times // TimeOption is used for the dropdown implementation of custom times
// twelveHour = displayed time; twentyFourHour = time used in logic // twelveHour = displayed time; twentyFourHour = time used in logic
interface TimeOption { interface TimeOption {
twelveHour: string; twelveHour: string;
twentyFourHour: string; twentyFourHour: string;
} }
@Directive() @Directive()
export class EffluxDatesComponent implements OnInit { export class EffluxDatesComponent implements OnInit {
@Input() readonly initialDeletionDate: Date; @Input() readonly initialDeletionDate: Date;
@Input() readonly initialExpirationDate: Date; @Input() readonly initialExpirationDate: Date;
@Input() readonly editMode: boolean; @Input() readonly editMode: boolean;
@Input() readonly disabled: boolean; @Input() readonly disabled: boolean;
@Output() datesChanged = new EventEmitter<{deletionDate: string, expirationDate: string}>(); @Output() datesChanged = new EventEmitter<{ deletionDate: string; expirationDate: string }>();
get browserPath(): BrowserPath { get browserPath(): BrowserPath {
if (this.platformUtilsService.isFirefox()) { if (this.platformUtilsService.isFirefox()) {
return BrowserPath.Firefox; return BrowserPath.Firefox;
} else if (this.platformUtilsService.isSafari()) { } else if (this.platformUtilsService.isSafari()) {
return BrowserPath.Safari; return BrowserPath.Safari;
}
return BrowserPath.Default;
} }
return BrowserPath.Default;
}
datesForm = new FormGroup({ datesForm = new FormGroup({
selectedDeletionDatePreset: new FormControl(), selectedDeletionDatePreset: new FormControl(),
selectedExpirationDatePreset: new FormControl(), selectedExpirationDatePreset: new FormControl(),
defaultDeletionDateTime: new FormControl(), defaultDeletionDateTime: new FormControl(),
defaultExpirationDateTime: new FormControl(), defaultExpirationDateTime: new FormControl(),
fallbackDeletionDate: new FormControl(), fallbackDeletionDate: new FormControl(),
fallbackDeletionTime: new FormControl(), fallbackDeletionTime: new FormControl(),
fallbackExpirationDate: new FormControl(), fallbackExpirationDate: new FormControl(),
fallbackExpirationTime: new FormControl(), fallbackExpirationTime: new FormControl(),
}); });
deletionDatePresets: any[] = [ deletionDatePresets: any[] = [
{ name: this.i18nService.t('oneHour'), value: DatePreset.OneHour }, { name: this.i18nService.t("oneHour"), value: DatePreset.OneHour },
{ name: this.i18nService.t('oneDay'), value: DatePreset.OneDay }, { name: this.i18nService.t("oneDay"), value: DatePreset.OneDay },
{ name: this.i18nService.t('days', '2'), value: DatePreset.TwoDays }, { name: this.i18nService.t("days", "2"), value: DatePreset.TwoDays },
{ name: this.i18nService.t('days', '3'), value: DatePreset.ThreeDays }, { name: this.i18nService.t("days", "3"), value: DatePreset.ThreeDays },
{ name: this.i18nService.t('days', '7'), value: DatePreset.SevenDays }, { name: this.i18nService.t("days", "7"), value: DatePreset.SevenDays },
{ name: this.i18nService.t('days', '30'), value: DatePreset.ThirtyDays }, { name: this.i18nService.t("days", "30"), value: DatePreset.ThirtyDays },
{ name: this.i18nService.t('custom'), value: DatePreset.Custom }, { name: this.i18nService.t("custom"), value: DatePreset.Custom },
]; ];
expirationDatePresets: any[] = [ expirationDatePresets: any[] = [
{ name: this.i18nService.t('never'), value: DatePreset.Never }, { name: this.i18nService.t("never"), value: DatePreset.Never },
].concat([...this.deletionDatePresets]); ].concat([...this.deletionDatePresets]);
get selectedDeletionDatePreset(): FormControl { get selectedDeletionDatePreset(): FormControl {
return this.datesForm.get('selectedDeletionDatePreset') as FormControl; return this.datesForm.get("selectedDeletionDatePreset") as FormControl;
} }
get selectedExpirationDatePreset(): FormControl { get selectedExpirationDatePreset(): FormControl {
return this.datesForm.get('selectedExpirationDatePreset') as FormControl; return this.datesForm.get("selectedExpirationDatePreset") as FormControl;
} }
get defaultDeletionDateTime(): FormControl { get defaultDeletionDateTime(): FormControl {
return this.datesForm.get('defaultDeletionDateTime') as FormControl; return this.datesForm.get("defaultDeletionDateTime") as FormControl;
} }
get defaultExpirationDateTime(): FormControl { get defaultExpirationDateTime(): FormControl {
return this.datesForm.get('defaultExpirationDateTime') as FormControl; return this.datesForm.get("defaultExpirationDateTime") as FormControl;
} }
get fallbackDeletionDate(): FormControl { get fallbackDeletionDate(): FormControl {
return this.datesForm.get('fallbackDeletionDate') as FormControl; return this.datesForm.get("fallbackDeletionDate") as FormControl;
} }
get fallbackDeletionTime(): FormControl { get fallbackDeletionTime(): FormControl {
return this.datesForm.get('fallbackDeletionTime') as FormControl; return this.datesForm.get("fallbackDeletionTime") as FormControl;
} }
get fallbackExpirationDate(): FormControl { get fallbackExpirationDate(): FormControl {
return this.datesForm.get('fallbackExpirationDate') as FormControl; return this.datesForm.get("fallbackExpirationDate") as FormControl;
} }
get fallbackExpirationTime(): FormControl { get fallbackExpirationTime(): FormControl {
return this.datesForm.get('fallbackExpirationTime') as FormControl; return this.datesForm.get("fallbackExpirationTime") as FormControl;
} }
// Should be able to call these at any time and compute a submitable value // Should be able to call these at any time and compute a submitable value
get formattedDeletionDate(): string { get formattedDeletionDate(): string {
switch (this.selectedDeletionDatePreset.value as DatePreset) { switch (this.selectedDeletionDatePreset.value as DatePreset) {
case DatePreset.Never: case DatePreset.Never:
this.selectedDeletionDatePreset.setValue(DatePreset.SevenDays); this.selectedDeletionDatePreset.setValue(DatePreset.SevenDays);
return this.formattedDeletionDate; return this.formattedDeletionDate;
case DatePreset.Custom: case DatePreset.Custom:
switch (this.browserPath) {
case BrowserPath.Safari:
case BrowserPath.Firefox:
return this.fallbackDeletionDate.value + 'T' + this.fallbackDeletionTime.value;
default:
return this.defaultDeletionDateTime.value;
}
default:
const now = new Date();
const miliseconds = now.setTime(now.getTime() +
(this.selectedDeletionDatePreset.value as number * 60 * 60 * 1000)) ;
return new Date(miliseconds).toString();
}
}
get formattedExpirationDate(): string {
switch (this.selectedExpirationDatePreset.value as DatePreset) {
case DatePreset.Never:
return null;
case DatePreset.Custom:
switch (this.browserPath) {
case BrowserPath.Safari:
case BrowserPath.Firefox:
if ((!this.fallbackExpirationDate.value || !this.fallbackExpirationTime.value) &&
this.editMode) {
return null;
}
return this.fallbackExpirationDate.value + 'T' + this.fallbackExpirationTime.value;
default:
if (!this.defaultExpirationDateTime.value) {
return null;
}
return this.defaultExpirationDateTime.value;
}
default:
const now = new Date();
const miliseconds = now.setTime(now.getTime() +
(this.selectedExpirationDatePreset.value as number * 60 * 60 * 1000));
return new Date(miliseconds).toString();
}
}
//
get safariDeletionTimePresetOptions() {
return this.safariTimePresetOptions(DateField.DeletionDate);
}
get safariExpirationTimePresetOptions() {
return this.safariTimePresetOptions(DateField.ExpriationDate);
}
private get nextWeek(): Date {
const nextWeek = new Date();
nextWeek.setDate(nextWeek.getDate() + 7);
return nextWeek;
}
constructor(protected i18nService: I18nService, protected platformUtilsService: PlatformUtilsService,
protected datePipe: DatePipe) {
}
ngOnInit(): void {
this.setInitialFormValues();
this.emitDates();
this.datesForm.valueChanges.subscribe(() => {
this.emitDates();
});
}
onDeletionDatePresetSelect(value: DatePreset) {
this.selectedDeletionDatePreset.setValue(value);
}
clearExpiration() {
switch (this.browserPath) { switch (this.browserPath) {
case BrowserPath.Safari: case BrowserPath.Safari:
case BrowserPath.Firefox: case BrowserPath.Firefox:
this.fallbackExpirationDate.setValue(null); return this.fallbackDeletionDate.value + "T" + this.fallbackDeletionTime.value;
this.fallbackExpirationTime.setValue(null); default:
break; return this.defaultDeletionDateTime.value;
case BrowserPath.Default:
this.defaultExpirationDateTime.setValue(null);
break;
} }
default:
const now = new Date();
const miliseconds = now.setTime(
now.getTime() + (this.selectedDeletionDatePreset.value as number) * 60 * 60 * 1000
);
return new Date(miliseconds).toString();
} }
}
protected emitDates() { get formattedExpirationDate(): string {
this.datesChanged.emit({ switch (this.selectedExpirationDatePreset.value as DatePreset) {
deletionDate: this.formattedDeletionDate, case DatePreset.Never:
expirationDate: this.formattedExpirationDate, return null;
}); case DatePreset.Custom:
} switch (this.browserPath) {
case BrowserPath.Safari:
protected setInitialFormValues() { case BrowserPath.Firefox:
if (this.editMode) { if (
this.selectedDeletionDatePreset.setValue(DatePreset.Custom); (!this.fallbackExpirationDate.value || !this.fallbackExpirationTime.value) &&
this.selectedExpirationDatePreset.setValue(DatePreset.Custom); this.editMode
switch (this.browserPath) { ) {
case BrowserPath.Safari: return null;
case BrowserPath.Firefox:
this.fallbackDeletionDate.setValue(this.initialDeletionDate.toISOString().slice(0, 10));
this.fallbackDeletionTime.setValue(this.initialDeletionDate.toTimeString().slice(0, 5));
if (this.initialExpirationDate != null) {
this.fallbackExpirationDate.setValue(this.initialExpirationDate.toISOString().slice(0, 10));
this.fallbackExpirationTime.setValue(this.initialExpirationDate.toTimeString().slice(0, 5));
}
break;
case BrowserPath.Default:
if (this.initialExpirationDate) {
this.defaultExpirationDateTime.setValue(
this.datePipe.transform(new Date(this.initialExpirationDate), 'yyyy-MM-ddTHH:mm'));
}
this.defaultDeletionDateTime.setValue(this.datePipe.transform(new Date(this.initialDeletionDate), 'yyyy-MM-ddTHH:mm'));
break;
} }
return this.fallbackExpirationDate.value + "T" + this.fallbackExpirationTime.value;
default:
if (!this.defaultExpirationDateTime.value) {
return null;
}
return this.defaultExpirationDateTime.value;
}
default:
const now = new Date();
const miliseconds = now.setTime(
now.getTime() + (this.selectedExpirationDatePreset.value as number) * 60 * 60 * 1000
);
return new Date(miliseconds).toString();
}
}
//
get safariDeletionTimePresetOptions() {
return this.safariTimePresetOptions(DateField.DeletionDate);
}
get safariExpirationTimePresetOptions() {
return this.safariTimePresetOptions(DateField.ExpriationDate);
}
private get nextWeek(): Date {
const nextWeek = new Date();
nextWeek.setDate(nextWeek.getDate() + 7);
return nextWeek;
}
constructor(
protected i18nService: I18nService,
protected platformUtilsService: PlatformUtilsService,
protected datePipe: DatePipe
) {}
ngOnInit(): void {
this.setInitialFormValues();
this.emitDates();
this.datesForm.valueChanges.subscribe(() => {
this.emitDates();
});
}
onDeletionDatePresetSelect(value: DatePreset) {
this.selectedDeletionDatePreset.setValue(value);
}
clearExpiration() {
switch (this.browserPath) {
case BrowserPath.Safari:
case BrowserPath.Firefox:
this.fallbackExpirationDate.setValue(null);
this.fallbackExpirationTime.setValue(null);
break;
case BrowserPath.Default:
this.defaultExpirationDateTime.setValue(null);
break;
}
}
protected emitDates() {
this.datesChanged.emit({
deletionDate: this.formattedDeletionDate,
expirationDate: this.formattedExpirationDate,
});
}
protected setInitialFormValues() {
if (this.editMode) {
this.selectedDeletionDatePreset.setValue(DatePreset.Custom);
this.selectedExpirationDatePreset.setValue(DatePreset.Custom);
switch (this.browserPath) {
case BrowserPath.Safari:
case BrowserPath.Firefox:
this.fallbackDeletionDate.setValue(this.initialDeletionDate.toISOString().slice(0, 10));
this.fallbackDeletionTime.setValue(this.initialDeletionDate.toTimeString().slice(0, 5));
if (this.initialExpirationDate != null) {
this.fallbackExpirationDate.setValue(
this.initialExpirationDate.toISOString().slice(0, 10)
);
this.fallbackExpirationTime.setValue(
this.initialExpirationDate.toTimeString().slice(0, 5)
);
}
break;
case BrowserPath.Default:
if (this.initialExpirationDate) {
this.defaultExpirationDateTime.setValue(
this.datePipe.transform(new Date(this.initialExpirationDate), "yyyy-MM-ddTHH:mm")
);
}
this.defaultDeletionDateTime.setValue(
this.datePipe.transform(new Date(this.initialDeletionDate), "yyyy-MM-ddTHH:mm")
);
break;
}
} else {
this.selectedDeletionDatePreset.setValue(DatePreset.SevenDays);
this.selectedExpirationDatePreset.setValue(DatePreset.Never);
switch (this.browserPath) {
case BrowserPath.Safari:
this.fallbackDeletionDate.setValue(this.nextWeek.toISOString().slice(0, 10));
this.fallbackDeletionTime.setValue(
this.safariTimePresetOptions(DateField.DeletionDate)[1].twentyFourHour
);
break;
default:
break;
}
}
}
protected safariTimePresetOptions(field: DateField): TimeOption[] {
// init individual arrays for major sort groups
const noon: TimeOption[] = [];
const midnight: TimeOption[] = [];
const ams: TimeOption[] = [];
const pms: TimeOption[] = [];
// determine minute skip (5 min, 10 min, 15 min, etc.)
const minuteIncrementer = 15;
// loop through each hour on a 12 hour system
for (let h = 1; h <= 12; h++) {
// loop through each minute in the hour using the skip to incriment
for (let m = 0; m < 60; m += minuteIncrementer) {
// init the final strings that will be added to the lists
let hour = h.toString();
let minutes = m.toString();
// add prepending 0s to single digit hours/minutes
if (h < 10) {
hour = "0" + hour;
}
if (m < 10) {
minutes = "0" + minutes;
}
// build time strings and push to relevant sort groups
if (h === 12) {
const midnightOption: TimeOption = {
twelveHour: `${hour}:${minutes} AM`,
twentyFourHour: `00:${minutes}`,
};
midnight.push(midnightOption);
const noonOption: TimeOption = {
twelveHour: `${hour}:${minutes} PM`,
twentyFourHour: `${hour}:${minutes}`,
};
noon.push(noonOption);
} else { } else {
this.selectedDeletionDatePreset.setValue(DatePreset.SevenDays); const amOption: TimeOption = {
this.selectedExpirationDatePreset.setValue(DatePreset.Never); twelveHour: `${hour}:${minutes} AM`,
twentyFourHour: `${hour}:${minutes}`,
};
ams.push(amOption);
switch (this.browserPath) { const pmOption: TimeOption = {
case BrowserPath.Safari: twelveHour: `${hour}:${minutes} PM`,
this.fallbackDeletionDate.setValue(this.nextWeek.toISOString().slice(0, 10)); twentyFourHour: `${h + 12}:${minutes}`,
this.fallbackDeletionTime.setValue(this.safariTimePresetOptions(DateField.DeletionDate)[1].twentyFourHour); };
break; pms.push(pmOption);
default:
break;
}
} }
}
} }
protected safariTimePresetOptions(field: DateField): TimeOption[] { // bring all the arrays together in the right order
// init individual arrays for major sort groups const validTimes = [...midnight, ...ams, ...noon, ...pms];
const noon: TimeOption[] = [];
const midnight: TimeOption[] = [];
const ams: TimeOption[] = [];
const pms: TimeOption[] = [];
// determine minute skip (5 min, 10 min, 15 min, etc.) // determine if an unsupported value already exists on the send & add that to the top of the option list
const minuteIncrementer = 15; // example: if the Send was created with a different client
if (field === DateField.ExpriationDate && this.initialExpirationDate != null && this.editMode) {
// loop through each hour on a 12 hour system const previousValue: TimeOption = {
for (let h = 1; h <= 12; h++) { twelveHour: this.datePipe.transform(this.initialExpirationDate, "hh:mm a"),
// loop through each minute in the hour using the skip to incriment twentyFourHour: this.datePipe.transform(this.initialExpirationDate, "HH:mm"),
for (let m = 0; m < 60; m += minuteIncrementer) { };
// init the final strings that will be added to the lists return [previousValue, { twelveHour: null, twentyFourHour: null }, ...validTimes];
let hour = h.toString(); } else if (
let minutes = m.toString(); field === DateField.DeletionDate &&
this.initialDeletionDate != null &&
// add prepending 0s to single digit hours/minutes this.editMode
if (h < 10) { ) {
hour = '0' + hour; const previousValue: TimeOption = {
} twelveHour: this.datePipe.transform(this.initialDeletionDate, "hh:mm a"),
if (m < 10) { twentyFourHour: this.datePipe.transform(this.initialDeletionDate, "HH:mm"),
minutes = '0' + minutes; };
} return [previousValue, ...validTimes];
} else {
// build time strings and push to relevant sort groups return [{ twelveHour: null, twentyFourHour: null }, ...validTimes];
if (h === 12) {
const midnightOption: TimeOption = {
twelveHour: `${hour}:${minutes} AM`,
twentyFourHour: `00:${minutes}`,
};
midnight.push(midnightOption);
const noonOption: TimeOption = {
twelveHour: `${hour}:${minutes} PM`,
twentyFourHour: `${hour}:${minutes}`,
};
noon.push(noonOption);
} else {
const amOption: TimeOption = {
twelveHour: `${hour}:${minutes} AM`,
twentyFourHour: `${hour}:${minutes}`,
};
ams.push(amOption);
const pmOption: TimeOption = {
twelveHour: `${hour}:${minutes} PM`,
twentyFourHour: `${h + 12}:${minutes}`,
};
pms.push(pmOption);
}
}
}
// bring all the arrays together in the right order
const validTimes = [...midnight, ...ams, ...noon, ...pms];
// determine if an unsupported value already exists on the send & add that to the top of the option list
// example: if the Send was created with a different client
if (field === DateField.ExpriationDate && this.initialExpirationDate != null && this.editMode) {
const previousValue: TimeOption = {
twelveHour: this.datePipe.transform(this.initialExpirationDate, 'hh:mm a'),
twentyFourHour: this.datePipe.transform(this.initialExpirationDate, 'HH:mm'),
};
return [previousValue, { twelveHour: null, twentyFourHour: null }, ...validTimes];
} else if (field === DateField.DeletionDate && this.initialDeletionDate != null && this.editMode) {
const previousValue: TimeOption = {
twelveHour: this.datePipe.transform(this.initialDeletionDate, 'hh:mm a'),
twentyFourHour: this.datePipe.transform(this.initialDeletionDate, 'HH:mm'),
};
return [previousValue, ...validTimes];
} else {
return [{ twelveHour: null, twentyFourHour: null }, ...validTimes];
}
} }
}
} }

228
angular/src/components/settings/vault-timeout-input.component.ts
View File

@@ -1,138 +1,140 @@
import { Directive, Input, OnInit } from "@angular/core";
import { import {
Directive, AbstractControl,
Input, ControlValueAccessor,
OnInit, FormBuilder,
} from '@angular/core'; ValidationErrors,
import { Validator,
AbstractControl, } from "@angular/forms";
ControlValueAccessor,
FormBuilder,
ValidationErrors,
Validator
} from '@angular/forms';
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PolicyService } from 'jslib-common/abstractions/policy.service'; import { PolicyService } from "jslib-common/abstractions/policy.service";
import { PolicyType } from 'jslib-common/enums/policyType'; import { PolicyType } from "jslib-common/enums/policyType";
import { Policy } from 'jslib-common/models/domain/policy'; import { Policy } from "jslib-common/models/domain/policy";
@Directive() @Directive()
export class VaultTimeoutInputComponent implements ControlValueAccessor, Validator, OnInit { export class VaultTimeoutInputComponent implements ControlValueAccessor, Validator, OnInit {
get showCustom() {
return this.form.get("vaultTimeout").value === VaultTimeoutInputComponent.CUSTOM_VALUE;
}
get showCustom() { static CUSTOM_VALUE = -100;
return this.form.get('vaultTimeout').value === VaultTimeoutInputComponent.CUSTOM_VALUE;
form = this.fb.group({
vaultTimeout: [null],
custom: this.fb.group({
hours: [null],
minutes: [null],
}),
});
@Input() vaultTimeouts: { name: string; value: number }[];
vaultTimeoutPolicy: Policy;
vaultTimeoutPolicyHours: number;
vaultTimeoutPolicyMinutes: number;
private onChange: (vaultTimeout: number) => void;
private validatorChange: () => void;
constructor(
private fb: FormBuilder,
private policyService: PolicyService,
private i18nService: I18nService
) {}
async ngOnInit() {
if (await this.policyService.policyAppliesToUser(PolicyType.MaximumVaultTimeout)) {
const vaultTimeoutPolicy = await this.policyService.getAll(PolicyType.MaximumVaultTimeout);
this.vaultTimeoutPolicy = vaultTimeoutPolicy[0];
this.vaultTimeoutPolicyHours = Math.floor(this.vaultTimeoutPolicy.data.minutes / 60);
this.vaultTimeoutPolicyMinutes = this.vaultTimeoutPolicy.data.minutes % 60;
this.vaultTimeouts = this.vaultTimeouts.filter(
(t) =>
t.value <= this.vaultTimeoutPolicy.data.minutes &&
(t.value > 0 || t.value === VaultTimeoutInputComponent.CUSTOM_VALUE) &&
t.value != null
);
this.validatorChange();
} }
static CUSTOM_VALUE = -100; this.form.valueChanges.subscribe(async (value) => {
this.onChange(this.getVaultTimeout(value));
form = this.fb.group({
vaultTimeout: [null],
custom: this.fb.group({
hours: [null],
minutes: [null],
}),
}); });
@Input() vaultTimeouts: { name: string; value: number; }[]; // Assign the previous value to the custom fields
vaultTimeoutPolicy: Policy; this.form.get("vaultTimeout").valueChanges.subscribe((value) => {
vaultTimeoutPolicyHours: number; if (value !== VaultTimeoutInputComponent.CUSTOM_VALUE) {
vaultTimeoutPolicyMinutes: number; return;
}
private onChange: (vaultTimeout: number) => void; const current = Math.max(this.form.value.vaultTimeout, 0);
private validatorChange: () => void; this.form.patchValue({
custom: {
hours: Math.floor(current / 60),
minutes: current % 60,
},
});
});
}
constructor(private fb: FormBuilder, private policyService: PolicyService, private i18nService: I18nService) { ngOnChanges() {
this.vaultTimeouts.push({
name: this.i18nService.t("custom"),
value: VaultTimeoutInputComponent.CUSTOM_VALUE,
});
}
getVaultTimeout(value: any) {
if (value.vaultTimeout !== VaultTimeoutInputComponent.CUSTOM_VALUE) {
return value.vaultTimeout;
} }
async ngOnInit() { return value.custom.hours * 60 + value.custom.minutes;
if (await this.policyService.policyAppliesToUser(PolicyType.MaximumVaultTimeout)) { }
const vaultTimeoutPolicy = await this.policyService.getAll(PolicyType.MaximumVaultTimeout);
this.vaultTimeoutPolicy = vaultTimeoutPolicy[0]; writeValue(value: number): void {
this.vaultTimeoutPolicyHours = Math.floor(this.vaultTimeoutPolicy.data.minutes / 60); if (value == null) {
this.vaultTimeoutPolicyMinutes = this.vaultTimeoutPolicy.data.minutes % 60; return;
this.vaultTimeouts = this.vaultTimeouts.filter(t =>
t.value <= this.vaultTimeoutPolicy.data.minutes &&
(t.value > 0 || t.value === VaultTimeoutInputComponent.CUSTOM_VALUE) &&
t.value != null
);
this.validatorChange();
}
this.form.valueChanges.subscribe(async value => {
this.onChange(this.getVaultTimeout(value));
});
// Assign the previous value to the custom fields
this.form.get('vaultTimeout').valueChanges.subscribe(value => {
if (value !== VaultTimeoutInputComponent.CUSTOM_VALUE) {
return;
}
const current = Math.max(this.form.value.vaultTimeout, 0);
this.form.patchValue({
custom: {
hours: Math.floor(current / 60),
minutes: current % 60,
},
});
});
} }
ngOnChanges() { if (this.vaultTimeouts.every((p) => p.value !== value)) {
this.vaultTimeouts.push({ name: this.i18nService.t('custom'), value: VaultTimeoutInputComponent.CUSTOM_VALUE }); this.form.setValue({
vaultTimeout: VaultTimeoutInputComponent.CUSTOM_VALUE,
custom: {
hours: Math.floor(value / 60),
minutes: value % 60,
},
});
return;
} }
getVaultTimeout(value: any) { this.form.patchValue({
if (value.vaultTimeout !== VaultTimeoutInputComponent.CUSTOM_VALUE) { vaultTimeout: value,
return value.vaultTimeout; });
} }
return value.custom.hours * 60 + value.custom.minutes; registerOnChange(onChange: any): void {
this.onChange = onChange;
}
// tslint:disable-next-line
registerOnTouched(onTouched: any): void {}
// tslint:disable-next-line
setDisabledState?(isDisabled: boolean): void {}
validate(control: AbstractControl): ValidationErrors {
if (this.vaultTimeoutPolicy && this.vaultTimeoutPolicy?.data?.minutes < control.value) {
return { policyError: true };
} }
writeValue(value: number): void { return null;
if (value == null) { }
return;
}
if (this.vaultTimeouts.every(p => p.value !== value)) { registerOnValidatorChange(fn: () => void): void {
this.form.setValue({ this.validatorChange = fn;
vaultTimeout: VaultTimeoutInputComponent.CUSTOM_VALUE, }
custom: {
hours: Math.floor(value / 60),
minutes: value % 60,
},
});
return;
}
this.form.patchValue({
vaultTimeout: value,
});
}
registerOnChange(onChange: any): void {
this.onChange = onChange;
}
// tslint:disable-next-line
registerOnTouched(onTouched: any): void {}
// tslint:disable-next-line
setDisabledState?(isDisabled: boolean): void { }
validate(control: AbstractControl): ValidationErrors {
if (this.vaultTimeoutPolicy && this.vaultTimeoutPolicy?.data?.minutes < control.value) {
return { policyError: true };
}
return null;
}
registerOnValidatorChange(fn: () => void): void {
this.validatorChange = fn;
}
} }

53
angular/src/components/two-factor-options.component.ts
View File

@@ -1,38 +1,37 @@
import { import { Directive, EventEmitter, OnInit, Output } from "@angular/core";
Directive, import { Router } from "@angular/router";
EventEmitter,
OnInit,
Output,
} from '@angular/core';
import { Router } from '@angular/router';
import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType'; import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
import { AuthService } from 'jslib-common/abstractions/auth.service'; import { AuthService } from "jslib-common/abstractions/auth.service";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
@Directive() @Directive()
export class TwoFactorOptionsComponent implements OnInit { export class TwoFactorOptionsComponent implements OnInit {
@Output() onProviderSelected = new EventEmitter<TwoFactorProviderType>(); @Output() onProviderSelected = new EventEmitter<TwoFactorProviderType>();
@Output() onRecoverSelected = new EventEmitter(); @Output() onRecoverSelected = new EventEmitter();
providers: any[] = []; providers: any[] = [];
constructor(protected authService: AuthService, protected router: Router, constructor(
protected i18nService: I18nService, protected platformUtilsService: PlatformUtilsService, protected authService: AuthService,
protected win: Window) { } protected router: Router,
protected i18nService: I18nService,
protected platformUtilsService: PlatformUtilsService,
protected win: Window
) {}
ngOnInit() { ngOnInit() {
this.providers = this.authService.getSupportedTwoFactorProviders(this.win); this.providers = this.authService.getSupportedTwoFactorProviders(this.win);
} }
choose(p: any) { choose(p: any) {
this.onProviderSelected.emit(p.type); this.onProviderSelected.emit(p.type);
} }
recover() { recover() {
this.platformUtilsService.launchUri('https://help.bitwarden.com/article/lost-two-step-device/'); this.platformUtilsService.launchUri("https://help.bitwarden.com/article/lost-two-step-device/");
this.onRecoverSelected.emit(); this.onRecoverSelected.emit();
} }
} }

61
angular/src/components/verify-master-password.component.html
View File

@@ -1,25 +1,46 @@
<ng-container *ngIf="!usesKeyConnector"> <ng-container *ngIf="!usesKeyConnector">
<label for="masterPassword">{{'masterPass' | i18n}}</label> <label for="masterPassword">{{ "masterPass" | i18n }}</label>
<input id="masterPassword" type="password" name="MasterPasswordHash" class="form-control" <input
[formControl]="secret" required appAutofocus appInputVerbatim> id="masterPassword"
<small class="form-text text-muted">{{'confirmIdentity' | i18n}}</small> type="password"
name="MasterPasswordHash"
class="form-control"
[formControl]="secret"
required
appAutofocus
appInputVerbatim
/>
<small class="form-text text-muted">{{ "confirmIdentity" | i18n }}</small>
</ng-container> </ng-container>
<ng-container *ngIf="usesKeyConnector"> <ng-container *ngIf="usesKeyConnector">
<div class="form-group"> <div class="form-group">
<label class="d-block">{{'sendVerificationCode' | i18n}}</label> <label class="d-block">{{ "sendVerificationCode" | i18n }}</label>
<button type="button" class="btn btn-outline-secondary" (click)="requestOTP()" [disabled]="disableRequestOTP"> <button
{{'sendCode' | i18n}} type="button"
</button> class="btn btn-outline-secondary"
<span class="ml-2 text-success" role="alert" @sent *ngIf="sentCode"> (click)="requestOTP()"
<i class="fa fa-check-circle-o" aria-hidden="true"></i> [disabled]="disableRequestOTP"
{{'codeSent' | i18n}} >
</span> {{ "sendCode" | i18n }}
</div> </button>
<span class="ml-2 text-success" role="alert" @sent *ngIf="sentCode">
<i class="fa fa-check-circle-o" aria-hidden="true"></i>
{{ "codeSent" | i18n }}
</span>
</div>
<div class="form-group"> <div class="form-group">
<label for="verificationCode">{{'verificationCode' | i18n}}</label> <label for="verificationCode">{{ "verificationCode" | i18n }}</label>
<input id="verificationCode" type="input" name="verificationCode" class="form-control" <input
[formControl]="secret" required appAutofocus appInputVerbatim> id="verificationCode"
<small class="form-text text-muted">{{'confirmIdentity' | i18n}}</small> type="input"
</div> name="verificationCode"
class="form-control"
[formControl]="secret"
required
appAutofocus
appInputVerbatim
/>
<small class="form-text text-muted">{{ "confirmIdentity" | i18n }}</small>
</div>
</ng-container> </ng-container>

167
angular/src/components/verify-master-password.component.ts
View File

@@ -1,105 +1,92 @@
import { import { animate, style, transition, trigger } from "@angular/animations";
animate, import { Component, OnInit } from "@angular/core";
style, import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from "@angular/forms";
transition,
trigger,
} from '@angular/animations';
import {
Component,
OnInit,
} from '@angular/core';
import {
ControlValueAccessor,
FormControl,
NG_VALUE_ACCESSOR,
} from '@angular/forms';
import { KeyConnectorService } from 'jslib-common/abstractions/keyConnector.service'; import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
import { UserVerificationService } from 'jslib-common/abstractions/userVerification.service'; import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
import { VerificationType } from 'jslib-common/enums/verificationType'; import { VerificationType } from "jslib-common/enums/verificationType";
import { Verification } from 'jslib-common/types/verification'; import { Verification } from "jslib-common/types/verification";
@Component({ @Component({
selector: 'app-verify-master-password', selector: "app-verify-master-password",
templateUrl: 'verify-master-password.component.html', templateUrl: "verify-master-password.component.html",
providers: [ providers: [
{ {
provide: NG_VALUE_ACCESSOR, provide: NG_VALUE_ACCESSOR,
multi: true, multi: true,
useExisting: VerifyMasterPasswordComponent, useExisting: VerifyMasterPasswordComponent,
}, },
], ],
animations: [ animations: [
trigger('sent', [ trigger("sent", [
transition(':enter', [ transition(":enter", [style({ opacity: 0 }), animate("100ms", style({ opacity: 1 }))]),
style({ opacity: 0 }), ]),
animate('100ms', style({ opacity: 1 })), ],
]),
]),
],
}) })
export class VerifyMasterPasswordComponent implements ControlValueAccessor, OnInit { export class VerifyMasterPasswordComponent implements ControlValueAccessor, OnInit {
usesKeyConnector: boolean = false; usesKeyConnector: boolean = false;
disableRequestOTP: boolean = false; disableRequestOTP: boolean = false;
sentCode: boolean = false; sentCode: boolean = false;
secret = new FormControl(''); secret = new FormControl("");
private onChange: (value: Verification) => void; private onChange: (value: Verification) => void;
constructor(private keyConnectorService: KeyConnectorService, constructor(
private userVerificationService: UserVerificationService) { } private keyConnectorService: KeyConnectorService,
private userVerificationService: UserVerificationService
) {}
async ngOnInit() { async ngOnInit() {
this.usesKeyConnector = await this.keyConnectorService.getUsesKeyConnector(); this.usesKeyConnector = await this.keyConnectorService.getUsesKeyConnector();
this.processChanges(this.secret.value); this.processChanges(this.secret.value);
this.secret.valueChanges.subscribe(secret => this.processChanges(secret)); this.secret.valueChanges.subscribe((secret) => this.processChanges(secret));
}
async requestOTP() {
if (this.usesKeyConnector) {
this.disableRequestOTP = true;
try {
await this.userVerificationService.requestOTP();
this.sentCode = true;
} finally {
this.disableRequestOTP = false;
}
}
}
writeValue(obj: any): void {
this.secret.setValue(obj);
}
registerOnChange(fn: any): void {
this.onChange = fn;
}
registerOnTouched(fn: any): void {
// Not implemented
}
setDisabledState?(isDisabled: boolean): void {
this.disableRequestOTP = isDisabled;
if (isDisabled) {
this.secret.disable();
} else {
this.secret.enable();
}
}
private processChanges(secret: string) {
if (this.onChange == null) {
return;
} }
async requestOTP() { this.onChange({
if (this.usesKeyConnector) { type: this.usesKeyConnector ? VerificationType.OTP : VerificationType.MasterPassword,
this.disableRequestOTP = true; secret: secret,
try { });
await this.userVerificationService.requestOTP(); }
this.sentCode = true;
} finally {
this.disableRequestOTP = false;
}
}
}
writeValue(obj: any): void {
this.secret.setValue(obj);
}
registerOnChange(fn: any): void {
this.onChange = fn;
}
registerOnTouched(fn: any): void {
// Not implemented
}
setDisabledState?(isDisabled: boolean): void {
this.disableRequestOTP = isDisabled;
if (isDisabled) {
this.secret.disable();
} else {
this.secret.enable();
}
}
private processChanges(secret: string) {
if (this.onChange == null) {
return;
}
this.onChange({
type: this.usesKeyConnector ? VerificationType.OTP : VerificationType.MasterPassword,
secret: secret,
});
}
} }

45
angular/src/components/view-custom-fields.component.ts
View File

@@ -1,35 +1,32 @@
import { import { Directive, Input } from "@angular/core";
Directive,
Input,
} from '@angular/core';
import { EventType } from 'jslib-common/enums/eventType'; import { EventType } from "jslib-common/enums/eventType";
import { FieldType } from 'jslib-common/enums/fieldType'; import { FieldType } from "jslib-common/enums/fieldType";
import { EventService } from 'jslib-common/abstractions/event.service'; import { EventService } from "jslib-common/abstractions/event.service";
import { CipherView } from 'jslib-common/models/view/cipherView'; import { CipherView } from "jslib-common/models/view/cipherView";
import { FieldView } from 'jslib-common/models/view/fieldView'; import { FieldView } from "jslib-common/models/view/fieldView";
@Directive() @Directive()
export class ViewCustomFieldsComponent { export class ViewCustomFieldsComponent {
@Input() cipher: CipherView; @Input() cipher: CipherView;
@Input() promptPassword: () => Promise<boolean>; @Input() promptPassword: () => Promise<boolean>;
@Input() copy: (value: string, typeI18nKey: string, aType: string) => void; @Input() copy: (value: string, typeI18nKey: string, aType: string) => void;
fieldType = FieldType; fieldType = FieldType;
constructor(private eventService: EventService) { } constructor(private eventService: EventService) {}
async toggleFieldValue(field: FieldView) { async toggleFieldValue(field: FieldView) {
if (!await this.promptPassword()) { if (!(await this.promptPassword())) {
return; return;
}
const f = (field as any);
f.showValue = !f.showValue;
if (f.showValue) {
this.eventService.collect(EventType.Cipher_ClientToggledHiddenFieldVisible, this.cipher.id);
}
} }
const f = field as any;
f.showValue = !f.showValue;
if (f.showValue) {
this.eventService.collect(EventType.Cipher_ClientToggledHiddenFieldVisible, this.cipher.id);
}
}
} }

37
angular/src/directives/a11y-title.directive.ts
View File

@@ -1,28 +1,23 @@
import { import { Directive, ElementRef, Input, Renderer2 } from "@angular/core";
Directive,
ElementRef,
Input,
Renderer2,
} from '@angular/core';
@Directive({ @Directive({
selector: '[appA11yTitle]', selector: "[appA11yTitle]",
}) })
export class A11yTitleDirective { export class A11yTitleDirective {
@Input() set appA11yTitle(title: string) { @Input() set appA11yTitle(title: string) {
this.title = title; this.title = title;
}
private title: string;
constructor(private el: ElementRef, private renderer: Renderer2) {}
ngOnInit() {
if (!this.el.nativeElement.hasAttribute("title")) {
this.renderer.setAttribute(this.el.nativeElement, "title", this.title);
} }
if (!this.el.nativeElement.hasAttribute("aria-label")) {
private title: string; this.renderer.setAttribute(this.el.nativeElement, "aria-label", this.title);
constructor(private el: ElementRef, private renderer: Renderer2) { }
ngOnInit() {
if (!this.el.nativeElement.hasAttribute('title')) {
this.renderer.setAttribute(this.el.nativeElement, 'title', this.title);
}
if (!this.el.nativeElement.hasAttribute('aria-label')) {
this.renderer.setAttribute(this.el.nativeElement, 'aria-label', this.title);
}
} }
}
} }

68
angular/src/directives/api-action.directive.ts
View File

@@ -1,42 +1,46 @@
import { import { Directive, ElementRef, Input, OnChanges } from "@angular/core";
Directive, import { LogService } from "jslib-common/abstractions/log.service";
ElementRef,
Input,
OnChanges,
} from '@angular/core';
import { LogService } from 'jslib-common/abstractions/log.service';
import { ErrorResponse } from 'jslib-common/models/response/errorResponse'; import { ErrorResponse } from "jslib-common/models/response/errorResponse";
import { ValidationService } from '../services/validation.service'; import { ValidationService } from "../services/validation.service";
@Directive({ @Directive({
selector: '[appApiAction]', selector: "[appApiAction]",
}) })
export class ApiActionDirective implements OnChanges { export class ApiActionDirective implements OnChanges {
@Input() appApiAction: Promise<any>; @Input() appApiAction: Promise<any>;
constructor(private el: ElementRef, private validationService: ValidationService, constructor(
private logService: LogService) { } private el: ElementRef,
private validationService: ValidationService,
private logService: LogService
) {}
ngOnChanges(changes: any) { ngOnChanges(changes: any) {
if (this.appApiAction == null || this.appApiAction.then == null) { if (this.appApiAction == null || this.appApiAction.then == null) {
return; return;
}
this.el.nativeElement.loading = true;
this.appApiAction.then((response: any) => {
this.el.nativeElement.loading = false;
}, (e: any) => {
this.el.nativeElement.loading = false;
if ((e instanceof ErrorResponse || e.constructor.name === 'ErrorResponse') && (e as ErrorResponse).captchaRequired) {
this.logService.error('Captcha required error response: ' + e.getSingleMessage());
return;
}
this.logService?.error(`Received API exception: ${e}`);
this.validationService.showError(e);
});
} }
this.el.nativeElement.loading = true;
this.appApiAction.then(
(response: any) => {
this.el.nativeElement.loading = false;
},
(e: any) => {
this.el.nativeElement.loading = false;
if (
(e instanceof ErrorResponse || e.constructor.name === "ErrorResponse") &&
(e as ErrorResponse).captchaRequired
) {
this.logService.error("Captcha required error response: " + e.getSingleMessage());
return;
}
this.logService?.error(`Received API exception: ${e}`);
this.validationService.showError(e);
}
);
}
} }

45
angular/src/directives/autofocus.directive.ts
View File

@@ -1,33 +1,28 @@
import { import { Directive, ElementRef, Input, NgZone } from "@angular/core";
Directive,
ElementRef,
Input,
NgZone,
} from '@angular/core';
import { take } from 'rxjs/operators'; import { take } from "rxjs/operators";
import { Utils } from 'jslib-common/misc/utils'; import { Utils } from "jslib-common/misc/utils";
@Directive({ @Directive({
selector: '[appAutofocus]', selector: "[appAutofocus]",
}) })
export class AutofocusDirective { export class AutofocusDirective {
@Input() set appAutofocus(condition: boolean | string) { @Input() set appAutofocus(condition: boolean | string) {
this.autofocus = condition === '' || condition === true; this.autofocus = condition === "" || condition === true;
} }
private autofocus: boolean; private autofocus: boolean;
constructor(private el: ElementRef, private ngZone: NgZone) { } constructor(private el: ElementRef, private ngZone: NgZone) {}
ngOnInit() { ngOnInit() {
if (!Utils.isMobileBrowser && this.autofocus) { if (!Utils.isMobileBrowser && this.autofocus) {
if (this.ngZone.isStable) { if (this.ngZone.isStable) {
this.el.nativeElement.focus(); this.el.nativeElement.focus();
} else { } else {
this.ngZone.onStable.pipe(take(1)).subscribe(() => this.el.nativeElement.focus()); this.ngZone.onStable.pipe(take(1)).subscribe(() => this.el.nativeElement.focus());
} }
}
} }
}
} }

17
angular/src/directives/blur-click.directive.ts
View File

@@ -1,17 +1,12 @@
import { import { Directive, ElementRef, HostListener } from "@angular/core";
Directive,
ElementRef,
HostListener,
} from '@angular/core';
@Directive({ @Directive({
selector: '[appBlurClick]', selector: "[appBlurClick]",
}) })
export class BlurClickDirective { export class BlurClickDirective {
constructor(private el: ElementRef) { constructor(private el: ElementRef) {}
}
@HostListener('click') onClick() { @HostListener("click") onClick() {
this.el.nativeElement.blur(); this.el.nativeElement.blur();
} }
} }

90
angular/src/directives/box-row.directive.ts
View File

@@ -1,51 +1,59 @@
import { import { Directive, ElementRef, HostListener, OnInit } from "@angular/core";
Directive,
ElementRef,
HostListener,
OnInit,
} from '@angular/core';
@Directive({ @Directive({
selector: '[appBoxRow]', selector: "[appBoxRow]",
}) })
export class BoxRowDirective implements OnInit { export class BoxRowDirective implements OnInit {
el: HTMLElement = null; el: HTMLElement = null;
formEls: Element[]; formEls: Element[];
constructor(private elRef: ElementRef) { constructor(private elRef: ElementRef) {
this.el = elRef.nativeElement; this.el = elRef.nativeElement;
}
ngOnInit(): void {
this.formEls = Array.from(
this.el.querySelectorAll('input:not([type="hidden"]), select, textarea')
);
this.formEls.forEach((formEl) => {
formEl.addEventListener(
"focus",
(event: Event) => {
this.el.classList.add("active");
},
false
);
formEl.addEventListener(
"blur",
(event: Event) => {
this.el.classList.remove("active");
},
false
);
});
}
@HostListener("click", ["$event"]) onClick(event: Event) {
const target = event.target as HTMLElement;
if (
target !== this.el &&
!target.classList.contains("progress") &&
!target.classList.contains("progress-bar")
) {
return;
} }
ngOnInit(): void { if (this.formEls.length > 0) {
this.formEls = Array.from(this.el.querySelectorAll('input:not([type="hidden"]), select, textarea')); const formEl = this.formEls[0] as HTMLElement;
this.formEls.forEach(formEl => { if (formEl.tagName.toLowerCase() === "input") {
formEl.addEventListener('focus', (event: Event) => { const inputEl = formEl as HTMLInputElement;
this.el.classList.add('active'); if (inputEl.type != null && inputEl.type.toLowerCase() === "checkbox") {
}, false); inputEl.click();
return;
formEl.addEventListener('blur', (event: Event) => {
this.el.classList.remove('active');
}, false);
});
}
@HostListener('click', ['$event']) onClick(event: Event) {
const target = event.target as HTMLElement;
if (target !== this.el && !target.classList.contains('progress') &&
!target.classList.contains('progress-bar')) {
return;
}
if (this.formEls.length > 0) {
const formEl = (this.formEls[0] as HTMLElement);
if (formEl.tagName.toLowerCase() === 'input') {
const inputEl = (formEl as HTMLInputElement);
if (inputEl.type != null && inputEl.type.toLowerCase() === 'checkbox') {
inputEl.click();
return;
}
}
formEl.focus();
} }
}
formEl.focus();
} }
}
} }

98
angular/src/directives/cipherListVirtualScroll.directive.ts
View File

@@ -1,62 +1,76 @@
import { import {
CdkFixedSizeVirtualScroll, CdkFixedSizeVirtualScroll,
FixedSizeVirtualScrollStrategy, FixedSizeVirtualScrollStrategy,
VIRTUAL_SCROLL_STRATEGY, VIRTUAL_SCROLL_STRATEGY,
} from '@angular/cdk/scrolling'; } from "@angular/cdk/scrolling";
import { import { Directive, forwardRef } from "@angular/core";
Directive,
forwardRef,
} from '@angular/core';
// Custom virtual scroll strategy for cdk-virtual-scroll // Custom virtual scroll strategy for cdk-virtual-scroll
// Uses a sample list item to set the itemSize for FixedSizeVirtualScrollStrategy // Uses a sample list item to set the itemSize for FixedSizeVirtualScrollStrategy
// The use case is the same as FixedSizeVirtualScrollStrategy, but it avoids locking in pixel sizes in the template. // The use case is the same as FixedSizeVirtualScrollStrategy, but it avoids locking in pixel sizes in the template.
export class CipherListVirtualScrollStrategy extends FixedSizeVirtualScrollStrategy { export class CipherListVirtualScrollStrategy extends FixedSizeVirtualScrollStrategy {
private checkItemSizeCallback: any; private checkItemSizeCallback: any;
private timeout: any; private timeout: any;
constructor(itemSize: number, minBufferPx: number, maxBufferPx: number, checkItemSizeCallback: any) { constructor(
super(itemSize, minBufferPx, maxBufferPx); itemSize: number,
this.checkItemSizeCallback = checkItemSizeCallback; minBufferPx: number,
maxBufferPx: number,
checkItemSizeCallback: any
) {
super(itemSize, minBufferPx, maxBufferPx);
this.checkItemSizeCallback = checkItemSizeCallback;
}
onContentRendered() {
if (this.timeout != null) {
clearTimeout(this.timeout);
} }
onContentRendered() { this.timeout = setTimeout(this.checkItemSizeCallback, 500);
if (this.timeout != null) { }
clearTimeout(this.timeout);
}
this.timeout = setTimeout(this.checkItemSizeCallback, 500);
}
} }
export function _cipherListVirtualScrollStrategyFactory(cipherListDir: CipherListVirtualScroll) { export function _cipherListVirtualScrollStrategyFactory(cipherListDir: CipherListVirtualScroll) {
return cipherListDir._scrollStrategy; return cipherListDir._scrollStrategy;
} }
@Directive({ @Directive({
selector: 'cdk-virtual-scroll-viewport[itemSize]', selector: "cdk-virtual-scroll-viewport[itemSize]",
providers: [{ providers: [
provide: VIRTUAL_SCROLL_STRATEGY, {
useFactory: _cipherListVirtualScrollStrategyFactory, provide: VIRTUAL_SCROLL_STRATEGY,
deps: [forwardRef(() => CipherListVirtualScroll)], useFactory: _cipherListVirtualScrollStrategyFactory,
}], deps: [forwardRef(() => CipherListVirtualScroll)],
},
],
}) })
export class CipherListVirtualScroll extends CdkFixedSizeVirtualScroll { export class CipherListVirtualScroll extends CdkFixedSizeVirtualScroll {
_scrollStrategy: CipherListVirtualScrollStrategy; _scrollStrategy: CipherListVirtualScrollStrategy;
constructor() { constructor() {
super(); super();
this._scrollStrategy = new CipherListVirtualScrollStrategy(this.itemSize, this.minBufferPx, this.maxBufferPx, this._scrollStrategy = new CipherListVirtualScrollStrategy(
this.checkAndUpdateItemSize); this.itemSize,
} this.minBufferPx,
this.maxBufferPx,
checkAndUpdateItemSize = () => { this.checkAndUpdateItemSize
const sampleItem = document.querySelector('cdk-virtual-scroll-viewport .virtual-scroll-item') as HTMLElement; );
const newItemSize = sampleItem?.offsetHeight; }
if (newItemSize != null && newItemSize !== this.itemSize) { checkAndUpdateItemSize = () => {
this.itemSize = newItemSize; const sampleItem = document.querySelector(
this._scrollStrategy.updateItemAndBufferSize(this.itemSize, this.minBufferPx, this.maxBufferPx); "cdk-virtual-scroll-viewport .virtual-scroll-item"
} ) as HTMLElement;
const newItemSize = sampleItem?.offsetHeight;
if (newItemSize != null && newItemSize !== this.itemSize) {
this.itemSize = newItemSize;
this._scrollStrategy.updateItemAndBufferSize(
this.itemSize,
this.minBufferPx,
this.maxBufferPx
);
} }
};
} }

20
angular/src/directives/fallback-src.directive.ts
View File

@@ -1,20 +1,14 @@
import { import { Directive, ElementRef, HostListener, Input } from "@angular/core";
Directive,
ElementRef,
HostListener,
Input,
} from '@angular/core';
@Directive({ @Directive({
selector: '[appFallbackSrc]', selector: "[appFallbackSrc]",
}) })
export class FallbackSrcDirective { export class FallbackSrcDirective {
@Input('appFallbackSrc') appFallbackSrc: string; @Input("appFallbackSrc") appFallbackSrc: string;
constructor(private el: ElementRef) { constructor(private el: ElementRef) {}
}
@HostListener('error') onError() { @HostListener("error") onError() {
this.el.nativeElement.src = this.appFallbackSrc; this.el.nativeElement.src = this.appFallbackSrc;
} }
} }

55
angular/src/directives/input-verbatim.directive.ts
View File

@@ -1,37 +1,32 @@
import { import { Directive, ElementRef, Input, Renderer2 } from "@angular/core";
Directive,
ElementRef,
Input,
Renderer2,
} from '@angular/core';
@Directive({ @Directive({
selector: '[appInputVerbatim]', selector: "[appInputVerbatim]",
}) })
export class InputVerbatimDirective { export class InputVerbatimDirective {
@Input() set appInputVerbatim(condition: boolean | string) { @Input() set appInputVerbatim(condition: boolean | string) {
this.disableComplete = condition === '' || condition === true; this.disableComplete = condition === "" || condition === true;
}
private disableComplete: boolean;
constructor(private el: ElementRef, private renderer: Renderer2) {}
ngOnInit() {
if (this.disableComplete && !this.el.nativeElement.hasAttribute("autocomplete")) {
this.renderer.setAttribute(this.el.nativeElement, "autocomplete", "off");
} }
if (!this.el.nativeElement.hasAttribute("autocapitalize")) {
private disableComplete: boolean; this.renderer.setAttribute(this.el.nativeElement, "autocapitalize", "none");
constructor(private el: ElementRef, private renderer: Renderer2) { }
ngOnInit() {
if (this.disableComplete && !this.el.nativeElement.hasAttribute('autocomplete')) {
this.renderer.setAttribute(this.el.nativeElement, 'autocomplete', 'off');
}
if (!this.el.nativeElement.hasAttribute('autocapitalize')) {
this.renderer.setAttribute(this.el.nativeElement, 'autocapitalize', 'none');
}
if (!this.el.nativeElement.hasAttribute('autocorrect')) {
this.renderer.setAttribute(this.el.nativeElement, 'autocorrect', 'none');
}
if (!this.el.nativeElement.hasAttribute('spellcheck')) {
this.renderer.setAttribute(this.el.nativeElement, 'spellcheck', 'false');
}
if (!this.el.nativeElement.hasAttribute('inputmode')) {
this.renderer.setAttribute(this.el.nativeElement, 'inputmode', 'verbatim');
}
} }
if (!this.el.nativeElement.hasAttribute("autocorrect")) {
this.renderer.setAttribute(this.el.nativeElement, "autocorrect", "none");
}
if (!this.el.nativeElement.hasAttribute("spellcheck")) {
this.renderer.setAttribute(this.el.nativeElement, "spellcheck", "false");
}
if (!this.el.nativeElement.hasAttribute("inputmode")) {
this.renderer.setAttribute(this.el.nativeElement, "inputmode", "verbatim");
}
}
} }

62
angular/src/directives/select-copy.directive.ts
View File

@@ -1,41 +1,37 @@
import { import { Directive, ElementRef, HostListener } from "@angular/core";
Directive,
ElementRef,
HostListener,
} from '@angular/core';
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
@Directive({ @Directive({
selector: '[appSelectCopy]', selector: "[appSelectCopy]",
}) })
export class SelectCopyDirective { export class SelectCopyDirective {
constructor(private el: ElementRef, private platformUtilsService: PlatformUtilsService) { } constructor(private el: ElementRef, private platformUtilsService: PlatformUtilsService) {}
@HostListener('copy') onCopy() { @HostListener("copy") onCopy() {
if (window == null) { if (window == null) {
return; return;
}
let copyText = '';
const selection = window.getSelection();
for (let i = 0; i < selection.rangeCount; i++) {
const range = selection.getRangeAt(i);
const text = range.toString();
// The selection should only contain one line of text. In some cases however, the
// selection contains newlines and space characters from the indentation of following
// sibling nodes. To avoid copying passwords containing trailing newlines and spaces
// that aren't part of the password, the selection has to be trimmed.
let stringEndPos = text.length;
const newLinePos = text.search(/(?:\r\n|\r|\n)/);
if (newLinePos > -1) {
const otherPart = text.substr(newLinePos).trim();
if (otherPart === '') {
stringEndPos = newLinePos;
}
}
copyText += text.substring(0, stringEndPos);
}
this.platformUtilsService.copyToClipboard(copyText, { window: window });
} }
let copyText = "";
const selection = window.getSelection();
for (let i = 0; i < selection.rangeCount; i++) {
const range = selection.getRangeAt(i);
const text = range.toString();
// The selection should only contain one line of text. In some cases however, the
// selection contains newlines and space characters from the indentation of following
// sibling nodes. To avoid copying passwords containing trailing newlines and spaces
// that aren't part of the password, the selection has to be trimmed.
let stringEndPos = text.length;
const newLinePos = text.search(/(?:\r\n|\r|\n)/);
if (newLinePos > -1) {
const otherPart = text.substr(newLinePos).trim();
if (otherPart === "") {
stringEndPos = newLinePos;
}
}
copyText += text.substring(0, stringEndPos);
}
this.platformUtilsService.copyToClipboard(copyText, { window: window });
}
} }

13
angular/src/directives/stop-click.directive.ts
View File

@@ -1,13 +1,10 @@
import { import { Directive, HostListener } from "@angular/core";
Directive,
HostListener,
} from '@angular/core';
@Directive({ @Directive({
selector: '[appStopClick]', selector: "[appStopClick]",
}) })
export class StopClickDirective { export class StopClickDirective {
@HostListener('click', ['$event']) onClick($event: MouseEvent) { @HostListener("click", ["$event"]) onClick($event: MouseEvent) {
$event.preventDefault(); $event.preventDefault();
} }
} }

13
angular/src/directives/stop-prop.directive.ts
View File

@@ -1,13 +1,10 @@
import { import { Directive, HostListener } from "@angular/core";
Directive,
HostListener,
} from '@angular/core';
@Directive({ @Directive({
selector: '[appStopProp]', selector: "[appStopProp]",
}) })
export class StopPropDirective { export class StopPropDirective {
@HostListener('click', ['$event']) onClick($event: MouseEvent) { @HostListener("click", ["$event"]) onClick($event: MouseEvent) {
$event.stopPropagation(); $event.stopPropagation();
} }
} }

77
angular/src/directives/true-false-value.directive.ts
View File

@@ -1,54 +1,49 @@
import { import { Directive, ElementRef, forwardRef, HostListener, Input, Renderer2 } from "@angular/core";
Directive, import { ControlValueAccessor, NgControl, NG_VALUE_ACCESSOR } from "@angular/forms";
ElementRef,
forwardRef,
HostListener,
Input,
Renderer2,
} from '@angular/core';
import {
ControlValueAccessor,
NgControl,
NG_VALUE_ACCESSOR,
} from '@angular/forms';
// ref: https://juristr.com/blog/2018/02/ng-true-value-directive/ // ref: https://juristr.com/blog/2018/02/ng-true-value-directive/
@Directive({ @Directive({
selector: 'input[type=checkbox][appTrueFalseValue]', selector: "input[type=checkbox][appTrueFalseValue]",
providers: [ providers: [
{ {
provide: NG_VALUE_ACCESSOR, provide: NG_VALUE_ACCESSOR,
useExisting: forwardRef(() => TrueFalseValueDirective), useExisting: forwardRef(() => TrueFalseValueDirective),
multi: true, multi: true,
}, },
], ],
}) })
export class TrueFalseValueDirective implements ControlValueAccessor { export class TrueFalseValueDirective implements ControlValueAccessor {
@Input() trueValue = true; @Input() trueValue = true;
@Input() falseValue = false; @Input() falseValue = false;
constructor(private elementRef: ElementRef, private renderer: Renderer2) { } constructor(private elementRef: ElementRef, private renderer: Renderer2) {}
@HostListener('change', ['$event']) @HostListener("change", ["$event"])
onHostChange(ev: any) { onHostChange(ev: any) {
this.propagateChange(ev.target.checked ? this.trueValue : this.falseValue); this.propagateChange(ev.target.checked ? this.trueValue : this.falseValue);
}
writeValue(obj: any): void {
if (obj === this.trueValue) {
this.renderer.setProperty(this.elementRef.nativeElement, "checked", true);
} else {
this.renderer.setProperty(this.elementRef.nativeElement, "checked", false);
} }
}
writeValue(obj: any): void { registerOnChange(fn: any): void {
if (obj === this.trueValue) { this.propagateChange = fn;
this.renderer.setProperty(this.elementRef.nativeElement, 'checked', true); }
} else {
this.renderer.setProperty(this.elementRef.nativeElement, 'checked', false);
}
}
registerOnChange(fn: any): void { registerOnTouched(fn: any): void {
this.propagateChange = fn; /* nothing */
} }
registerOnTouched(fn: any): void { /* nothing */ } setDisabledState?(isDisabled: boolean): void {
/* nothing */
}
setDisabledState?(isDisabled: boolean): void { /* nothing */ } private propagateChange = (_: any) => {
/* nothing */
private propagateChange = (_: any) => { /* nothing */ }; };
} }

87
angular/src/pipes/color-password.pipe.ts
View File

@@ -1,53 +1,50 @@
import { import { Pipe, PipeTransform } from "@angular/core";
Pipe, import { Utils } from "jslib-common/misc/utils";
PipeTransform,
} from '@angular/core';
import { Utils } from 'jslib-common/misc/utils';
/* /*
An updated pipe that sanitizes HTML, highlights numbers and special characters (in different colors each) An updated pipe that sanitizes HTML, highlights numbers and special characters (in different colors each)
and handles Unicode / Emoji characters correctly. and handles Unicode / Emoji characters correctly.
*/ */
@Pipe({ name: 'colorPassword' }) @Pipe({ name: "colorPassword" })
export class ColorPasswordPipe implements PipeTransform { export class ColorPasswordPipe implements PipeTransform {
transform(password: string) { transform(password: string) {
// Convert to an array to handle cases that stings have special characters, ie: emoji. // Convert to an array to handle cases that stings have special characters, ie: emoji.
const passwordArray = Array.from(password); const passwordArray = Array.from(password);
let colorizedPassword = ''; let colorizedPassword = "";
for (let i = 0; i < passwordArray.length; i++) { for (let i = 0; i < passwordArray.length; i++) {
let character = passwordArray[i]; let character = passwordArray[i];
let isSpecial = false; let isSpecial = false;
// Sanitize HTML first. // Sanitize HTML first.
switch (character) { switch (character) {
case '&': case "&":
character = '&amp;'; character = "&amp;";
isSpecial = true; isSpecial = true;
break; break;
case '<': case "<":
character = '&lt;'; character = "&lt;";
isSpecial = true; isSpecial = true;
break; break;
case '>': case ">":
character = '&gt;'; character = "&gt;";
isSpecial = true; isSpecial = true;
break; break;
case ' ': case " ":
character = '&nbsp;'; character = "&nbsp;";
isSpecial = true; isSpecial = true;
break; break;
default: default:
break; break;
} }
let type = 'letter'; let type = "letter";
if (character.match(Utils.regexpEmojiPresentation)) { if (character.match(Utils.regexpEmojiPresentation)) {
type = 'emoji'; type = "emoji";
} else if (isSpecial || character.match(/[^\w ]/)) { } else if (isSpecial || character.match(/[^\w ]/)) {
type = 'special'; type = "special";
} else if (character.match(/\d/)) { } else if (character.match(/\d/)) {
type = 'number'; type = "number";
} }
colorizedPassword += '<span class="password-' + type + '">' + character + '</span>'; colorizedPassword += '<span class="password-' + type + '">' + character + "</span>";
}
return colorizedPassword;
} }
return colorizedPassword;
}
} }

17
angular/src/pipes/i18n.pipe.ts
View File

@@ -1,17 +1,14 @@
import { import { Pipe, PipeTransform } from "@angular/core";
Pipe,
PipeTransform,
} from '@angular/core';
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
@Pipe({ @Pipe({
name: 'i18n', name: "i18n",
}) })
export class I18nPipe implements PipeTransform { export class I18nPipe implements PipeTransform {
constructor(private i18nService: I18nService) { } constructor(private i18nService: I18nService) {}
transform(id: string, p1?: string, p2?: string, p3?: string): string { transform(id: string, p1?: string, p2?: string, p3?: string): string {
return this.i18nService.t(id, p1, p2, p3); return this.i18nService.t(id, p1, p2, p3);
} }
} }

71
angular/src/pipes/search-ciphers.pipe.ts
View File

@@ -1,44 +1,41 @@
import { import { Pipe, PipeTransform } from "@angular/core";
Pipe,
PipeTransform,
} from '@angular/core';
import { CipherView } from 'jslib-common/models/view/cipherView'; import { CipherView } from "jslib-common/models/view/cipherView";
@Pipe({ @Pipe({
name: 'searchCiphers', name: "searchCiphers",
}) })
export class SearchCiphersPipe implements PipeTransform { export class SearchCiphersPipe implements PipeTransform {
transform(ciphers: CipherView[], searchText: string, deleted: boolean = false): CipherView[] { transform(ciphers: CipherView[], searchText: string, deleted: boolean = false): CipherView[] {
if (ciphers == null || ciphers.length === 0) { if (ciphers == null || ciphers.length === 0) {
return []; return [];
}
if (searchText == null || searchText.length < 2) {
return ciphers.filter(c => {
return deleted !== c.isDeleted;
});
}
searchText = searchText.trim().toLowerCase();
return ciphers.filter(c => {
if (deleted !== c.isDeleted) {
return false;
}
if (c.name != null && c.name.toLowerCase().indexOf(searchText) > -1) {
return true;
}
if (searchText.length >= 8 && c.id.startsWith(searchText)) {
return true;
}
if (c.subTitle != null && c.subTitle.toLowerCase().indexOf(searchText) > -1) {
return true;
}
if (c.login && c.login.uri != null && c.login.uri.toLowerCase().indexOf(searchText) > -1) {
return true;
}
return false;
});
} }
if (searchText == null || searchText.length < 2) {
return ciphers.filter((c) => {
return deleted !== c.isDeleted;
});
}
searchText = searchText.trim().toLowerCase();
return ciphers.filter((c) => {
if (deleted !== c.isDeleted) {
return false;
}
if (c.name != null && c.name.toLowerCase().indexOf(searchText) > -1) {
return true;
}
if (searchText.length >= 8 && c.id.startsWith(searchText)) {
return true;
}
if (c.subTitle != null && c.subTitle.toLowerCase().indexOf(searchText) > -1) {
return true;
}
if (c.login && c.login.uri != null && c.login.uri.toLowerCase().indexOf(searchText) > -1) {
return true;
}
return false;
});
}
} }

69
angular/src/pipes/search.pipe.ts
View File

@@ -1,33 +1,48 @@
import { import { Pipe, PipeTransform } from "@angular/core";
Pipe,
PipeTransform,
} from '@angular/core';
@Pipe({ @Pipe({
name: 'search', name: "search",
}) })
export class SearchPipe implements PipeTransform { export class SearchPipe implements PipeTransform {
transform(items: any[], searchText: string, prop1?: string, prop2?: string, prop3?: string): any[] { transform(
if (items == null || items.length === 0) { items: any[],
return []; searchText: string,
} prop1?: string,
prop2?: string,
if (searchText == null || searchText.length < 2) { prop3?: string
return items; ): any[] {
} if (items == null || items.length === 0) {
return [];
searchText = searchText.trim().toLowerCase();
return items.filter(i => {
if (prop1 != null && i[prop1] != null && i[prop1].toString().toLowerCase().indexOf(searchText) > -1) {
return true;
}
if (prop2 != null && i[prop2] != null && i[prop2].toString().toLowerCase().indexOf(searchText) > -1) {
return true;
}
if (prop3 != null && i[prop3] != null && i[prop3].toString().toLowerCase().indexOf(searchText) > -1) {
return true;
}
return false;
});
} }
if (searchText == null || searchText.length < 2) {
return items;
}
searchText = searchText.trim().toLowerCase();
return items.filter((i) => {
if (
prop1 != null &&
i[prop1] != null &&
i[prop1].toString().toLowerCase().indexOf(searchText) > -1
) {
return true;
}
if (
prop2 != null &&
i[prop2] != null &&
i[prop2].toString().toLowerCase().indexOf(searchText) > -1
) {
return true;
}
if (
prop3 != null &&
i[prop3] != null &&
i[prop3].toString().toLowerCase().indexOf(searchText) > -1
) {
return true;
}
return false;
});
}
} }

23
angular/src/pipes/user-name.pipe.ts
View File

@@ -1,22 +1,19 @@
import { import { Pipe, PipeTransform } from "@angular/core";
Pipe,
PipeTransform,
} from '@angular/core';
interface User { interface User {
name?: string; name?: string;
email: string; email: string;
} }
@Pipe({ @Pipe({
name: 'userName', name: "userName",
}) })
export class UserNamePipe implements PipeTransform { export class UserNamePipe implements PipeTransform {
transform(user?: User): string { transform(user?: User): string {
if (user == null) { if (user == null) {
return null; return null;
}
return user.name == null || user.name.trim() === '' ? user.email : user.name;
} }
return user.name == null || user.name.trim() === "" ? user.email : user.name;
}
} }

121
angular/src/scss/webfonts.css
View File

@@ -1,90 +1,89 @@
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: italic; font-style: italic;
font-weight: 300; font-weight: 300;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-italic-300.woff) format('woff'); src: url(webfonts/Open_Sans-italic-300.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: italic; font-style: italic;
font-weight: 400; font-weight: 400;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-italic-400.woff) format('woff'); src: url(webfonts/Open_Sans-italic-400.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: italic; font-style: italic;
font-weight: 600; font-weight: 600;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-italic-600.woff) format('woff'); src: url(webfonts/Open_Sans-italic-600.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: italic; font-style: italic;
font-weight: 700; font-weight: 700;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-italic-700.woff) format('woff'); src: url(webfonts/Open_Sans-italic-700.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: italic; font-style: italic;
font-weight: 800; font-weight: 800;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-italic-800.woff) format('woff'); src: url(webfonts/Open_Sans-italic-800.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: normal; font-style: normal;
font-weight: 300; font-weight: 300;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-normal-300.woff) format('woff'); src: url(webfonts/Open_Sans-normal-300.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-normal-400.woff) format('woff'); src: url(webfonts/Open_Sans-normal-400.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-normal-600.woff) format('woff'); src: url(webfonts/Open_Sans-normal-600.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-normal-700.woff) format('woff'); src: url(webfonts/Open_Sans-normal-700.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }
@font-face { @font-face {
font-family: 'Open Sans'; font-family: "Open Sans";
font-style: normal; font-style: normal;
font-weight: 800; font-weight: 800;
font-display: auto; font-display: auto;
src: url(webfonts/Open_Sans-normal-800.woff) format('woff'); src: url(webfonts/Open_Sans-normal-800.woff) format("woff");
unicode-range: U+0-10FFFF; unicode-range: U+0-10FFFF;
} }

7
angular/src/services/broadcaster.service.ts
View File

@@ -1,7 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from "@angular/core";
import { BroadcasterService as BaseBroadcasterService } from 'jslib-common/services/broadcaster.service'; import { BroadcasterService as BaseBroadcasterService } from "jslib-common/services/broadcaster.service";
@Injectable() @Injectable()
export class BroadcasterService extends BaseBroadcasterService { export class BroadcasterService extends BaseBroadcasterService {}
}

307
angular/src/services/modal.service.ts
View File

@@ -1,164 +1,179 @@
import { import {
ApplicationRef, ApplicationRef,
ComponentFactory, ComponentFactory,
ComponentFactoryResolver, ComponentFactoryResolver,
ComponentRef, ComponentRef,
EmbeddedViewRef, EmbeddedViewRef,
Injectable, Injectable,
Injector, Injector,
Type, Type,
ViewContainerRef ViewContainerRef,
} from '@angular/core'; } from "@angular/core";
import { first } from 'rxjs/operators'; import { first } from "rxjs/operators";
import { DynamicModalComponent } from '../components/modal/dynamic-modal.component'; import { DynamicModalComponent } from "../components/modal/dynamic-modal.component";
import { ModalInjector } from '../components/modal/modal-injector'; import { ModalInjector } from "../components/modal/modal-injector";
import { ModalRef } from '../components/modal/modal.ref'; import { ModalRef } from "../components/modal/modal.ref";
export class ModalConfig<D = any> { export class ModalConfig<D = any> {
data?: D; data?: D;
allowMultipleModals: boolean = false; allowMultipleModals: boolean = false;
} }
@Injectable() @Injectable()
export class ModalService { export class ModalService {
protected modalList: ComponentRef<DynamicModalComponent>[] = []; protected modalList: ComponentRef<DynamicModalComponent>[] = [];
// Lazy loaded modules are not available in componentFactoryResolver, // Lazy loaded modules are not available in componentFactoryResolver,
// therefore modules needs to manually initialize their resolvers. // therefore modules needs to manually initialize their resolvers.
private factoryResolvers: Map<Type<any>, ComponentFactoryResolver> = new Map(); private factoryResolvers: Map<Type<any>, ComponentFactoryResolver> = new Map();
constructor(private componentFactoryResolver: ComponentFactoryResolver, private applicationRef: ApplicationRef, constructor(
private injector: Injector) { private componentFactoryResolver: ComponentFactoryResolver,
document.addEventListener('keyup', event => { private applicationRef: ApplicationRef,
if (event.key === 'Escape' && this.modalCount > 0) { private injector: Injector
this.topModal.instance.close(); ) {
} document.addEventListener("keyup", (event) => {
if (event.key === "Escape" && this.modalCount > 0) {
this.topModal.instance.close();
}
});
}
get modalCount() {
return this.modalList.length;
}
private get topModal() {
return this.modalList[this.modalCount - 1];
}
async openViewRef<T>(
componentType: Type<T>,
viewContainerRef: ViewContainerRef,
setComponentParameters: (component: T) => void = null
): Promise<[ModalRef, T]> {
const [modalRef, modalComponentRef] = this.openInternal(componentType, null, false);
modalComponentRef.instance.setComponentParameters = setComponentParameters;
viewContainerRef.insert(modalComponentRef.hostView);
await modalRef.onCreated.pipe(first()).toPromise();
return [modalRef, modalComponentRef.instance.componentRef.instance];
}
open(componentType: Type<any>, config?: ModalConfig) {
if (!(config?.allowMultipleModals ?? false) && this.modalCount > 0) {
return;
}
const [modalRef, _] = this.openInternal(componentType, config, true);
return modalRef;
}
registerComponentFactoryResolver<T>(
componentType: Type<T>,
componentFactoryResolver: ComponentFactoryResolver
): void {
this.factoryResolvers.set(componentType, componentFactoryResolver);
}
resolveComponentFactory<T>(componentType: Type<T>): ComponentFactory<T> {
if (this.factoryResolvers.has(componentType)) {
return this.factoryResolvers.get(componentType).resolveComponentFactory(componentType);
}
return this.componentFactoryResolver.resolveComponentFactory(componentType);
}
protected openInternal(
componentType: Type<any>,
config?: ModalConfig,
attachToDom?: boolean
): [ModalRef, ComponentRef<DynamicModalComponent>] {
const [modalRef, componentRef] = this.createModalComponent(config);
componentRef.instance.childComponentType = componentType;
if (attachToDom) {
this.applicationRef.attachView(componentRef.hostView);
const domElem = (componentRef.hostView as EmbeddedViewRef<any>).rootNodes[0] as HTMLElement;
document.body.appendChild(domElem);
}
modalRef.onClosed.pipe(first()).subscribe(() => {
if (attachToDom) {
this.applicationRef.detachView(componentRef.hostView);
}
componentRef.destroy();
this.modalList.pop();
if (this.modalCount > 0) {
this.topModal.instance.getFocus();
}
});
this.setupHandlers(modalRef);
this.modalList.push(componentRef);
return [modalRef, componentRef];
}
protected setupHandlers(modalRef: ModalRef) {
let backdrop: HTMLElement = null;
// Add backdrop, setup [data-dismiss] handler.
modalRef.onCreated.pipe(first()).subscribe((el) => {
document.body.classList.add("modal-open");
const modalEl: HTMLElement = el.querySelector(".modal");
const dialogEl = modalEl.querySelector(".modal-dialog") as HTMLElement;
backdrop = document.createElement("div");
backdrop.className = "modal-backdrop fade";
backdrop.style.zIndex = `${this.modalCount}040`;
modalEl.prepend(backdrop);
dialogEl.addEventListener("click", (e: Event) => {
e.stopPropagation();
});
dialogEl.style.zIndex = `${this.modalCount}050`;
const modals = Array.from(
el.querySelectorAll('.modal-backdrop, .modal *[data-dismiss="modal"]')
);
for (const closeElement of modals) {
closeElement.addEventListener("click", (event) => {
modalRef.close();
}); });
} }
});
get modalCount() { // onClose is used in Web to hook into bootstrap. On other projects we pipe it directly to closed.
return this.modalList.length; modalRef.onClose.pipe(first()).subscribe(() => {
} modalRef.closed();
private get topModal() { if (this.modalCount === 0) {
return this.modalList[this.modalCount - 1]; document.body.classList.remove("modal-open");
} }
});
}
async openViewRef<T>(componentType: Type<T>, viewContainerRef: ViewContainerRef, protected createModalComponent(
setComponentParameters: (component: T) => void = null): Promise<[ModalRef, T]> { config: ModalConfig
): [ModalRef, ComponentRef<DynamicModalComponent>] {
const modalRef = new ModalRef();
const [modalRef, modalComponentRef] = this.openInternal(componentType, null, false); const map = new WeakMap();
modalComponentRef.instance.setComponentParameters = setComponentParameters; map.set(ModalConfig, config);
map.set(ModalRef, modalRef);
viewContainerRef.insert(modalComponentRef.hostView); const componentFactory =
this.componentFactoryResolver.resolveComponentFactory(DynamicModalComponent);
const componentRef = componentFactory.create(new ModalInjector(this.injector, map));
await modalRef.onCreated.pipe(first()).toPromise(); return [modalRef, componentRef];
}
return [modalRef, modalComponentRef.instance.componentRef.instance];
}
open(componentType: Type<any>, config?: ModalConfig) {
if (!(config?.allowMultipleModals ?? false) && this.modalCount > 0) {
return;
}
const [modalRef, _] = this.openInternal(componentType, config, true);
return modalRef;
}
registerComponentFactoryResolver<T>(componentType: Type<T>, componentFactoryResolver: ComponentFactoryResolver): void {
this.factoryResolvers.set(componentType, componentFactoryResolver);
}
resolveComponentFactory<T>(componentType: Type<T>): ComponentFactory<T> {
if (this.factoryResolvers.has(componentType)) {
return this.factoryResolvers.get(componentType).resolveComponentFactory(componentType);
}
return this.componentFactoryResolver.resolveComponentFactory(componentType);
}
protected openInternal(componentType: Type<any>, config?: ModalConfig, attachToDom?: boolean):
[ModalRef, ComponentRef<DynamicModalComponent>] {
const [modalRef, componentRef] = this.createModalComponent(config);
componentRef.instance.childComponentType = componentType;
if (attachToDom) {
this.applicationRef.attachView(componentRef.hostView);
const domElem = (componentRef.hostView as EmbeddedViewRef<any>).rootNodes[0] as HTMLElement;
document.body.appendChild(domElem);
}
modalRef.onClosed.pipe(first()).subscribe(() => {
if (attachToDom) {
this.applicationRef.detachView(componentRef.hostView);
}
componentRef.destroy();
this.modalList.pop();
if (this.modalCount > 0) {
this.topModal.instance.getFocus();
}
});
this.setupHandlers(modalRef);
this.modalList.push(componentRef);
return [modalRef, componentRef];
}
protected setupHandlers(modalRef: ModalRef) {
let backdrop: HTMLElement = null;
// Add backdrop, setup [data-dismiss] handler.
modalRef.onCreated.pipe(first()).subscribe(el => {
document.body.classList.add('modal-open');
const modalEl: HTMLElement = el.querySelector('.modal');
const dialogEl = modalEl.querySelector('.modal-dialog') as HTMLElement;
backdrop = document.createElement('div');
backdrop.className = 'modal-backdrop fade';
backdrop.style.zIndex = `${this.modalCount}040`;
modalEl.prepend(backdrop);
dialogEl.addEventListener('click', (e: Event) => {
e.stopPropagation();
});
dialogEl.style.zIndex = `${this.modalCount}050`;
const modals = Array.from(el.querySelectorAll('.modal-backdrop, .modal *[data-dismiss="modal"]'));
for (const closeElement of modals) {
closeElement.addEventListener('click', event => {
modalRef.close();
});
}
});
// onClose is used in Web to hook into bootstrap. On other projects we pipe it directly to closed.
modalRef.onClose.pipe(first()).subscribe(() => {
modalRef.closed();
if (this.modalCount === 0) {
document.body.classList.remove('modal-open');
}
});
}
protected createModalComponent(config: ModalConfig): [ModalRef, ComponentRef<DynamicModalComponent>] {
const modalRef = new ModalRef();
const map = new WeakMap();
map.set(ModalConfig, config);
map.set(ModalRef, modalRef);
const componentFactory = this.componentFactoryResolver.resolveComponentFactory(DynamicModalComponent);
const componentRef = componentFactory.create(new ModalInjector(this.injector, map));
return [modalRef, componentRef];
}
} }

51
angular/src/services/passwordReprompt.service.ts
View File

@@ -1,37 +1,40 @@
import { Injectable } from '@angular/core'; import { Injectable } from "@angular/core";
import { KeyConnectorService } from 'jslib-common/abstractions/keyConnector.service'; import { KeyConnectorService } from "jslib-common/abstractions/keyConnector.service";
import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from 'jslib-common/abstractions/passwordReprompt.service'; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "jslib-common/abstractions/passwordReprompt.service";
import { PasswordRepromptComponent } from '../components/password-reprompt.component'; import { PasswordRepromptComponent } from "../components/password-reprompt.component";
import { ModalService } from './modal.service'; import { ModalService } from "./modal.service";
@Injectable() @Injectable()
export class PasswordRepromptService implements PasswordRepromptServiceAbstraction { export class PasswordRepromptService implements PasswordRepromptServiceAbstraction {
protected component = PasswordRepromptComponent; protected component = PasswordRepromptComponent;
constructor(private modalService: ModalService, private keyConnectorService: KeyConnectorService) { } constructor(
private modalService: ModalService,
private keyConnectorService: KeyConnectorService
) {}
protectedFields() { protectedFields() {
return ['TOTP', 'Password', 'H_Field', 'Card Number', 'Security Code']; return ["TOTP", "Password", "H_Field", "Card Number", "Security Code"];
}
async showPasswordPrompt() {
if (!(await this.enabled())) {
return true;
} }
async showPasswordPrompt() { const ref = this.modalService.open(this.component, { allowMultipleModals: true });
if (!await this.enabled()) {
return true;
}
const ref = this.modalService.open(this.component, {allowMultipleModals: true}); if (ref == null) {
return false;
if (ref == null) {
return false;
}
const result = await ref.onClosedPromise();
return result === true;
} }
async enabled() { const result = await ref.onClosedPromise();
return !await this.keyConnectorService.getUsesKeyConnector(); return result === true;
} }
async enabled() {
return !(await this.keyConnectorService.getUsesKeyConnector());
}
} }

57
angular/src/services/validation.service.ts
View File

@@ -1,36 +1,39 @@
import { Injectable } from '@angular/core'; import { Injectable } from "@angular/core";
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from "jslib-common/abstractions/i18n.service";
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { ErrorResponse } from 'jslib-common/models/response/errorResponse'; import { ErrorResponse } from "jslib-common/models/response/errorResponse";
@Injectable() @Injectable()
export class ValidationService { export class ValidationService {
constructor(private i18nService: I18nService, private platformUtilsService: PlatformUtilsService) { } constructor(
private i18nService: I18nService,
private platformUtilsService: PlatformUtilsService
) {}
showError(data: any): string[] { showError(data: any): string[] {
const defaultErrorMessage = this.i18nService.t('unexpectedError'); const defaultErrorMessage = this.i18nService.t("unexpectedError");
let errors: string[] = []; let errors: string[] = [];
if (data != null && typeof data === 'string') { if (data != null && typeof data === "string") {
errors.push(data); errors.push(data);
} else if (data == null || typeof data !== 'object') { } else if (data == null || typeof data !== "object") {
errors.push(defaultErrorMessage); errors.push(defaultErrorMessage);
} else if (data.validationErrors != null) { } else if (data.validationErrors != null) {
errors = errors.concat((data as ErrorResponse).getAllMessages()); errors = errors.concat((data as ErrorResponse).getAllMessages());
} else { } else {
errors.push(data.message ? data.message : defaultErrorMessage); errors.push(data.message ? data.message : defaultErrorMessage);
}
if (errors.length === 1) {
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), errors[0]);
} else if (errors.length > 1) {
this.platformUtilsService.showToast('error', this.i18nService.t('errorOccurred'), errors, {
timeout: 5000 * errors.length,
});
}
return errors;
} }
if (errors.length === 1) {
this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), errors[0]);
} else if (errors.length > 1) {
this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), errors, {
timeout: 5000 * errors.length,
});
}
return errors;
}
} }

14
angular/tsconfig.json
View File

@@ -14,17 +14,9 @@
"declarationDir": "dist/types", "declarationDir": "dist/types",
"outDir": "dist", "outDir": "dist",
"paths": { "paths": {
"jslib-common/*": [ "jslib-common/*": ["../common/src/*"]
"../common/src/*"
]
} }
}, },
"include": [ "include": ["src", "spec"],
"src", "exclude": ["node_modules", "dist"]
"spec"
],
"exclude": [
"node_modules",
"dist"
]
} }

1071
common/src/abstractions/api.service.ts
View File

File diff suppressed because it is too large Load Diff

4
common/src/abstractions/appId.service.ts
View File

@@ -1,4 +1,4 @@
export abstract class AppIdService { export abstract class AppIdService {
getAppId: () => Promise<string>; getAppId: () => Promise<string>;
getAnonymousAppId: () => Promise<string>; getAnonymousAppId: () => Promise<string>;
} }

6
common/src/abstractions/audit.service.ts
View File

@@ -1,6 +1,6 @@
import { BreachAccountResponse } from '../models/response/breachAccountResponse'; import { BreachAccountResponse } from "../models/response/breachAccountResponse";
export abstract class AuditService { export abstract class AuditService {
passwordLeaked: (password: string) => Promise<number>; passwordLeaked: (password: string) => Promise<number>;
breachedAccounts: (username: string) => Promise<BreachAccountResponse[]>; breachedAccounts: (username: string) => Promise<BreachAccountResponse[]>;
} }

85
common/src/abstractions/auth.service.ts
View File

@@ -1,35 +1,60 @@
import { TwoFactorProviderType } from '../enums/twoFactorProviderType'; import { TwoFactorProviderType } from "../enums/twoFactorProviderType";
import { AuthResult } from '../models/domain/authResult'; import { AuthResult } from "../models/domain/authResult";
import { SymmetricCryptoKey } from '../models/domain/symmetricCryptoKey'; import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
export abstract class AuthService { export abstract class AuthService {
email: string; email: string;
masterPasswordHash: string; masterPasswordHash: string;
code: string; code: string;
codeVerifier: string; codeVerifier: string;
ssoRedirectUrl: string; ssoRedirectUrl: string;
clientId: string; clientId: string;
clientSecret: string; clientSecret: string;
twoFactorProvidersData: Map<TwoFactorProviderType, { [key: string]: string; }>; twoFactorProvidersData: Map<TwoFactorProviderType, { [key: string]: string }>;
selectedTwoFactorProviderType: TwoFactorProviderType; selectedTwoFactorProviderType: TwoFactorProviderType;
logIn: (email: string, masterPassword: string, captchaToken?: string) => Promise<AuthResult>; logIn: (email: string, masterPassword: string, captchaToken?: string) => Promise<AuthResult>;
logInSso: (code: string, codeVerifier: string, redirectUrl: string, orgId: string) => Promise<AuthResult>; logInSso: (
logInApiKey: (clientId: string, clientSecret: string) => Promise<AuthResult>; code: string,
logInTwoFactor: (twoFactorProvider: TwoFactorProviderType, twoFactorToken: string, codeVerifier: string,
remember?: boolean) => Promise<AuthResult>; redirectUrl: string,
logInComplete: (email: string, masterPassword: string, twoFactorProvider: TwoFactorProviderType, orgId: string
twoFactorToken: string, remember?: boolean, captchaToken?: string) => Promise<AuthResult>; ) => Promise<AuthResult>;
logInSsoComplete: (code: string, codeVerifier: string, redirectUrl: string, logInApiKey: (clientId: string, clientSecret: string) => Promise<AuthResult>;
twoFactorProvider: TwoFactorProviderType, twoFactorToken: string, remember?: boolean) => Promise<AuthResult>; logInTwoFactor: (
logInApiKeyComplete: (clientId: string, clientSecret: string, twoFactorProvider: TwoFactorProviderType, twoFactorProvider: TwoFactorProviderType,
twoFactorToken: string, remember?: boolean) => Promise<AuthResult>; twoFactorToken: string,
logOut: (callback: Function) => void; remember?: boolean
getSupportedTwoFactorProviders: (win: Window) => any[]; ) => Promise<AuthResult>;
getDefaultTwoFactorProvider: (webAuthnSupported: boolean) => TwoFactorProviderType; logInComplete: (
makePreloginKey: (masterPassword: string, email: string) => Promise<SymmetricCryptoKey>; email: string,
authingWithApiKey: () => boolean; masterPassword: string,
authingWithSso: () => boolean; twoFactorProvider: TwoFactorProviderType,
authingWithPassword: () => boolean; twoFactorToken: string,
remember?: boolean,
captchaToken?: string
) => Promise<AuthResult>;
logInSsoComplete: (
code: string,
codeVerifier: string,
redirectUrl: string,
twoFactorProvider: TwoFactorProviderType,
twoFactorToken: string,
remember?: boolean
) => Promise<AuthResult>;
logInApiKeyComplete: (
clientId: string,
clientSecret: string,
twoFactorProvider: TwoFactorProviderType,
twoFactorToken: string,
remember?: boolean
) => Promise<AuthResult>;
logOut: (callback: Function) => void;
getSupportedTwoFactorProviders: (win: Window) => any[];
getDefaultTwoFactorProvider: (webAuthnSupported: boolean) => TwoFactorProviderType;
makePreloginKey: (masterPassword: string, email: string) => Promise<SymmetricCryptoKey>;
authingWithApiKey: () => boolean;
authingWithSso: () => boolean;
authingWithPassword: () => boolean;
} }

8
common/src/abstractions/biometric.main.ts
View File

@@ -1,6 +1,6 @@
export abstract class BiometricMain { export abstract class BiometricMain {
isError: boolean; isError: boolean;
init: () => Promise<void>; init: () => Promise<void>;
supportsBiometric: () => Promise<boolean>; supportsBiometric: () => Promise<boolean>;
authenticateBiometric: () => Promise<boolean>; authenticateBiometric: () => Promise<boolean>;
} }

6
common/src/abstractions/broadcaster.service.ts
View File

@@ -1,5 +1,5 @@
export abstract class BroadcasterService { export abstract class BroadcasterService {
send: (message: any, id?: string) => void; send: (message: any, id?: string) => void;
subscribe: (id: string, messageCallback: (message: any) => any) => void; subscribe: (id: string, messageCallback: (message: any) => any) => void;
unsubscribe: (id: string) => void; unsubscribe: (id: string) => void;
} }

83
common/src/abstractions/cryptoFunction.service.ts
View File

@@ -1,27 +1,62 @@
import { DecryptParameters } from '../models/domain/decryptParameters'; import { DecryptParameters } from "../models/domain/decryptParameters";
import { SymmetricCryptoKey } from '../models/domain/symmetricCryptoKey'; import { SymmetricCryptoKey } from "../models/domain/symmetricCryptoKey";
export abstract class CryptoFunctionService { export abstract class CryptoFunctionService {
pbkdf2: (password: string | ArrayBuffer, salt: string | ArrayBuffer, algorithm: 'sha256' | 'sha512', pbkdf2: (
iterations: number) => Promise<ArrayBuffer>; password: string | ArrayBuffer,
hkdf: (ikm: ArrayBuffer, salt: string | ArrayBuffer, info: string | ArrayBuffer, salt: string | ArrayBuffer,
outputByteSize: number, algorithm: 'sha256' | 'sha512') => Promise<ArrayBuffer>; algorithm: "sha256" | "sha512",
hkdfExpand: (prk: ArrayBuffer, info: string | ArrayBuffer, outputByteSize: number, iterations: number
algorithm: 'sha256' | 'sha512') => Promise<ArrayBuffer>; ) => Promise<ArrayBuffer>;
hash: (value: string | ArrayBuffer, algorithm: 'sha1' | 'sha256' | 'sha512' | 'md5') => Promise<ArrayBuffer>; hkdf: (
hmac: (value: ArrayBuffer, key: ArrayBuffer, algorithm: 'sha1' | 'sha256' | 'sha512') => Promise<ArrayBuffer>; ikm: ArrayBuffer,
compare: (a: ArrayBuffer, b: ArrayBuffer) => Promise<boolean>; salt: string | ArrayBuffer,
hmacFast: (value: ArrayBuffer | string, key: ArrayBuffer | string, algorithm: 'sha1' | 'sha256' | 'sha512') => info: string | ArrayBuffer,
Promise<ArrayBuffer | string>; outputByteSize: number,
compareFast: (a: ArrayBuffer | string, b: ArrayBuffer | string) => Promise<boolean>; algorithm: "sha256" | "sha512"
aesEncrypt: (data: ArrayBuffer, iv: ArrayBuffer, key: ArrayBuffer) => Promise<ArrayBuffer>; ) => Promise<ArrayBuffer>;
aesDecryptFastParameters: (data: string, iv: string, mac: string, key: SymmetricCryptoKey) => hkdfExpand: (
DecryptParameters<ArrayBuffer | string>; prk: ArrayBuffer,
aesDecryptFast: (parameters: DecryptParameters<ArrayBuffer | string>) => Promise<string>; info: string | ArrayBuffer,
aesDecrypt: (data: ArrayBuffer, iv: ArrayBuffer, key: ArrayBuffer) => Promise<ArrayBuffer>; outputByteSize: number,
rsaEncrypt: (data: ArrayBuffer, publicKey: ArrayBuffer, algorithm: 'sha1' | 'sha256') => Promise<ArrayBuffer>; algorithm: "sha256" | "sha512"
rsaDecrypt: (data: ArrayBuffer, privateKey: ArrayBuffer, algorithm: 'sha1' | 'sha256') => Promise<ArrayBuffer>; ) => Promise<ArrayBuffer>;
rsaExtractPublicKey: (privateKey: ArrayBuffer) => Promise<ArrayBuffer>; hash: (
rsaGenerateKeyPair: (length: 1024 | 2048 | 4096) => Promise<[ArrayBuffer, ArrayBuffer]>; value: string | ArrayBuffer,
randomBytes: (length: number) => Promise<ArrayBuffer>; algorithm: "sha1" | "sha256" | "sha512" | "md5"
) => Promise<ArrayBuffer>;
hmac: (
value: ArrayBuffer,
key: ArrayBuffer,
algorithm: "sha1" | "sha256" | "sha512"
) => Promise<ArrayBuffer>;
compare: (a: ArrayBuffer, b: ArrayBuffer) => Promise<boolean>;
hmacFast: (
value: ArrayBuffer | string,
key: ArrayBuffer | string,
algorithm: "sha1" | "sha256" | "sha512"
) => Promise<ArrayBuffer | string>;
compareFast: (a: ArrayBuffer | string, b: ArrayBuffer | string) => Promise<boolean>;
aesEncrypt: (data: ArrayBuffer, iv: ArrayBuffer, key: ArrayBuffer) => Promise<ArrayBuffer>;
aesDecryptFastParameters: (
data: string,
iv: string,
mac: string,
key: SymmetricCryptoKey
) => DecryptParameters<ArrayBuffer | string>;
aesDecryptFast: (parameters: DecryptParameters<ArrayBuffer | string>) => Promise<string>;
aesDecrypt: (data: ArrayBuffer, iv: ArrayBuffer, key: ArrayBuffer) => Promise<ArrayBuffer>;
rsaEncrypt: (
data: ArrayBuffer,
publicKey: ArrayBuffer,
algorithm: "sha1" | "sha256"
) => Promise<ArrayBuffer>;
rsaDecrypt: (
data: ArrayBuffer,
privateKey: ArrayBuffer,
algorithm: "sha1" | "sha256"
) => Promise<ArrayBuffer>;
rsaExtractPublicKey: (privateKey: ArrayBuffer) => Promise<ArrayBuffer>;
rsaGenerateKeyPair: (length: 1024 | 2048 | 4096) => Promise<[ArrayBuffer, ArrayBuffer]>;
randomBytes: (length: number) => Promise<ArrayBuffer>;
} }

48
common/src/abstractions/environment.service.ts
View File

@@ -1,34 +1,34 @@
import { Observable } from 'rxjs'; import { Observable } from "rxjs";
export type Urls = { export type Urls = {
base?: string; base?: string;
webVault?: string; webVault?: string;
api?: string; api?: string;
identity?: string; identity?: string;
icons?: string; icons?: string;
notifications?: string; notifications?: string;
events?: string; events?: string;
keyConnector?: string; keyConnector?: string;
}; };
export type PayPalConfig = { export type PayPalConfig = {
businessId?: string; businessId?: string;
buttonAction?: string; buttonAction?: string;
}; };
export abstract class EnvironmentService { export abstract class EnvironmentService {
urls: Observable<Urls>; urls: Observable<Urls>;
hasBaseUrl: () => boolean; hasBaseUrl: () => boolean;
getNotificationsUrl: () => string; getNotificationsUrl: () => string;
getWebVaultUrl: () => string; getWebVaultUrl: () => string;
getSendUrl: () => string; getSendUrl: () => string;
getIconsUrl: () => string; getIconsUrl: () => string;
getApiUrl: () => string; getApiUrl: () => string;
getIdentityUrl: () => string; getIdentityUrl: () => string;
getEventsUrl: () => string; getEventsUrl: () => string;
getKeyConnectorUrl: () => string; getKeyConnectorUrl: () => string;
setUrlsFromStorage: () => Promise<void>; setUrlsFromStorage: () => Promise<void>;
setUrls: (urls: any, saveSettings?: boolean) => Promise<Urls>; setUrls: (urls: any, saveSettings?: boolean) => Promise<Urls>;
getUrls: () => Urls; getUrls: () => Urls;
} }

13
common/src/abstractions/export.service.ts
View File

@@ -1,8 +1,11 @@
import { EventView } from '../models/view/eventView'; import { EventView } from "../models/view/eventView";
export abstract class ExportService { export abstract class ExportService {
getExport: (format?: 'csv' | 'json' | 'encrypted_json') => Promise<string>; getExport: (format?: "csv" | "json" | "encrypted_json") => Promise<string>;
getOrganizationExport: (organizationId: string, format?: 'csv' | 'json' | 'encrypted_json') => Promise<string>; getOrganizationExport: (
getEventExport: (events: EventView[]) => Promise<string>; organizationId: string,
getFileName: (prefix?: string, extension?: string) => string; format?: "csv" | "json" | "encrypted_json"
) => Promise<string>;
getEventExport: (events: EventView[]) => Promise<string>;
getFileName: (prefix?: string, extension?: string) => string;
} }

23
common/src/abstractions/fileUpload.service.ts
View File

@@ -1,11 +1,18 @@
import { EncArrayBuffer } from '../models/domain/encArrayBuffer'; import { EncArrayBuffer } from "../models/domain/encArrayBuffer";
import { EncString } from '../models/domain/encString'; import { EncString } from "../models/domain/encString";
import { AttachmentUploadDataResponse } from '../models/response/attachmentUploadDataResponse'; import { AttachmentUploadDataResponse } from "../models/response/attachmentUploadDataResponse";
import { SendFileUploadDataResponse } from '../models/response/sendFileUploadDataResponse'; import { SendFileUploadDataResponse } from "../models/response/sendFileUploadDataResponse";
export abstract class FileUploadService { export abstract class FileUploadService {
uploadSendFile: (uploadData: SendFileUploadDataResponse, fileName: EncString, uploadSendFile: (
encryptedFileData: EncArrayBuffer) => Promise<any>; uploadData: SendFileUploadDataResponse,
uploadCipherAttachment: (admin: boolean, uploadData: AttachmentUploadDataResponse, fileName: EncString, fileName: EncString,
encryptedFileData: EncArrayBuffer) => Promise<any>; encryptedFileData: EncArrayBuffer
) => Promise<any>;
uploadCipherAttachment: (
admin: boolean,
uploadData: AttachmentUploadDataResponse,
fileName: EncString,
encryptedFileData: EncArrayBuffer
) => Promise<any>;
} }

14
common/src/abstractions/i18n.service.ts
View File

@@ -1,9 +1,9 @@
export abstract class I18nService { export abstract class I18nService {
locale: string; locale: string;
supportedTranslationLocales: string[]; supportedTranslationLocales: string[];
translationLocale: string; translationLocale: string;
collator: Intl.Collator; collator: Intl.Collator;
localeNames: Map<string, string>; localeNames: Map<string, string>;
t: (id: string, p1?: string, p2?: string, p3?: string) => string; t: (id: string, p1?: string, p2?: string, p3?: string) => string;
translate: (id: string, p1?: string, p2?: string, p3?: string) => string; translate: (id: string, p1?: string, p2?: string, p3?: string) => string;
} }

16
common/src/abstractions/import.service.ts
View File

@@ -1,13 +1,13 @@
import { Importer } from '../importers/importer'; import { Importer } from "../importers/importer";
export interface ImportOption { export interface ImportOption {
id: string; id: string;
name: string; name: string;
} }
export abstract class ImportService { export abstract class ImportService {
featuredImportOptions: ImportOption[]; featuredImportOptions: ImportOption[];
regularImportOptions: ImportOption[]; regularImportOptions: ImportOption[];
getImportOptions: () => ImportOption[]; getImportOptions: () => ImportOption[];
import: (importer: Importer, fileContents: string, organizationId?: string) => Promise<Error>; import: (importer: Importer, fileContents: string, organizationId?: string) => Promise<Error>;
getImporter: (format: string, organizationId: string) => Importer; getImporter: (format: string, organizationId: string) => Importer;
} }

22
common/src/abstractions/keyConnector.service.ts
View File

@@ -1,14 +1,14 @@
import { Organization } from '../models/domain/organization'; import { Organization } from "../models/domain/organization";
export abstract class KeyConnectorService { export abstract class KeyConnectorService {
getAndSetKey: (url?: string) => Promise<void>; getAndSetKey: (url?: string) => Promise<void>;
getManagingOrganization: () => Promise<Organization>; getManagingOrganization: () => Promise<Organization>;
getUsesKeyConnector: () => Promise<boolean>; getUsesKeyConnector: () => Promise<boolean>;
migrateUser: () => Promise<void>; migrateUser: () => Promise<void>;
userNeedsMigration: () => Promise<boolean>; userNeedsMigration: () => Promise<boolean>;
setUsesKeyConnector: (enabled: boolean) => Promise<void>; setUsesKeyConnector: (enabled: boolean) => Promise<void>;
setConvertAccountRequired: (status: boolean) => Promise<void>; setConvertAccountRequired: (status: boolean) => Promise<void>;
getConvertAccountRequired: () => Promise<boolean>; getConvertAccountRequired: () => Promise<boolean>;
removeConvertAccountRequired: () => Promise<void>; removeConvertAccountRequired: () => Promise<void>;
clear: () => Promise<void>; clear: () => Promise<void>;
} }

16
common/src/abstractions/log.service.ts
View File

@@ -1,11 +1,11 @@
import { LogLevelType } from '../enums/logLevelType'; import { LogLevelType } from "../enums/logLevelType";
export abstract class LogService { export abstract class LogService {
debug: (message: string) => void; debug: (message: string) => void;
info: (message: string) => void; info: (message: string) => void;
warning: (message: string) => void; warning: (message: string) => void;
error: (message: string) => void; error: (message: string) => void;
write: (level: LogLevelType, message: string) => void; write: (level: LogLevelType, message: string) => void;
time: (label: string) => void; time: (label: string) => void;
timeEnd: (label: string) => [number, number]; timeEnd: (label: string) => [number, number];
} }

2
common/src/abstractions/messaging.service.ts
View File

@@ -1,3 +1,3 @@
export abstract class MessagingService { export abstract class MessagingService {
send: (subscriber: string, arg?: any) => void; send: (subscriber: string, arg?: any) => void;
} }

8
common/src/abstractions/notifications.service.ts
View File

@@ -1,6 +1,6 @@
export abstract class NotificationsService { export abstract class NotificationsService {
init: () => Promise<void>; init: () => Promise<void>;
updateConnection: (sync?: boolean) => Promise<void>; updateConnection: (sync?: boolean) => Promise<void>;
reconnectFromActivity: () => Promise<void>; reconnectFromActivity: () => Promise<void>;
disconnectFromInactivity: () => Promise<void>; disconnectFromInactivity: () => Promise<void>;
} }

6
common/src/abstractions/passwordReprompt.service.ts
View File

@@ -1,5 +1,5 @@
export abstract class PasswordRepromptService { export abstract class PasswordRepromptService {
protectedFields: () => string[]; protectedFields: () => string[];
showPasswordPrompt: () => Promise<boolean>; showPasswordPrompt: () => Promise<boolean>;
enabled: () => Promise<boolean>; enabled: () => Promise<boolean>;
} }

24
common/src/abstractions/search.service.ts
View File

@@ -1,14 +1,16 @@
import { CipherView } from '../models/view/cipherView'; import { CipherView } from "../models/view/cipherView";
import { SendView } from '../models/view/sendView'; import { SendView } from "../models/view/sendView";
export abstract class SearchService { export abstract class SearchService {
indexedEntityId?: string = null; indexedEntityId?: string = null;
clearIndex: () => void; clearIndex: () => void;
isSearchable: (query: string) => boolean; isSearchable: (query: string) => boolean;
indexCiphers: (indexedEntityGuid?: string, ciphersToIndex?: CipherView[]) => Promise<void>; indexCiphers: (indexedEntityGuid?: string, ciphersToIndex?: CipherView[]) => Promise<void>;
searchCiphers: (query: string, searchCiphers: (
filter?: ((cipher: CipherView) => boolean) | (((cipher: CipherView) => boolean)[]), query: string,
ciphers?: CipherView[]) => Promise<CipherView[]>; filter?: ((cipher: CipherView) => boolean) | ((cipher: CipherView) => boolean)[],
searchCiphersBasic: (ciphers: CipherView[], query: string, deleted?: boolean) => CipherView[]; ciphers?: CipherView[]
searchSends: (sends: SendView[], query: string) => SendView[]; ) => Promise<CipherView[]>;
searchCiphersBasic: (ciphers: CipherView[], query: string, deleted?: boolean) => CipherView[];
searchSends: (sends: SendView[], query: string) => SendView[];
} }

6
common/src/abstractions/totp.service.ts
View File

@@ -1,5 +1,5 @@
export abstract class TotpService { export abstract class TotpService {
getCode: (key: string) => Promise<string>; getCode: (key: string) => Promise<string>;
getTimeInterval: (key: string) => number; getTimeInterval: (key: string) => number;
isAutoCopyEnabled: () => Promise<boolean>; isAutoCopyEnabled: () => Promise<boolean>;
} }

15
common/src/abstractions/userVerification.service.ts
View File

@@ -1,10 +1,13 @@
import { SecretVerificationRequest } from '../models/request/secretVerificationRequest'; import { SecretVerificationRequest } from "../models/request/secretVerificationRequest";
import { Verification } from '../types/verification'; import { Verification } from "../types/verification";
export abstract class UserVerificationService { export abstract class UserVerificationService {
buildRequest: <T extends SecretVerificationRequest> (verification: Verification, buildRequest: <T extends SecretVerificationRequest>(
requestClass?: new () => T, alreadyHashed?: boolean) => Promise<T>; verification: Verification,
verifyUser: (verification: Verification) => Promise<boolean>; requestClass?: new () => T,
requestOTP: () => Promise<void>; alreadyHashed?: boolean
) => Promise<T>;
verifyUser: (verification: Verification) => Promise<boolean>;
requestOTP: () => Promise<void>;
} }

4
common/src/enums/cipherRepromptType.ts
View File

@@ -1,4 +1,4 @@
export enum CipherRepromptType { export enum CipherRepromptType {
None = 0, None = 0,
Password = 1, Password = 1,
} }

8
common/src/enums/cipherType.ts
View File

@@ -1,6 +1,6 @@
export enum CipherType { export enum CipherType {
Login = 1, Login = 1,
SecureNote = 2, SecureNote = 2,
Card = 3, Card = 3,
Identity = 4, Identity = 4,
} }

42
common/src/enums/deviceType.ts
View File

@@ -1,23 +1,23 @@
export enum DeviceType { export enum DeviceType {
Android = 0, Android = 0,
iOS = 1, iOS = 1,
ChromeExtension = 2, ChromeExtension = 2,
FirefoxExtension = 3, FirefoxExtension = 3,
OperaExtension = 4, OperaExtension = 4,
EdgeExtension = 5, EdgeExtension = 5,
WindowsDesktop = 6, WindowsDesktop = 6,
MacOsDesktop = 7, MacOsDesktop = 7,
LinuxDesktop = 8, LinuxDesktop = 8,
ChromeBrowser = 9, ChromeBrowser = 9,
FirefoxBrowser = 10, FirefoxBrowser = 10,
OperaBrowser = 11, OperaBrowser = 11,
EdgeBrowser = 12, EdgeBrowser = 12,
IEBrowser = 13, IEBrowser = 13,
UnknownBrowser = 14, UnknownBrowser = 14,
AndroidAmazon = 15, AndroidAmazon = 15,
UWP = 16, UWP = 16,
SafariBrowser = 17, SafariBrowser = 17,
VivaldiBrowser = 18, VivaldiBrowser = 18,
VivaldiExtension = 19, VivaldiExtension = 19,
SafariExtension = 20, SafariExtension = 20,
} }

10
common/src/enums/emergencyAccessStatusType.ts
View File

@@ -1,7 +1,7 @@
export enum EmergencyAccessStatusType { export enum EmergencyAccessStatusType {
Invited = 0, Invited = 0,
Accepted = 1, Accepted = 1,
Confirmed = 2, Confirmed = 2,
RecoveryInitiated = 3, RecoveryInitiated = 3,
RecoveryApproved = 4, RecoveryApproved = 4,
} }

7
common/src/enums/emergencyAccessType.ts
View File

@@ -1,5 +1,4 @@
export enum EmergencyAccessType export enum EmergencyAccessType {
{ View = 0,
View = 0, Takeover = 1,
Takeover = 1,
} }

14
common/src/enums/encryptionType.ts
View File

@@ -1,9 +1,9 @@
export enum EncryptionType { export enum EncryptionType {
AesCbc256_B64 = 0, AesCbc256_B64 = 0,
AesCbc128_HmacSha256_B64 = 1, AesCbc128_HmacSha256_B64 = 1,
AesCbc256_HmacSha256_B64 = 2, AesCbc256_HmacSha256_B64 = 2,
Rsa2048_OaepSha256_B64 = 3, Rsa2048_OaepSha256_B64 = 3,
Rsa2048_OaepSha1_B64 = 4, Rsa2048_OaepSha1_B64 = 4,
Rsa2048_OaepSha256_HmacSha256_B64 = 5, Rsa2048_OaepSha256_HmacSha256_B64 = 5,
Rsa2048_OaepSha1_HmacSha256_B64 = 6, Rsa2048_OaepSha1_HmacSha256_B64 = 6,
} }

124
common/src/enums/eventType.ts
View File

@@ -1,72 +1,72 @@
export enum EventType { export enum EventType {
User_LoggedIn = 1000, User_LoggedIn = 1000,
User_ChangedPassword = 1001, User_ChangedPassword = 1001,
User_Updated2fa = 1002, User_Updated2fa = 1002,
User_Disabled2fa = 1003, User_Disabled2fa = 1003,
User_Recovered2fa = 1004, User_Recovered2fa = 1004,
User_FailedLogIn = 1005, User_FailedLogIn = 1005,
User_FailedLogIn2fa = 1006, User_FailedLogIn2fa = 1006,
User_ClientExportedVault = 1007, User_ClientExportedVault = 1007,
User_UpdatedTempPassword = 1008, User_UpdatedTempPassword = 1008,
User_MigratedKeyToKeyConnector = 1009, User_MigratedKeyToKeyConnector = 1009,
Cipher_Created = 1100, Cipher_Created = 1100,
Cipher_Updated = 1101, Cipher_Updated = 1101,
Cipher_Deleted = 1102, Cipher_Deleted = 1102,
Cipher_AttachmentCreated = 1103, Cipher_AttachmentCreated = 1103,
Cipher_AttachmentDeleted = 1104, Cipher_AttachmentDeleted = 1104,
Cipher_Shared = 1105, Cipher_Shared = 1105,
Cipher_UpdatedCollections = 1106, Cipher_UpdatedCollections = 1106,
Cipher_ClientViewed = 1107, Cipher_ClientViewed = 1107,
Cipher_ClientToggledPasswordVisible = 1108, Cipher_ClientToggledPasswordVisible = 1108,
Cipher_ClientToggledHiddenFieldVisible = 1109, Cipher_ClientToggledHiddenFieldVisible = 1109,
Cipher_ClientToggledCardCodeVisible = 1110, Cipher_ClientToggledCardCodeVisible = 1110,
Cipher_ClientCopiedPassword = 1111, Cipher_ClientCopiedPassword = 1111,
Cipher_ClientCopiedHiddenField = 1112, Cipher_ClientCopiedHiddenField = 1112,
Cipher_ClientCopiedCardCode = 1113, Cipher_ClientCopiedCardCode = 1113,
Cipher_ClientAutofilled = 1114, Cipher_ClientAutofilled = 1114,
Cipher_SoftDeleted = 1115, Cipher_SoftDeleted = 1115,
Cipher_Restored = 1116, Cipher_Restored = 1116,
Cipher_ClientToggledCardNumberVisible = 1117, Cipher_ClientToggledCardNumberVisible = 1117,
Collection_Created = 1300, Collection_Created = 1300,
Collection_Updated = 1301, Collection_Updated = 1301,
Collection_Deleted = 1302, Collection_Deleted = 1302,
Group_Created = 1400, Group_Created = 1400,
Group_Updated = 1401, Group_Updated = 1401,
Group_Deleted = 1402, Group_Deleted = 1402,
OrganizationUser_Invited = 1500, OrganizationUser_Invited = 1500,
OrganizationUser_Confirmed = 1501, OrganizationUser_Confirmed = 1501,
OrganizationUser_Updated = 1502, OrganizationUser_Updated = 1502,
OrganizationUser_Removed = 1503, OrganizationUser_Removed = 1503,
OrganizationUser_UpdatedGroups = 1504, OrganizationUser_UpdatedGroups = 1504,
OrganizationUser_UnlinkedSso = 1505, OrganizationUser_UnlinkedSso = 1505,
OrganizationUser_ResetPassword_Enroll = 1506, OrganizationUser_ResetPassword_Enroll = 1506,
OrganizationUser_ResetPassword_Withdraw = 1507, OrganizationUser_ResetPassword_Withdraw = 1507,
OrganizationUser_AdminResetPassword = 1508, OrganizationUser_AdminResetPassword = 1508,
OrganizationUser_ResetSsoLink = 1509, OrganizationUser_ResetSsoLink = 1509,
OrganizationUser_FirstSsoLogin = 1510, OrganizationUser_FirstSsoLogin = 1510,
Organization_Updated = 1600, Organization_Updated = 1600,
Organization_PurgedVault = 1601, Organization_PurgedVault = 1601,
// Organization_ClientExportedVault = 1602, // Organization_ClientExportedVault = 1602,
Organization_VaultAccessed = 1603, Organization_VaultAccessed = 1603,
Organization_EnabledSso = 1604, Organization_EnabledSso = 1604,
Organization_DisabledSso = 1605, Organization_DisabledSso = 1605,
Organization_EnabledKeyConnector = 1606, Organization_EnabledKeyConnector = 1606,
Organization_DisabledKeyConnector = 1607, Organization_DisabledKeyConnector = 1607,
Policy_Updated = 1700, Policy_Updated = 1700,
ProviderUser_Invited = 1800, ProviderUser_Invited = 1800,
ProviderUser_Confirmed = 1801, ProviderUser_Confirmed = 1801,
ProviderUser_Updated = 1802, ProviderUser_Updated = 1802,
ProviderUser_Removed = 1803, ProviderUser_Removed = 1803,
ProviderOrganization_Created = 1900, ProviderOrganization_Created = 1900,
ProviderOrganization_Added = 1901, ProviderOrganization_Added = 1901,
ProviderOrganization_Removed = 1902, ProviderOrganization_Removed = 1902,
ProviderOrganization_VaultAccessed = 1903, ProviderOrganization_VaultAccessed = 1903,
} }

8
common/src/enums/fieldType.ts
View File

@@ -1,6 +1,6 @@
export enum FieldType { export enum FieldType {
Text = 0, Text = 0,
Hidden = 1, Hidden = 1,
Boolean = 2, Boolean = 2,
Linked = 3, Linked = 3,
} }

4
common/src/enums/fileUploadType.ts
View File

@@ -1,4 +1,4 @@
export enum FileUploadType { export enum FileUploadType {
Direct = 0, Direct = 0,
Azure = 1, Azure = 1,
} }

4
common/src/enums/hashPurpose.ts
View File

@@ -1,4 +1,4 @@
export enum HashPurpose { export enum HashPurpose {
ServerAuthorization = 1, ServerAuthorization = 1,
LocalAuthorization = 2, LocalAuthorization = 2,
} }

2
common/src/enums/kdfType.ts
View File

@@ -1,3 +1,3 @@
export enum KdfType { export enum KdfType {
PBKDF2_SHA256 = 0, PBKDF2_SHA256 = 0,
} }

54
common/src/enums/linkedIdType.ts
View File

@@ -2,39 +2,39 @@ export type LinkedIdType = LoginLinkedId | CardLinkedId | IdentityLinkedId;
// LoginView // LoginView
export enum LoginLinkedId { export enum LoginLinkedId {
Username = 100, Username = 100,
Password = 101, Password = 101,
} }
// CardView // CardView
export enum CardLinkedId { export enum CardLinkedId {
CardholderName = 300, CardholderName = 300,
ExpMonth = 301, ExpMonth = 301,
ExpYear = 302, ExpYear = 302,
Code = 303, Code = 303,
Brand = 304, Brand = 304,
Number = 305, Number = 305,
} }
// IdentityView // IdentityView
export enum IdentityLinkedId { export enum IdentityLinkedId {
Title = 400, Title = 400,
MiddleName = 401, MiddleName = 401,
Address1 = 402, Address1 = 402,
Address2 = 403, Address2 = 403,
Address3 = 404, Address3 = 404,
City = 405, City = 405,
State = 406, State = 406,
PostalCode = 407, PostalCode = 407,
Country = 408, Country = 408,
Company = 409, Company = 409,
Email = 410, Email = 410,
Phone = 411, Phone = 411,
Ssn = 412, Ssn = 412,
Username = 413, Username = 413,
PassportNumber = 414, PassportNumber = 414,
LicenseNumber = 415, LicenseNumber = 415,
FirstName = 416, FirstName = 416,
LastName = 417, LastName = 417,
FullName = 418, FullName = 418,
} }

8
common/src/enums/logLevelType.ts
View File

@@ -1,6 +1,6 @@
export enum LogLevelType { export enum LogLevelType {
Debug, Debug,
Info, Info,
Warning, Warning,
Error, Error,
} }

30
common/src/enums/notificationType.ts
View File

@@ -1,20 +1,20 @@
export enum NotificationType { export enum NotificationType {
SyncCipherUpdate = 0, SyncCipherUpdate = 0,
SyncCipherCreate = 1, SyncCipherCreate = 1,
SyncLoginDelete = 2, SyncLoginDelete = 2,
SyncFolderDelete = 3, SyncFolderDelete = 3,
SyncCiphers = 4, SyncCiphers = 4,
SyncVault = 5, SyncVault = 5,
SyncOrgKeys = 6, SyncOrgKeys = 6,
SyncFolderCreate = 7, SyncFolderCreate = 7,
SyncFolderUpdate = 8, SyncFolderUpdate = 8,
SyncCipherDelete = 9, SyncCipherDelete = 9,
SyncSettings = 10, SyncSettings = 10,
LogOut = 11, LogOut = 11,
SyncSendCreate = 12, SyncSendCreate = 12,
SyncSendUpdate = 13, SyncSendUpdate = 13,
SyncSendDelete = 14, SyncSendDelete = 14,
} }

6
common/src/enums/organizationUserStatusType.ts
View File

@@ -1,5 +1,5 @@
export enum OrganizationUserStatusType { export enum OrganizationUserStatusType {
Invited = 0, Invited = 0,
Accepted = 1, Accepted = 1,
Confirmed = 2, Confirmed = 2,
} }

10
common/src/enums/organizationUserType.ts
View File

@@ -1,7 +1,7 @@
export enum OrganizationUserType { export enum OrganizationUserType {
Owner = 0, Owner = 0,
Admin = 1, Admin = 1,
User = 2, User = 2,
Manager = 3, Manager = 3,
Custom = 4, Custom = 4,
} }

18
common/src/enums/paymentMethodType.ts
View File

@@ -1,11 +1,11 @@
export enum PaymentMethodType { export enum PaymentMethodType {
Card = 0, Card = 0,
BankAccount = 1, BankAccount = 1,
PayPal = 2, PayPal = 2,
BitPay = 3, BitPay = 3,
Credit = 4, Credit = 4,
WireTransfer = 5, WireTransfer = 5,
AppleInApp = 6, AppleInApp = 6,
GoogleInApp = 7, GoogleInApp = 7,
Check = 8, Check = 8,
} }

50
common/src/enums/permissions.ts
View File

@@ -1,27 +1,27 @@
export enum Permissions { export enum Permissions {
AccessEventLogs, AccessEventLogs,
AccessImportExport, AccessImportExport,
AccessReports, AccessReports,
/** /**
* @deprecated Sep 29 2021: This permission has been split out to `createNewCollections`, `editAnyCollection`, and * @deprecated Sep 29 2021: This permission has been split out to `createNewCollections`, `editAnyCollection`, and
* `deleteAnyCollection`. It exists here for backwards compatibility with Server versions <= 1.43.0 * `deleteAnyCollection`. It exists here for backwards compatibility with Server versions <= 1.43.0
*/ */
ManageAllCollections, ManageAllCollections,
/** /**
* @deprecated Sep 29 2021: This permission has been split out to `editAssignedCollections` and * @deprecated Sep 29 2021: This permission has been split out to `editAssignedCollections` and
* `deleteAssignedCollections`. It exists here for backwards compatibility with Server versions <= 1.43.0 * `deleteAssignedCollections`. It exists here for backwards compatibility with Server versions <= 1.43.0
*/ */
ManageAssignedCollections, ManageAssignedCollections,
ManageGroups, ManageGroups,
ManageOrganization , ManageOrganization,
ManagePolicies, ManagePolicies,
ManageProvider, ManageProvider,
ManageUsers, ManageUsers,
ManageUsersPassword, ManageUsersPassword,
CreateNewCollections, CreateNewCollections,
EditAnyCollection, EditAnyCollection,
DeleteAnyCollection, DeleteAnyCollection,
EditAssignedCollections, EditAssignedCollections,
DeleteAssignedCollections, DeleteAssignedCollections,
ManageSso, ManageSso,
} }

2
common/src/enums/planSponsorshipType.ts
View File

@@ -1,3 +1,3 @@
export enum PlanSponsorshipType { export enum PlanSponsorshipType {
FamiliesForEnterprise = 0, FamiliesForEnterprise = 0,
} }

24
common/src/enums/planType.ts
View File

@@ -1,14 +1,14 @@
export enum PlanType { export enum PlanType {
Free = 0, Free = 0,
FamiliesAnnually2019 = 1, FamiliesAnnually2019 = 1,
TeamsMonthly2019 = 2, TeamsMonthly2019 = 2,
TeamsAnnually2019 = 3, TeamsAnnually2019 = 3,
EnterpriseMonthly2019 = 4, EnterpriseMonthly2019 = 4,
EnterpriseAnnually2019 = 5, EnterpriseAnnually2019 = 5,
Custom = 6, Custom = 6,
FamiliesAnnually = 7, FamiliesAnnually = 7,
TeamsMonthly = 8, TeamsMonthly = 8,
TeamsAnnually = 9, TeamsAnnually = 9,
EnterpriseMonthly = 10, EnterpriseMonthly = 10,
EnterpriseAnnually = 11, EnterpriseAnnually = 11,
} }

22
common/src/enums/policyType.ts
View File

@@ -1,13 +1,13 @@
export enum PolicyType { export enum PolicyType {
TwoFactorAuthentication = 0, // Requires users to have 2fa enabled TwoFactorAuthentication = 0, // Requires users to have 2fa enabled
MasterPassword = 1, // Sets minimum requirements for master password complexity MasterPassword = 1, // Sets minimum requirements for master password complexity
PasswordGenerator = 2, // Sets minimum requirements/default type for generated passwords/passphrases PasswordGenerator = 2, // Sets minimum requirements/default type for generated passwords/passphrases
SingleOrg = 3, // Allows users to only be apart of one organization SingleOrg = 3, // Allows users to only be apart of one organization
RequireSso = 4, // Requires users to authenticate with SSO RequireSso = 4, // Requires users to authenticate with SSO
PersonalOwnership = 5, // Disables personal vault ownership for adding/cloning items PersonalOwnership = 5, // Disables personal vault ownership for adding/cloning items
DisableSend = 6, // Disables the ability to create and edit Bitwarden Sends DisableSend = 6, // Disables the ability to create and edit Bitwarden Sends
SendOptions = 7, // Sets restrictions or defaults for Bitwarden Sends SendOptions = 7, // Sets restrictions or defaults for Bitwarden Sends
ResetPassword = 8, // Allows orgs to use reset password : also can enable auto-enrollment during invite flow ResetPassword = 8, // Allows orgs to use reset password : also can enable auto-enrollment during invite flow
MaximumVaultTimeout = 9, // Sets the maximum allowed vault timeout MaximumVaultTimeout = 9, // Sets the maximum allowed vault timeout
DisablePersonalVaultExport = 10, // Disable personal vault export DisablePersonalVaultExport = 10, // Disable personal vault export
} }

8
common/src/enums/productType.ts
View File

@@ -1,6 +1,6 @@
export enum ProductType { export enum ProductType {
Free = 0, Free = 0,
Families = 1, Families = 1,
Teams = 2, Teams = 2,
Enterprise = 3, Enterprise = 3,
} }

6
common/src/enums/providerUserStatusType.ts
View File

@@ -1,5 +1,5 @@
export enum ProviderUserStatusType { export enum ProviderUserStatusType {
Invited = 0, Invited = 0,
Accepted = 1, Accepted = 1,
Confirmed = 2, Confirmed = 2,
} }

4
common/src/enums/providerUserType.ts
View File

@@ -1,4 +1,4 @@
export enum ProviderUserType { export enum ProviderUserType {
ProviderAdmin = 0, ProviderAdmin = 0,
ServiceUser = 1, ServiceUser = 1,
} }

2
common/src/enums/secureNoteType.ts
View File

@@ -1,3 +1,3 @@
export enum SecureNoteType { export enum SecureNoteType {
Generic = 0, Generic = 0,
} }

4
common/src/enums/sendType.ts
View File

@@ -1,4 +1,4 @@
export enum SendType { export enum SendType {
Text = 0, Text = 0,
File = 1, File = 1,
} }

10
common/src/enums/themeType.ts
View File

@@ -1,7 +1,7 @@
export enum ThemeType { export enum ThemeType {
System = 'system', System = "system",
Light = 'light', Light = "light",
Dark = 'dark', Dark = "dark",
Nord = 'nord', Nord = "nord",
SolarizedDark = 'solarizedDark', SolarizedDark = "solarizedDark",
} }

10
common/src/enums/transactionType.ts
View File

@@ -1,7 +1,7 @@
export enum TransactionType { export enum TransactionType {
Charge = 0, Charge = 0,
Credit = 1, Credit = 1,
PromotionalCredit = 2, PromotionalCredit = 2,
ReferralCredit = 3, ReferralCredit = 3,
Refund = 4, Refund = 4,
} }

Some files were not shown because too many files have changed in this diff Show More