From 4a2bd7fc707aac8a05464e8b3fad90ec25c8874e Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 22 Oct 2024 17:49:59 +0300
Subject: [PATCH] UI: Add OAuth client to tenant level

---
 .../security/permission/TenantAdminPermissions.java        | 1 +
 .../home/pages/admin/oauth2/clients/client.component.ts    | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java b/application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
index c63121e60b..9928cfeb04 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
+++ b/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);
     }
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts
index 44a5993485..9cd5205aa2 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client.component.ts
+++ b/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() {