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/verify-account-email | |
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/verify-account-email')
-rw-r--r-- | client/src/app/+verify-account/verify-account-email/verify-account-email.component.html | 15 | ||||
-rw-r--r-- | client/src/app/+verify-account/verify-account-email/verify-account-email.component.ts | 54 |
2 files changed, 69 insertions, 0 deletions
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 | } | ||