1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-14 23:33:31 +00:00

[PS-1878] Feature/selfhost anonaddy (#4056)

* Add selfhosted anonaddy url

* Remove newlines

* Add serverurl field to web

* Show anonaddy api errors

* Add forwardedAnonAddyBaseUrl prop to UsernameGeneratorOptions type

* Use Alias Domain instead of just Domain name

This is easier to distinguish between domain and server url

* Only show Server Url on web if on selfhosted bitwarden

---------

Co-authored-by: Daniel James Smith <djsmith@web.de>
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
This commit is contained in:
David Claybourne
2023-09-26 15:34:34 +02:00
committed by GitHub
parent 5616e69e10
commit abd3e66e20
12 changed files with 66 additions and 8 deletions

View File

@@ -2407,6 +2407,9 @@
"message": "Toggle collapse",
"description": "Toggling an expand/collapse state."
},
"aliasDomain": {
"message": "Alias domain"
},
"passwordRepromptDisabledAutofillOnPageLoad": {
"message": "Items with master password re-prompt cannot be auto-filled on page load. Auto-fill on page load turned off.",
"description": "Toast message for describing that master password re-prompt cannot be auto-filled on page load."

View File

@@ -378,7 +378,7 @@
/>
</div>
<div class="box-content-row" appBoxRow>
<label for="anonaddy-domain">{{ "domainName" | i18n }}</label>
<label for="anonaddy-domain">{{ "aliasDomain" | i18n }}</label>
<input
id="anonaddy-domain"
type="text"
@@ -387,6 +387,16 @@
(blur)="saveUsernameOptions()"
/>
</div>
<div class="box-content-row" appBoxRow>
<label for="anonaddy-baseUrl">{{ "baseUrl" | i18n }}</label>
<input
id="anonaddy-baseUrl"
type="text"
name="AnonAddyDomain"
[(ngModel)]="usernameOptions.forwardedAnonAddyBaseUrl"
(blur)="saveUsernameOptions()"
/>
</div>
</ng-container>
<ng-container *ngIf="usernameOptions.forwardedService === 'firefoxrelay'">
<div class="box-content-row" appBoxRow>
@@ -424,7 +434,7 @@
/>
</div>
<div class="box-content-row" appBoxRow>
<label for="forwardemail-domain">{{ "domainName" | i18n }}</label>
<label for="forwardemail-domain">{{ "aliasDomain" | i18n }}</label>
<input
id="forwardemail-domain"
type="text"

View File

@@ -405,7 +405,7 @@
/>
</div>
<div class="box-content-row" appBoxRow>
<label for="anonaddy-domain">{{ "domainName" | i18n }}</label>
<label for="anonaddy-domain">{{ "aliasDomain" | i18n }}</label>
<input
id="anonaddy-domain"
type="text"
@@ -414,6 +414,16 @@
(blur)="saveUsernameOptions()"
/>
</div>
<div class="box-content-row" appBoxRow>
<label for="anonaddy-baseUrl">{{ "baseUrl" | i18n }}</label>
<input
id="anonaddy-baseUrl"
type="text"
name="AnonAddyDomain"
[(ngModel)]="usernameOptions.forwardedAnonAddyBaseUrl"
(blur)="saveUsernameOptions()"
/>
</div>
</ng-container>
<ng-container *ngIf="usernameOptions.forwardedService === 'firefoxrelay'">
<div class="box-content-row" appBoxRow>
@@ -451,7 +461,7 @@
/>
</div>
<div class="box-content-row" appBoxRow>
<label for="forwardemail-domain">{{ "domainName" | i18n }}</label>
<label for="forwardemail-domain">{{ "aliasDomain" | i18n }}</label>
<input
id="forwardemail-domain"
type="text"

View File

@@ -2415,5 +2415,8 @@
},
"submenu": {
"message": "Submenu"
},
"aliasDomain": {
"message": "Alias domain"
}
}

View File

@@ -309,7 +309,7 @@
/>
</div>
<div class="form-group col-4">
<label for="anonaddy-domain">{{ "domainName" | i18n }}</label>
<label for="anonaddy-domain">{{ "aliasDomain" | i18n }}</label>
<input
id="anonaddy-domain"
class="form-control"
@@ -318,6 +318,17 @@
(blur)="saveUsernameOptions()"
/>
</div>
<div class="form-group col-4" *ngIf="isSelfHosted">
<label for="anonaddy-baseUrl">{{ "baseUrl" | i18n }}</label>
<input
id="anonaddy-baseUrl"
class="form-control"
type="text"
name="AnonAddyDomain"
[(ngModel)]="usernameOptions.forwardedAnonAddyBaseUrl"
(blur)="saveUsernameOptions()"
/>
</div>
</div>
<div class="row" *ngIf="usernameOptions.forwardedService === 'firefoxrelay'">
<div class="form-group col-4">
@@ -355,7 +366,7 @@
/>
</div>
<div class="form-group col-4">
<label for="forwardemail-domain">{{ "domainName" | i18n }}</label>
<label for="forwardemail-domain">{{ "aliasDomain" | i18n }}</label>
<input
id="forwardemail-domain"
class="form-control"

View File

@@ -43,6 +43,10 @@ export class GeneratorComponent extends BaseGeneratorComponent {
}
}
get isSelfHosted(): boolean {
return this.platformUtilsService.isSelfHost();
}
async history() {
this.dialogService.open(PasswordGeneratorHistoryComponent);
}

View File

@@ -7169,6 +7169,12 @@
"beta": {
"message": "Beta"
},
"baseUrl": {
"message": "Server URL"
},
"aliasDomain": {
"message": "Alias domain"
},
"alreadyHaveAccount": {
"message": "Already have an account?"
}

View File

@@ -280,7 +280,7 @@ const devServer =
http://127.0.0.1:10000
https://app.simplelogin.io/api/alias/random/new
https://quack.duckduckgo.com/api/email/addresses
https://app.anonaddy.com/api/v1/aliases
https://app.addy.io/api/v1/aliases
https://api.fastmail.com
https://api.forwardemail.net
http://localhost:5000