Browse Source

UI: Add OAuth client to tenant level

pull/11835/head
Vladyslav_Prykhodko 2 years ago
parent
commit
4a2bd7fc70
  1. 1
      application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
  2. 7
      ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts

1
application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java

@ -52,6 +52,7 @@ public class TenantAdminPermissions extends AbstractPermissions {
put(Resource.NOTIFICATION, tenantEntityPermissionChecker);
put(Resource.MOBILE_APP_SETTINGS, new PermissionChecker.GenericPermissionChecker(Operation.READ));
put(Resource.OAUTH2_CLIENT, tenantEntityPermissionChecker);
put(Resource.OAUTH2_CONFIGURATION_TEMPLATE, new PermissionChecker.GenericPermissionChecker(Operation.READ));
put(Resource.MOBILE_APP, tenantEntityPermissionChecker);
put(Resource.MOBILE_APP_BUNDLE, tenantEntityPermissionChecker);
}

7
ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts

@ -40,6 +40,8 @@ import { Subscription } from 'rxjs';
import { COMMA, ENTER } from '@angular/cdk/keycodes';
import { PageLink } from '@shared/models/page/page-link';
import { coerceBoolean } from '@app/shared/decorators/coercion';
import { getCurrentAuthUser } from '@core/auth/auth.selectors';
import { Authority } from '@shared/models/authority.enum';
@Component({
selector: 'tb-client',
@ -92,13 +94,16 @@ export class ClientComponent extends EntityComponent<OAuth2Client, PageLink, OAu
private oauth2Service: OAuth2Service,
@Optional() @Inject('entity') protected entityValue: OAuth2Client,
@Optional() @Inject('entitiesTableConfig')
protected entitiesTableConfigValue: EntityTableConfig<OAuth2Client, PageLink, OAuth2ClientInfo>,
protected entitiesTableConfigValue: EntityTableConfig<OAuth2Client, PageLink, OAuth2ClientInfo>,
protected cd: ChangeDetectorRef,
public fb: UntypedFormBuilder) {
super(store, fb, entityValue, entitiesTableConfigValue, cd);
this.oauth2Service.getOAuth2Template().subscribe(templates => {
this.initTemplates(templates);
});
if (getCurrentAuthUser(this.store).authority === Authority.TENANT_ADMIN) {
this.platformTypes = this.platformTypes.filter(item => item !== PlatformType.WEB);
}
}
ngOnDestroy() {

Loading…
Cancel
Save