[ARVADOS] created: 2.1.0-1939-gd4d5dbe0e

[Git user]

        at  d4d5dbe0e5b30dd6d4fd0022c6b9100a06afab46 (commit)


commit d4d5dbe0e5b30dd6d4fd0022c6b9100a06afab46
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Thu Feb 17 19:19:26 2022 -0300

    17754: Hides account linking buttons when LoginCluster is configured.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/apps/workbench/app/views/users/link_account.html.erb b/apps/workbench/app/views/users/link_account.html.erb
index 86a0446e7..e45073e28 100644
--- a/apps/workbench/app/views/users/link_account.html.erb
+++ b/apps/workbench/app/views/users/link_account.html.erb
@@ -75,6 +75,8 @@ SPDX-License-Identifier: AGPL-3.0 %>
   });
 <% end %>
 
+<% if Rails.configuration.Login.LoginCluster.empty? %>
+
 <div id="need-login" style="display: none">
 
   <p>You are currently logged in as <b><%= Thread.current[:user].email %></b> (<%= Thread.current[:user].username%>, <%= Thread.current[:user].uuid %>) created at <b><%= Thread.current[:user].created_at%></b></p>
@@ -91,7 +93,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
     <i class="fa fa-fw fa-sign-in"></i> Use this login to access another account
   </button>
 
-</p>
+  </p>
 </div>
 
 <div id="ready-to-link" style="display: none">
@@ -105,8 +107,13 @@ SPDX-License-Identifier: AGPL-3.0 %>
     <input type="hidden" id="new-user-token-input" name="direction" value="<%=params[:direction]%>" />
     <%= button_tag class: "btn btn-primary", id: "link-account-submit" do %>
       <i class="fa fa-fw fa-link"></i> Link accounts
+    <% end %>
   <% end %>
-<% end %>
 
 </div>
+
+<% else %>
+<div>
+Self-serve account linking is not supported on this cluster. Please contact your Arvados administrator.
 </div>
+<% end %>

commit 877324232895fd119e3baa2920cddc5842129ec8
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Thu Feb 17 17:34:30 2022 -0300

    17754: Updates documentation.
    
    Self-serve account linking is not supported on LoginCluster federations.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/doc/admin/link-accounts.html.textile.liquid b/doc/admin/link-accounts.html.textile.liquid
index d0ac6a036..6e880fdf6 100644
--- a/doc/admin/link-accounts.html.textile.liquid
+++ b/doc/admin/link-accounts.html.textile.liquid
@@ -11,6 +11,8 @@ SPDX-License-Identifier: CC-BY-SA-3.0
 
 If a user needs to log in to Arvados with a upstream account or provider, they may end up with two Arvados user accounts.  If the user still has the ability to log in with the old account, they can use the "self-serve account linking":{{site.baseurl}}/user/topics/link-accounts.html feature of workbench.  However, if the user does not have the ability to log in with both upstream accounts, the admin can also link the accounts using the command line.
 
+bq. NOTE: self-serve account linking is currently not supported on LoginCluster federations and needs to be performed manually by the site admin.
+
 h3. Step 1: Determine user uuids
 
 User uuids can be determined by browsing workbench or using @arv user list@ at the command line.
diff --git a/doc/user/topics/link-accounts.html.textile.liquid b/doc/user/topics/link-accounts.html.textile.liquid
index 3854bf649..8cfb935f2 100644
--- a/doc/user/topics/link-accounts.html.textile.liquid
+++ b/doc/user/topics/link-accounts.html.textile.liquid
@@ -11,6 +11,8 @@ SPDX-License-Identifier: CC-BY-SA-3.0
 
 This page describes how to link additional login accounts to the same Arvados account.  This can be used to migrate login accounts, for example, from one Google account to another.  It can also be used to migrate login providers, for example from LDAP to Google.  In order to do this, you must be able to log into both the "old" and "new" accounts.
 
+bq. NOTE: If you need to link your accounts on an Arvados cluster federation where user management is centralized, this feature may not be available. If that's the case, the federation admin can do the linking manually.
+
 h2. Link accounts
 
 Follow this process to link the "new" login to the "old" login.

-----------------------------------------------------------------------


hooks/post-receive
--