Merge pull request #5262 from ArtemDzhereleiko/imp/profile/copy-jwt-token
[3.3.2] Add button Copy JWT token to profile
This commit is contained in:
commit
14a4236151
@ -84,6 +84,15 @@
|
|||||||
{{'profile.change-password' | translate}}
|
{{'profile.change-password' | translate}}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div fxLayout="row" fxLayoutAlign=" center" style="padding-bottom: 16px;">
|
||||||
|
<button mat-raised-button
|
||||||
|
type="button"
|
||||||
|
(click)="copyToken()">
|
||||||
|
<mat-icon svgIcon="mdi:clipboard-arrow-left"></mat-icon>
|
||||||
|
<span>{{ 'profile.copy-jwt-token' | translate }}</span>
|
||||||
|
</button>
|
||||||
|
<span class="profile-btn-subtext">{{ expirationJwtData }}</span>
|
||||||
|
</div>
|
||||||
<div fxLayout="row" class="layout-wrap">
|
<div fxLayout="row" class="layout-wrap">
|
||||||
<span fxFlex></span>
|
<span fxFlex></span>
|
||||||
<button mat-button mat-raised-button color="primary"
|
<button mat-button mat-raised-button color="primary"
|
||||||
|
|||||||
@ -38,6 +38,10 @@
|
|||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
}
|
}
|
||||||
|
.profile-btn-subtext {
|
||||||
|
opacity: 0.7;
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
.tb-home-dashboard {
|
.tb-home-dashboard {
|
||||||
tb-dashboard-autocomplete {
|
tb-dashboard-autocomplete {
|
||||||
@media #{$mat-gt-sm} {
|
@media #{$mat-gt-sm} {
|
||||||
|
|||||||
@ -34,6 +34,9 @@ import { AuthService } from '@core/auth/auth.service';
|
|||||||
import { ActivatedRoute } from '@angular/router';
|
import { ActivatedRoute } from '@angular/router';
|
||||||
import { isDefinedAndNotNull } from '@core/utils';
|
import { isDefinedAndNotNull } from '@core/utils';
|
||||||
import { getCurrentAuthUser } from '@core/auth/auth.selectors';
|
import { getCurrentAuthUser } from '@core/auth/auth.selectors';
|
||||||
|
import { ActionNotificationShow } from '@core/notification/notification.actions';
|
||||||
|
import { DatePipe } from '@angular/common';
|
||||||
|
import { ClipboardService } from 'ngx-clipboard';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'tb-profile',
|
selector: 'tb-profile',
|
||||||
@ -48,6 +51,19 @@ export class ProfileComponent extends PageComponent implements OnInit, HasConfir
|
|||||||
languageList = env.supportedLangs;
|
languageList = env.supportedLangs;
|
||||||
private readonly authUser: AuthUser;
|
private readonly authUser: AuthUser;
|
||||||
|
|
||||||
|
get jwtToken(): string {
|
||||||
|
return `Bearer ${localStorage.getItem('jwt_token')}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
get jwtTokenExpiration(): string {
|
||||||
|
return localStorage.getItem('jwt_token_expiration');
|
||||||
|
}
|
||||||
|
|
||||||
|
get expirationJwtData(): string {
|
||||||
|
const expirationData = this.datePipe.transform(this.jwtTokenExpiration, 'yyyy-MM-dd HH:mm:ss');
|
||||||
|
return this.translate.instant('profile.valid-till', { expirationData });
|
||||||
|
}
|
||||||
|
|
||||||
constructor(protected store: Store<AppState>,
|
constructor(protected store: Store<AppState>,
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
private userService: UserService,
|
private userService: UserService,
|
||||||
@ -55,7 +71,9 @@ export class ProfileComponent extends PageComponent implements OnInit, HasConfir
|
|||||||
private translate: TranslateService,
|
private translate: TranslateService,
|
||||||
public dialog: MatDialog,
|
public dialog: MatDialog,
|
||||||
public dialogService: DialogService,
|
public dialogService: DialogService,
|
||||||
public fb: FormBuilder) {
|
public fb: FormBuilder,
|
||||||
|
private datePipe: DatePipe,
|
||||||
|
private clipboardService: ClipboardService) {
|
||||||
super(store);
|
super(store);
|
||||||
this.authUser = getCurrentAuthUser(this.store);
|
this.authUser = getCurrentAuthUser(this.store);
|
||||||
}
|
}
|
||||||
@ -141,4 +159,24 @@ export class ProfileComponent extends PageComponent implements OnInit, HasConfir
|
|||||||
return this.authUser.authority === Authority.SYS_ADMIN;
|
return this.authUser.authority === Authority.SYS_ADMIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
copyToken() {
|
||||||
|
if (+this.jwtTokenExpiration < Date.now()) {
|
||||||
|
this.store.dispatch(new ActionNotificationShow({
|
||||||
|
message: this.translate.instant('profile.tokenCopiedWarnMessage'),
|
||||||
|
type: 'warn',
|
||||||
|
duration: 1500,
|
||||||
|
verticalPosition: 'bottom',
|
||||||
|
horizontalPosition: 'right'
|
||||||
|
}));
|
||||||
|
} else {
|
||||||
|
this.clipboardService.copyFromContent(this.jwtToken);
|
||||||
|
this.store.dispatch(new ActionNotificationShow({
|
||||||
|
message: this.translate.instant('profile.tokenCopiedSuccessMessage'),
|
||||||
|
type: 'success',
|
||||||
|
duration: 750,
|
||||||
|
verticalPosition: 'bottom',
|
||||||
|
horizontalPosition: 'right'
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2387,7 +2387,11 @@
|
|||||||
"profile": "Profile",
|
"profile": "Profile",
|
||||||
"last-login-time": "Last Login",
|
"last-login-time": "Last Login",
|
||||||
"change-password": "Change Password",
|
"change-password": "Change Password",
|
||||||
"current-password": "Current password"
|
"current-password": "Current password",
|
||||||
|
"copy-jwt-token": "Copy JWT token",
|
||||||
|
"valid-till": "Valid till {{expirationData}}",
|
||||||
|
"tokenCopiedSuccessMessage": "JWT token has been copied to clipboard",
|
||||||
|
"tokenCopiedWarnMessage": "JWT token is expired! Please, refresh the page."
|
||||||
},
|
},
|
||||||
"relation": {
|
"relation": {
|
||||||
"relations": "Relations",
|
"relations": "Relations",
|
||||||
|
|||||||
@ -1262,7 +1262,11 @@
|
|||||||
"profile": "Профиль",
|
"profile": "Профиль",
|
||||||
"last-login-time": "Время последнего входа в систему",
|
"last-login-time": "Время последнего входа в систему",
|
||||||
"change-password": "Изменить пароль",
|
"change-password": "Изменить пароль",
|
||||||
"current-password": "Текущий пароль"
|
"current-password": "Текущий пароль",
|
||||||
|
"copy-jwt-token": "Копировать JWT токен",
|
||||||
|
"valid-till": "Действителен до {{expirationData}}",
|
||||||
|
"tokenCopiedMessage": "JWT токен скопирован в буфер обмена",
|
||||||
|
"tokenCopiedWarnMessage": "JWT токен недействителен! Перезагрузите страницу."
|
||||||
},
|
},
|
||||||
"relation": {
|
"relation": {
|
||||||
"relations": "Отношения",
|
"relations": "Отношения",
|
||||||
|
|||||||
@ -1677,7 +1677,11 @@
|
|||||||
"profile": "Профіль",
|
"profile": "Профіль",
|
||||||
"last-login-time": "Час останнього входу",
|
"last-login-time": "Час останнього входу",
|
||||||
"change-password": "Змінити пароль",
|
"change-password": "Змінити пароль",
|
||||||
"current-password": "Поточний пароль"
|
"current-password": "Поточний пароль",
|
||||||
|
"copy-jwt-token": "Копіювати JWT токен",
|
||||||
|
"valid-till": "Дійсний до {{expirationData}}",
|
||||||
|
"tokenCopiedMessage": "JWT токен скопійовано в буфер обміну",
|
||||||
|
"tokenCopiedWarnMessage": "JWT токен не є дійсним! Перезавантажте сторінку."
|
||||||
},
|
},
|
||||||
"relation": {
|
"relation": {
|
||||||
"relations": "Відношення",
|
"relations": "Відношення",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user