Issue 705 iam admins should be able to suspend clients #715

garaimanoj · 2024-02-26T16:26:07Z

Button added to enable/disable client
New columns added to CLIENT_DETAILS table
Setting status as active (True) during new client and client copy operation
Test cases to check new database fields are updated after client disable operation

Based on the active status of client, disable and restore button will toggle the status

…spend-clients

garaimanoj · 2024-03-18T13:28:40Z

...main/webapp/resources/iam/apps/dashboard-app/components/clients/client/client.component.html

+        <h1>
+            <i class="fa fa-rocket"></i>&nbsp;&nbsp; <span
+                ng-if="!$ctrl.newClient">{{$ctrl.clientVal.client_name}}</span>
+            <span ng-if="!$ctrl.newClient && !$ctrl.clientVal.active"> (Suspended)</span>    


You can format this suspended text into a colored label

I have changed the style of Suspended label.

On hover you can have the tooltip with more details of the suspension.

garaimanoj · 2024-03-18T13:29:21Z

...main/webapp/resources/iam/apps/dashboard-app/components/clients/client/client.component.html

+                    <button class="btn btn-success" ng-click="$ctrl.saveClient()">Save client</button>
+                    <button class="btn btn-danger" ng-click="$ctrl.deleteClient()" ng-if="!$ctrl.newClient">Delete
+                        client</button>
+					<client-status client="$ctrl.clientVal" ng-if="!$ctrl.newClient"></client-status>	


federicaagostini · 2024-03-19T18:58:58Z

iam-login-service/src/main/java/it/infn/mw/iam/api/client/service/DefaultClientService.java

@@ -107,6 +107,13 @@ public ClientDetailsEntity updateClient(ClientDetailsEntity client) {
    return clientRepo.save(client);
  }

+  @Override
+  @CacheEvict(cacheNames = DefaultScopeMatcherRegistry.SCOPE_CACHE_KEY, key = "{#clientId}")


I would use the same key as updateClient()

Done. Using same key as updateClient() now. Thanks.

We can avoid the cache eviction here because client caching is currently only related to scope matchers.

...ervice/src/main/java/it/infn/mw/iam/api/client/management/ClientManagementAPIController.java

iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/services/clients.service.js

federicaagostini · 2024-03-19T19:08:23Z

Looks good to me, let's wait for the others :)

In the meantime, I don't know if it would make sense to add the possibility to disable client also to users who own the client (even if not admins). Right now, I don't see a side effect for that.

garaimanoj · 2024-03-20T11:04:18Z

Thanks for your review. I have noticed some JavaScript error. Currently trying to fix those. I will let you know once those are fixed.
Shall I add the information of by whom and when the client was suspended in the dashboard in this pull request?

garaimanoj · 2024-03-21T10:21:35Z

iam-persistence/src/main/resources/db/migration/test/V100000___test_data.sql

-  (18, 'admin-client-rw', 'secret', 'Admin client (read-write)', false, null, 3600, 600, true, 'SECRET_POST',false, null, CURRENT_TIMESTAMP()),
-  (19, 'public-client', null, 'Public client', false, 3600, 3600, 600, true, 'NONE', false, null, CURRENT_TIMESTAMP());
+  token_endpoint_auth_method, require_auth_time, device_code_validity_seconds, created_at, active) VALUES
+  (1, 'client', 'secret', 'Test Client', false, null, 3600, 600, true, 'SECRET_BASIC',false, null, CURRENT_TIMESTAMP(), true),


Is it ok to populate the test data here in this file or shall I do it in V102__add_active_and_status_changed_on_to_client_details.sql

Here is fine! Just keep in mind that if you use a local mysql it might give you an error when you run the tests and so you should delete it and repopulate it

enricovianello · 2024-03-22T13:58:43Z

...p/resources/iam/apps/dashboard-app/components/clients/clientslist/clientslist.component.html

@@ -88,6 +88,7 @@
                                <div>
                                    <a ui-sref="client({id: c.client_id})">
                                        {{c.client_name}}
+                                    <span ng-if="!c.active"> (Suspended)</span>
                                    </a>


We can separate (Suspended) from the client link and add it as a colored label under the client UUID

I personally would change the style/colour of the label to differentiate it from scopes, for example:

What do you think?

Not bad. This one looks prominent and distinct.

I have used label-danger from Bootstrap for the label.

sonarcloud · 2024-04-05T12:29:43Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
98.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

* Add db migration to add LAST_USED column on IAM_ACCOUNT_CLIENT * Revert "Add db migration to add LAST_USED column on IAM_ACCOUNT_CLIENT" This reverts commit 56aef73. * Adding table CLIENT_LAST_USED * Adding last used column on clients table on webapp * Adding Client Last Used entity and repository * Simple GET api * Fix repo type * Reading last_used as ClientDetails column * Update frontend * Updating client last_used when generating access token * Last used on refreshAccessToken * Update mitreid.version to 1.3.6.iam-issue-605 * Add TOKEN event to IamAuditApplicationEvent and publish AccessTokenIssuedEvent and AccessTokenRefreshedEvent in IamTokenService * Header * Add updateLastUsed methods to ClientService * Remove update of last_used on client update * Adding mysql migration * Save client on update of last_used * Do not save on clientRepo when updating last_used * Do not write to DB when same date * Adding IAM_CLIENT_TRACK_LAST_USED env variable * Remove unused clientRepo * Suppress deprecation warnings * Move LAST_USED to its own table * Add missing mysql migration * Rename client_last_used and last_used_id * Rename ClientLastUsedEntity and use LocalDate * Serialize LocalDate as String * Use a shared primary key * Bump migration from V97 to V100 after rebase * Remove unused import * Add first test * Update MitreID version * Add more tests * Refactor tests with TestTokenUtils * Use final version of MitreID * Change assertThat with assertTrue * Hide column on dashboard when tracking disabled * Enable the tracking by default * Update migrations to latest available number --------- Co-authored-by: Enrico Vianello <enrico.vianello@cnaf.infn.it>

…spend-clients

enricovianello · 2024-04-15T00:59:21Z

Replaced by #747

Add client status component

09b64b0

Based on the active status of client, disable and restore button will toggle the status

garaimanoj linked an issue Feb 26, 2024 that may be closed by this pull request

IAM admins should be able to suspend clients #705

Closed

garaimanoj changed the base branch from master to develop February 26, 2024 16:26

garaimanoj added 13 commits February 29, 2024 16:41

Remove debug code

ba1ca19

Add API and service methods to change client status

7ac60e8

Add new columns for client status and test data

02bc665

Handle API call from frontend and convert client entity

6fdae28

Set status as active for new client

3f31509

Add suspended label next to client name

77c21ce

Test client status change

2956e7f

Merge branch 'develop' into issue-705-iam-admins-should-be-able-to-su…

92baf1a

…spend-clients

Remove whitespace difference

79e2c50

Rename file to avoid duplicate name and set test data

5881a8f

Update mitreid version

b18c51c

Alter client details table

50308e4

Add default date to status changed on

7bae731

garaimanoj commented Mar 18, 2024

View reviewed changes

federicaagostini reviewed Mar 19, 2024

View reviewed changes

...ervice/src/main/java/it/infn/mw/iam/api/client/management/ClientManagementAPIController.java Show resolved Hide resolved

federicaagostini reviewed Mar 19, 2024

View reviewed changes

iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/services/clients.service.js Outdated Show resolved Hide resolved

enricovianello marked this pull request as ready for review March 19, 2024 19:18

enricovianello self-requested a review March 19, 2024 19:18

Fix JavaScript function undefined error

1739c0c

garaimanoj requested a review from federicaagostini March 21, 2024 10:18

garaimanoj self-assigned this Mar 21, 2024

garaimanoj commented Mar 21, 2024

View reviewed changes

enricovianello reviewed Mar 22, 2024

View reviewed changes

garaimanoj added 7 commits April 2, 2024 16:28

Save client status changed by value

0b32b6d

Get client status changed by

2662dbc

Add exception handler

f115346

Add test cases for controller

9db6837

Check isPresent before accessing optional value

6773edd

Add licence

8befcb9

Add column status_changed_by to client_details

e430264

darcato and others added 4 commits April 10, 2024 14:06

Make client suspension details available to client owner

71391d1

Merge branch 'develop' into issue-705-iam-admins-should-be-able-to-su…

e1344d2

…spend-clients

Resolve FlywayException by renaming

f219185

enricovianello force-pushed the develop branch from 51ab5d8 to ddcc4c2 Compare April 15, 2024 00:49

enricovianello mentioned this pull request Apr 15, 2024

Administrators can disable a client #747

Merged

enricovianello closed this Apr 15, 2024

enricovianello deleted the issue-705-iam-admins-should-be-able-to-suspend-clients branch April 15, 2024 15:25

rmiccoli removed a link to an issue May 16, 2024

IAM admins should be able to suspend clients #705

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 705 iam admins should be able to suspend clients #715

Issue 705 iam admins should be able to suspend clients #715

garaimanoj commented Feb 26, 2024 •

edited

Loading

garaimanoj Mar 18, 2024

enricovianello Mar 22, 2024

garaimanoj Mar 25, 2024

garaimanoj Apr 2, 2024

garaimanoj Mar 18, 2024

federicaagostini Mar 19, 2024

garaimanoj Mar 20, 2024

enricovianello Mar 22, 2024

federicaagostini commented Mar 19, 2024 •

edited

Loading

garaimanoj commented Mar 20, 2024

garaimanoj Mar 21, 2024

rmiccoli Mar 21, 2024

enricovianello Mar 22, 2024

garaimanoj Mar 25, 2024

rmiccoli Mar 25, 2024

garaimanoj Mar 25, 2024

garaimanoj Apr 2, 2024

sonarcloud bot commented Apr 5, 2024

enricovianello commented Apr 15, 2024

Issue 705 iam admins should be able to suspend clients #715

Issue 705 iam admins should be able to suspend clients #715

Conversation

garaimanoj commented Feb 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

federicaagostini commented Mar 19, 2024 • edited Loading

garaimanoj commented Mar 20, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Apr 5, 2024

Quality Gate passed

enricovianello commented Apr 15, 2024

garaimanoj commented Feb 26, 2024 •

edited

Loading

federicaagostini commented Mar 19, 2024 •

edited

Loading