Get the tenant identity from the data domain identity, not the api ke…

…y payload.
dqops · Feb 4, 2024 · c153817 · c153817
1 parent d02aaf5
commit c153817
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/dqops/src/main/java/com/dqops/core/dqocloud/dashboards/LookerStudioUrlServiceImpl.java b/dqops/src/main/java/com/dqops/core/dqocloud/dashboards/LookerStudioUrlServiceImpl.java
@@ -88,7 +88,7 @@ public String getLookerStudioQueryApiKey(DqoUserPrincipal userPrincipal) {
 
             LookerStudioKeyRequestApi lookerStudioKeyRequestApi = new LookerStudioKeyRequestApi(authenticatedClient);
             String queryApiKey = lookerStudioKeyRequestApi.issueLookerStudioApiKey(userPrincipal.getDataDomainIdentity().getDataDomainCloud(),
-                    userPrincipal.getApiKeyPayload().getSubject(), userPrincipal.getApiKeyPayload().getTenantId());
+                    userPrincipal.getDataDomainIdentity().getTenantOwner(), userPrincipal.getDataDomainIdentity().getTenantId());
 
             synchronized (this.lock) {
                 DqoCloudApiKey decodedApiKey = this.dqoCloudApiKeyProvider.decodeApiKey(queryApiKey);
@@ -128,7 +128,7 @@ public TenantQueryAccessTokenModel getLookerStudioAccessToken(DqoUserPrincipal u
             apiClient.getAuthentication("api_key");
             AccessTokenIssueApi accessTokenIssueApi = new AccessTokenIssueApi(apiClient);
             TenantQueryAccessTokenModel tenantQueryAccessTokenModel = accessTokenIssueApi.issueTenantDataROQueryAccessToken(
-                    userPrincipal.getApiKeyPayload().getSubject(), userPrincipal.getApiKeyPayload().getTenantId());
+                    userPrincipal.getDataDomainIdentity().getTenantOwner(), userPrincipal.getDataDomainIdentity().getTenantId());
 
             Instant expiresAt = Instant.now().plus(1, ChronoUnit.HOURS);
             try {

diff --git a/dqops/src/main/java/com/dqops/core/dqocloud/login/InstanceCloudLoginServiceImpl.java b/dqops/src/main/java/com/dqops/core/dqocloud/login/InstanceCloudLoginServiceImpl.java
@@ -150,7 +150,7 @@ public String getTicketGrantingTicket() {
                 ticketGrantingTicketRequest.setUrl(returnBaseUrl);
 
                 String signedTicketGrantingTicket = refreshTokenIssueApi.issueLoginTicketGrantingTicketToken(ticketGrantingTicketRequest,
-                        userPrincipalForAdministrator.getApiKeyPayload().getSubject(), userPrincipalForAdministrator.getApiKeyPayload().getTenantId());
+                        userPrincipalForAdministrator.getDataDomainIdentity().getTenantOwner(), userPrincipalForAdministrator.getDataDomainIdentity().getTenantId());
                 this.grantingTicketPayloadSignedObject = this.signatureService.decodeSignedMessageHexNoValidate(
                         UserLoginTicketGrantingTicketPayload.class, signedTicketGrantingTicket);
             }

diff --git a/dqops/src/main/java/com/dqops/core/dqocloud/users/UserManagementServiceImpl.java b/dqops/src/main/java/com/dqops/core/dqocloud/users/UserManagementServiceImpl.java
@@ -69,7 +69,7 @@ public Collection<DqoCloudUserModel> listUsers(DqoUserPrincipal userPrincipal) {
 
             AccountUsersApi accountUsersApi = new AccountUsersApi(authenticatedClient);
             List<DqoUserModel> cloudUserList = accountUsersApi.listAccountUsers(
-                    userPrincipal.getApiKeyPayload().getSubject(), userPrincipal.getApiKeyPayload().getTenantId());
+                    userPrincipal.getDataDomainIdentity().getTenantOwner(), userPrincipal.getDataDomainIdentity().getTenantId());
 
             List<DqoCloudUserModel> users =
                     cloudUserList.stream()
@@ -107,7 +107,7 @@ public DqoCloudUserModel getUserByEmail(DqoUserPrincipal userPrincipal, String e
 
             AccountUsersApi accountUsersApi = new AccountUsersApi(authenticatedClient);
             DqoUserModel cloudUserModel = accountUsersApi.getAccountUser(email,
-                    userPrincipal.getApiKeyPayload().getSubject(), userPrincipal.getApiKeyPayload().getTenantId());
+                    userPrincipal.getDataDomainIdentity().getTenantOwner(), userPrincipal.getDataDomainIdentity().getTenantId());
 
             DqoCloudUserModel dqoCloudUserModel = new DqoCloudUserModel() {{
                 setEmail(cloudUserModel.getEmail());
@@ -153,7 +153,7 @@ public void createUser(DqoUserPrincipal userPrincipal, DqoCloudUserModel userMod
             }};
 
             accountUsersApi.createAccountUser(dqoUserModel,
-                    userPrincipal.getApiKeyPayload().getSubject(), userPrincipal.getApiKeyPayload().getTenantId());
+                    userPrincipal.getDataDomainIdentity().getTenantOwner(), userPrincipal.getDataDomainIdentity().getTenantId());
         }
         catch (DqoCloudInvalidKeyException ex) {
             throw ex;
@@ -193,7 +193,7 @@ public void updateUser(DqoUserPrincipal userPrincipal, DqoCloudUserModel userMod
             }};
 
             accountUsersApi.updateAccountUser(userModel.getEmail(), dqoUserModel,
-                    userPrincipal.getApiKeyPayload().getSubject(), userPrincipal.getApiKeyPayload().getTenantId());
+                    userPrincipal.getDataDomainIdentity().getTenantOwner(), userPrincipal.getDataDomainIdentity().getTenantId());
         }
         catch (DqoCloudInvalidKeyException ex) {
             throw ex;
@@ -228,7 +228,7 @@ public void deleteUser(DqoUserPrincipal userPrincipal, String email) {
 
             AccountUsersApi accountUsersApi = new AccountUsersApi(authenticatedClient);
             accountUsersApi.deleteAccountUser(email,
-                    userPrincipal.getApiKeyPayload().getSubject(), userPrincipal.getApiKeyPayload().getTenantId());
+                    userPrincipal.getDataDomainIdentity().getTenantOwner(), userPrincipal.getDataDomainIdentity().getTenantId());
         }
         catch (DqoCloudInvalidKeyException ex) {
             throw ex;
@@ -267,7 +267,7 @@ public void changePassword(DqoUserPrincipal userPrincipal, String email, String
 
             AccountUsersApi accountUsersApi = new AccountUsersApi(authenticatedClient);
             accountUsersApi.changeAccountUserPassword(email, newPassword,
-                    userPrincipal.getApiKeyPayload().getSubject(), userPrincipal.getApiKeyPayload().getTenantId());
+                    userPrincipal.getDataDomainIdentity().getTenantOwner(), userPrincipal.getDataDomainIdentity().getTenantId());
         }
         catch (DqoCloudInvalidKeyException ex) {
             throw ex;