The Unified and Autonomous Development Platform
Add conditonal note about externally managed ssh keys
Michael Weimannb32db104097d
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.htmlindex 9994a0dfe4..9db3549d21 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.html@@ -3,7 +3,7 @@<div class="head"><a class="add-new btn btn-success" wicket:id="newKey"><iclass="fa fa-plus"></i> New Ssh Key</a>- <div class="alert alert-info" style="display: inline-block;">+ <div wicket:id="sshKeyNote" class="alert alert-info">SSH keys are managed by an external authentication provider</div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.javaindex d192e5e021..42860578a9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.admin.user.ssh;import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;@@ -65,27 +66,40 @@ public class UserSshKeysPage extends UserPage {super.onConfigure();setVisible(determineNewSSHKeyVisibility());}+- private boolean determineNewSSHKeyVisibility() {- if (!user.isExternalManaged()) {- return true;- }-- Authenticator auth = OneDev.getInstance(SettingManager.class).getAuthenticator();-- if (auth == null || !(auth instanceof LdapAuthenticator)) {- return true;- }-- if (((LdapAuthenticator) auth).getUserSSHPublicKey() != null) {- return false;- }-- return true;- }-+ });++ add(new WebMarkupContainer("sshKeyNote") {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(determineSSHKeyNoteVisibility());+ }});add(keyList.setOutputMarkupId(true));}++ private boolean determineSSHKeyNoteVisibility() {+ return !determineNewSSHKeyVisibility();+ }++ private boolean determineNewSSHKeyVisibility() {+ if (!getUser().isExternalManaged()) {+ return true;+ }++ Authenticator auth = OneDev.getInstance(SettingManager.class).getAuthenticator();++ if (auth == null || !(auth instanceof LdapAuthenticator)) {+ return true;+ }++ if (((LdapAuthenticator) auth).getUserSSHPublicKey() != null) {+ return false;+ }++ return true;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.htmlindex 9e3b787ba7..73c9226f7d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html@@ -3,7 +3,7 @@<div class="key list"><div class="head"><a class="add-new btn btn-success" wicket:id="newKey"><i class="fa fa-plus"></i> New Ssh Key</a>- <div class="alert alert-info" style="display: inline-block;">+ <div wicket:id="sshKeyNote" class="alert alert-info">SSH keys are managed by an external authentication provider</div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.javaindex 1e47e4018f..c2910d596b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.my.sshkeys;import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;@@ -61,30 +62,42 @@ public class MySshKeysPage extends MyPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(determineSSHKeyVisibility());- }-- public boolean determineSSHKeyVisibility() {- if (!user.isExternalManaged()) {- return true;- }-- Authenticator auth = OneDev.getInstance(SettingManager.class).getAuthenticator();-- if (auth == null || !(auth instanceof LdapAuthenticator)) {- return true;- }-- if (((LdapAuthenticator) auth).getUserSSHPublicKey() != null) {- return false;- }-- return true;+ setVisible(determineNewSSHKeyVisibility());}});+ add(new WebMarkupContainer("sshKeyNote") {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(determineSSHKeyNoteVisibility());+ }+ });+add(keyList.setOutputMarkupId(true));}+ private boolean determineSSHKeyNoteVisibility() {+ return !determineNewSSHKeyVisibility();+ }++ private boolean determineNewSSHKeyVisibility() {+ if (!getLoginUser().isExternalManaged()) {+ return true;+ }++ Authenticator auth = OneDev.getInstance(SettingManager.class).getAuthenticator();++ if (auth == null || !(auth instanceof LdapAuthenticator)) {+ return true;+ }++ if (((LdapAuthenticator) auth).getUserSSHPublicKey() != null) {+ return false;+ }++ return true;+ }+}