dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3107 from vvlladd28/bug/encode-email

Browse Source 
[3.0] Fixed request 'resend activation'
This commit is contained in:
Igor Kulikov 2020-07-17 09:53:54 +03:00 committed by GitHub
commit 6b95683307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui-ngx/src/app/core/auth/auth.service.ts
View File

@ -159,7 +159,8 @@ export class AuthService {
} }
public resendEmailActivation(email: string) { public resendEmailActivation(email: string) {
return this.http.post(`/api/noauth/resendEmailActivation?email=${email}`, const encodeEmail = encodeURIComponent(email);
return this.http.post(`/api/noauth/resendEmailActivation?email=${encodeEmail}`,
null, defaultHttpOptions()); null, defaultHttpOptions());
} }

6
ui-ngx/src/app/core/http/user.service.ts
View File

@ -18,10 +18,11 @@ import { Injectable } from '@angular/core';
import { defaultHttpOptionsFromConfig, RequestConfig } from './http-utils'; import { defaultHttpOptionsFromConfig, RequestConfig } from './http-utils';
import { User } from '@shared/models/user.model'; import { User } from '@shared/models/user.model';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http'; import { HttpClient, HttpParams } from '@angular/common/http';
import { PageLink } from '@shared/models/page/page-link'; import { PageLink } from '@shared/models/page/page-link';
import { PageData } from '@shared/models/page/page-data'; import { PageData } from '@shared/models/page/page-data';
import { isDefined } from '@core/utils'; import { isDefined } from '@core/utils';
import { InterceptorHttpParams } from '@core/interceptors/interceptor-http-params';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -71,7 +72,8 @@ export class UserService {
} }
public sendActivationEmail(email: string, config?: RequestConfig) { public sendActivationEmail(email: string, config?: RequestConfig) {
return this.http.post(`/api/user/sendActivationMail?email=${email}`, null, defaultHttpOptionsFromConfig(config)); const encodeEmail = encodeURIComponent(email);
return this.http.post(`/api/user/sendActivationMail?email=${encodeEmail}`, null, defaultHttpOptionsFromConfig(config));
} }
public setUserCredentialsEnabled(userId: string, userCredentialsEnabled?: boolean, config?: RequestConfig): Observable<any> { public setUserCredentialsEnabled(userId: string, userCredentialsEnabled?: boolean, config?: RequestConfig): Observable<any> {