Update connected members page to rely on RemoteIdentities

opf · Aug 8, 2024 · d71efd7 · d71efd7
1 parent 42cf223
commit d71efd7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/modules/storages/app/components/storages/project_storages/members/row_component.rb b/modules/storages/app/components/storages/project_storages/members/row_component.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #-- copyright
 # OpenProject is an open source project management software.
 # Copyright (C) 2012-2024 the OpenProject GmbH
@@ -104,7 +106,7 @@ def storage_connection_status
 
     def oauth_client_connected?
       storage.oauth_client.present? &&
-        member.oauth_client_tokens.any? { |token| token.oauth_client_id == storage.oauth_client.id }
+        member.principal.remote_identities.exists?(oauth_client: storage.oauth_client)
     end
 
     def can_read_files?

diff --git a/.../storages/app/controllers/storages/project_settings/project_storage_members_controller.rb b/.../storages/app/controllers/storages/project_settings/project_storage_members_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #-- copyright
 # OpenProject is an open source project management software.
 # Copyright (C) 2012-2024 the OpenProject GmbH
@@ -40,9 +42,9 @@ class Storages::ProjectSettings::ProjectStorageMembersController < Projects::Set
 
   def index
     @memberships = Member
-      .of_project(@project)
-      .includes(:principal, :oauth_client_tokens, roles: :role_permissions)
-      .paginate(page: page_param, per_page: per_page_param)
+                   .of_project(@project)
+                   .includes(principal: :remote_identities, roles: :role_permissions)
+                   .paginate(page: page_param, per_page: per_page_param)
 
     render "/storages/project_settings/project_storage_members/index"
   end