diff options
author | Josh Morel <morel.josh@hotmail.com> | 2018-08-31 03:18:19 -0400 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-31 09:18:19 +0200 |
commit | d9eaee3939bf2e93e5d775d32bce77842201faba (patch) | |
tree | c115acb3611986b98f51b3addf29ebe66f63ee7f /client/src/app/+verify-account | |
parent | 04291e1ba44032165388758e993d385a10c1c5a1 (diff) | |
download | PeerTube-d9eaee3939bf2e93e5d775d32bce77842201faba.tar.gz PeerTube-d9eaee3939bf2e93e5d775d32bce77842201faba.tar.zst PeerTube-d9eaee3939bf2e93e5d775d32bce77842201faba.zip |
add user account email verificiation (#977)
* add user account email verificiation
includes server and client code to:
* enable verificationRequired via custom config
* send verification email with registration
* ask for verification email
* verify via email
* prevent login if not verified and required
* conditional client links to ask for new verification email
* allow login for verified=null
these are users created when verification not required
should still be able to login when verification is enabled
* refactor email verifcation pr
* change naming from verified to emailVerified
* change naming from askVerifyEmail to askSendVerifyEmail
* undo unrelated automatic prettier formatting on api/config
* use redirectService for home
* remove redundant success notification on email verified
* revert test.yaml smpt host
Diffstat (limited to 'client/src/app/+verify-account')
8 files changed, 232 insertions, 0 deletions
diff --git a/client/src/app/+verify-account/index.ts b/client/src/app/+verify-account/index.ts new file mode 100644 index 000000000..733f5ba77 --- /dev/null +++ b/client/src/app/+verify-account/index.ts | |||
@@ -0,0 +1,2 @@ | |||
1 | export * from '@app/+verify-account/verify-account-routing.module' | ||
2 | export * from '@app/+verify-account/verify-account.module' | ||
diff --git a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html new file mode 100644 index 000000000..2e4180632 --- /dev/null +++ b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html | |||
@@ -0,0 +1,22 @@ | |||
1 | <div class="margin-content"> | ||
2 | <div i18n class="title-page title-page-single"> | ||
3 | Request email for account verification | ||
4 | </div> | ||
5 | |||
6 | <form *ngIf="requiresEmailVerification; else emailVerificationNotRequired" role="form" (ngSubmit)="askSendVerifyEmail()" [formGroup]="form"> | ||
7 | <div class="form-group"> | ||
8 | <label i18n for="verify-email-email">Email</label> | ||
9 | <input | ||
10 | type="email" id="verify-email-email" i18n-placeholder placeholder="Email address" required | ||
11 | formControlName="verify-email-email" [ngClass]="{ 'input-error': formErrors['verify-email-email'] }" | ||
12 | > | ||
13 | <div *ngIf="formErrors['verify-email-email']" class="form-error"> | ||
14 | {{ formErrors['verify-email-email'] }} | ||
15 | </div> | ||
16 | </div> | ||
17 | <input type="submit" i18n-value value="Send verification email" [disabled]="!form.valid"> | ||
18 | </form> | ||
19 | <ng-template #emailVerificationNotRequired> | ||
20 | <div i18n>This instance does not require email verification.</div> | ||
21 | </ng-template> | ||
22 | </div> | ||
diff --git a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.scss b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.scss new file mode 100644 index 000000000..efec6b706 --- /dev/null +++ b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.scss | |||
@@ -0,0 +1,12 @@ | |||
1 | @import '_variables'; | ||
2 | @import '_mixins'; | ||
3 | |||
4 | input:not([type=submit]) { | ||
5 | @include peertube-input-text(340px); | ||
6 | display: block; | ||
7 | } | ||
8 | |||
9 | input[type=submit] { | ||
10 | @include peertube-button; | ||
11 | @include orange-button; | ||
12 | } | ||
diff --git a/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts new file mode 100644 index 000000000..995f42ffc --- /dev/null +++ b/client/src/app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts | |||
@@ -0,0 +1,58 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | ||
2 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
3 | import { NotificationsService } from 'angular2-notifications' | ||
4 | import { ServerService } from '@app/core/server' | ||
5 | import { RedirectService } from '@app/core' | ||
6 | import { UserService, FormReactive } from '@app/shared' | ||
7 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | ||
8 | import { UserValidatorsService } from '@app/shared/forms/form-validators/user-validators.service' | ||
9 | |||
10 | @Component({ | ||
11 | selector: 'my-verify-account-ask-send-email', | ||
12 | templateUrl: './verify-account-ask-send-email.component.html', | ||
13 | styleUrls: [ './verify-account-ask-send-email.component.scss' ] | ||
14 | }) | ||
15 | |||
16 | export class VerifyAccountAskSendEmailComponent extends FormReactive implements OnInit { | ||
17 | |||
18 | constructor ( | ||
19 | protected formValidatorService: FormValidatorService, | ||
20 | private userValidatorsService: UserValidatorsService, | ||
21 | private userService: UserService, | ||
22 | private serverService: ServerService, | ||
23 | private notificationsService: NotificationsService, | ||
24 | private redirectService: RedirectService, | ||
25 | private i18n: I18n | ||
26 | ) { | ||
27 | super() | ||
28 | } | ||
29 | |||
30 | get requiresEmailVerification () { | ||
31 | return this.serverService.getConfig().signup.requiresEmailVerification | ||
32 | } | ||
33 | |||
34 | ngOnInit () { | ||
35 | this.buildForm({ | ||
36 | 'verify-email-email': this.userValidatorsService.USER_EMAIL | ||
37 | }) | ||
38 | } | ||
39 | |||
40 | askSendVerifyEmail () { | ||
41 | const email = this.form.value['verify-email-email'] | ||
42 | this.userService.askSendVerifyEmail(email) | ||
43 | .subscribe( | ||
44 | () => { | ||
45 | const message = this.i18n( | ||
46 | 'An email with verification link will be sent to {{email}}.', | ||
47 | { email } | ||
48 | ) | ||
49 | this.notificationsService.success(this.i18n('Success'), message) | ||
50 | this.redirectService.redirectToHomepage() | ||
51 | }, | ||
52 | |||
53 | err => { | ||
54 | this.notificationsService.error(this.i18n('Error'), err.message) | ||
55 | } | ||
56 | ) | ||
57 | } | ||
58 | } | ||
diff --git a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html new file mode 100644 index 000000000..30ace5e10 --- /dev/null +++ b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.html | |||
@@ -0,0 +1,15 @@ | |||
1 | <div class="margin-content"> | ||
2 | <div i18n class="title-page title-page-single"> | ||
3 | Verify account email confirmation | ||
4 | </div> | ||
5 | |||
6 | <div i18n *ngIf="success; else verificationError"> | ||
7 | Your email has been verified and you may now login. Redirecting... | ||
8 | </div> | ||
9 | <ng-template #verificationError> | ||
10 | <div> | ||
11 | <span i18n>An error occurred. </span> | ||
12 | <a i18n routerLink="/verify-account/ask-email">Request new verification email.</a> | ||
13 | </div> | ||
14 | </ng-template> | ||
15 | </div> | ||
diff --git a/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts new file mode 100644 index 000000000..26b3bf4b1 --- /dev/null +++ b/client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts | |||
@@ -0,0 +1,54 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | ||
2 | import { ActivatedRoute, Router } from '@angular/router' | ||
3 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
4 | import { NotificationsService } from 'angular2-notifications' | ||
5 | import { UserService } from '@app/shared' | ||
6 | |||
7 | @Component({ | ||
8 | selector: 'my-verify-account-email', | ||
9 | templateUrl: './verify-account-email.component.html' | ||
10 | }) | ||
11 | |||
12 | export class VerifyAccountEmailComponent implements OnInit { | ||
13 | success = false | ||
14 | |||
15 | private userId: number | ||
16 | private verificationString: string | ||
17 | |||
18 | constructor ( | ||
19 | private userService: UserService, | ||
20 | private notificationsService: NotificationsService, | ||
21 | private router: Router, | ||
22 | private route: ActivatedRoute, | ||
23 | private i18n: I18n | ||
24 | ) { | ||
25 | } | ||
26 | |||
27 | ngOnInit () { | ||
28 | |||
29 | this.userId = this.route.snapshot.queryParams['userId'] | ||
30 | this.verificationString = this.route.snapshot.queryParams['verificationString'] | ||
31 | |||
32 | if (!this.userId || !this.verificationString) { | ||
33 | this.notificationsService.error(this.i18n('Error'), this.i18n('Unable to find user id or verification string.')) | ||
34 | } else { | ||
35 | this.verifyEmail() | ||
36 | } | ||
37 | } | ||
38 | |||
39 | verifyEmail () { | ||
40 | this.userService.verifyEmail(this.userId, this.verificationString) | ||
41 | .subscribe( | ||
42 | () => { | ||
43 | this.success = true | ||
44 | setTimeout(() => { | ||
45 | this.router.navigate([ '/login' ]) | ||
46 | }, 2000) | ||
47 | }, | ||
48 | |||
49 | err => { | ||
50 | this.notificationsService.error(this.i18n('Error'), err.message) | ||
51 | } | ||
52 | ) | ||
53 | } | ||
54 | } | ||
diff --git a/client/src/app/+verify-account/verify-account-routing.module.ts b/client/src/app/+verify-account/verify-account-routing.module.ts new file mode 100644 index 000000000..a038f0336 --- /dev/null +++ b/client/src/app/+verify-account/verify-account-routing.module.ts | |||
@@ -0,0 +1,42 @@ | |||
1 | import { NgModule } from '@angular/core' | ||
2 | import { RouterModule, Routes } from '@angular/router' | ||
3 | |||
4 | import { MetaGuard } from '@ngx-meta/core' | ||
5 | |||
6 | import { VerifyAccountEmailComponent } from '@app/+verify-account/verify-account-email/verify-account-email.component' | ||
7 | import { | ||
8 | VerifyAccountAskSendEmailComponent | ||
9 | } from '@app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component' | ||
10 | |||
11 | const verifyAccountRoutes: Routes = [ | ||
12 | { | ||
13 | path: '', | ||
14 | canActivateChild: [ MetaGuard ], | ||
15 | children: [ | ||
16 | { | ||
17 | path: 'email', | ||
18 | component: VerifyAccountEmailComponent, | ||
19 | data: { | ||
20 | meta: { | ||
21 | title: 'Verify account email' | ||
22 | } | ||
23 | } | ||
24 | }, | ||
25 | { | ||
26 | path: 'ask-send-email', | ||
27 | component: VerifyAccountAskSendEmailComponent, | ||
28 | data: { | ||
29 | meta: { | ||
30 | title: 'Verify account ask send email' | ||
31 | } | ||
32 | } | ||
33 | } | ||
34 | ] | ||
35 | } | ||
36 | ] | ||
37 | |||
38 | @NgModule({ | ||
39 | imports: [ RouterModule.forChild(verifyAccountRoutes) ], | ||
40 | exports: [ RouterModule ] | ||
41 | }) | ||
42 | export class VerifyAccountRoutingModule {} | ||
diff --git a/client/src/app/+verify-account/verify-account.module.ts b/client/src/app/+verify-account/verify-account.module.ts new file mode 100644 index 000000000..9092c6b4f --- /dev/null +++ b/client/src/app/+verify-account/verify-account.module.ts | |||
@@ -0,0 +1,27 @@ | |||
1 | import { NgModule } from '@angular/core' | ||
2 | |||
3 | import { VerifyAccountRoutingModule } from '@app/+verify-account/verify-account-routing.module' | ||
4 | import { VerifyAccountEmailComponent } from '@app/+verify-account/verify-account-email/verify-account-email.component' | ||
5 | import { | ||
6 | VerifyAccountAskSendEmailComponent | ||
7 | } from '@app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component' | ||
8 | import { SharedModule } from '@app/shared' | ||
9 | |||
10 | @NgModule({ | ||
11 | imports: [ | ||
12 | VerifyAccountRoutingModule, | ||
13 | SharedModule | ||
14 | ], | ||
15 | |||
16 | declarations: [ | ||
17 | VerifyAccountEmailComponent, | ||
18 | VerifyAccountAskSendEmailComponent | ||
19 | ], | ||
20 | |||
21 | exports: [ | ||
22 | ], | ||
23 | |||
24 | providers: [ | ||
25 | ] | ||
26 | }) | ||
27 | export class VerifyAccountModule { } | ||