New credentials dialog

pom.xml

@@ -68,8 +68,8 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.504</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.528</jenkins.baseline>
+    <jenkins.version>2.530</jenkins.version>
     <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
     <hpi.compatibleSinceVersion>1372</hpi.compatibleSinceVersion>
   </properties>

src/main/java/com/cloudbees/plugins/credentials/CredentialsDescriptor.java

@@ -605,4 +605,10 @@ public String toCheckUrl() {
         }
     }
 
+    /**
+     * @return the description of this credential descriptor.
+     */
+    public String getDescription() {
+        return null;
+    }
 }

src/main/java/com/cloudbees/plugins/credentials/CredentialsSelectHelper.java

@@ -43,13 +43,17 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 import jakarta.servlet.ServletException;
 import jenkins.model.Jenkins;
@@ -121,6 +125,26 @@
         return context instanceof ModelObject mo ? mo : CredentialsDescriptor.findContextInPath(ModelObject.class);
     }
 
+    /**
+     * @return modifiable store actions for the context provided.
+     */
+    @Restricted(NoExternalUse.class)
+    public Map<String, List<CredentialsStoreAction.DomainWrapper>> getModifiableStoreActions(ModelObject context) {
+        return StreamSupport.stream(CredentialsProvider.lookupStores(context).spliterator(), false)
+                .filter(s -> s.hasPermission(CredentialsProvider.CREATE))
+                .map(CredentialsStore::getStoreAction)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toMap(
+                        CredentialsStoreAction::getDisplayName,
+                        store -> new ArrayList<>(store.getDomains().values()),
+                        (left, right) -> {
+                            left.addAll(right);
+                            return left;
+                            },
+                        LinkedHashMap::new
+                ));
+    }
+
    /**
      * Returns the {@link StoreItem} instances for the current Stapler request.
      *

src/main/java/com/cloudbees/plugins/credentials/CredentialsStoreAction.java

@@ -730,9 +730,12 @@
         public HttpResponse doCreateCredentials(StaplerRequest2 req) throws ServletException, IOException {
             getStore().checkPermission(CREATE);
             String requestContentType = req.getContentType();
+
+            String acceptHeader = req.getHeader("Accept");
             if (requestContentType == null) {
                 throw new Failure("No Content-Type header set");
             }
+            boolean jsonResponse = acceptHeader != null && acceptHeader.contains("application/json");
 
             if (requestContentType.startsWith("application/xml") || requestContentType.startsWith("text/xml")) {
                 final StringWriter out = new StringWriter();
@@ -753,7 +756,20 @@
             } else {
                 JSONObject data = req.getSubmittedForm();
                 Credentials credentials = Descriptor.bindJSON(req, Credentials.class, data.getJSONObject("credentials"));
-                getStore().addCredentials(domain, credentials);
+                boolean credentialsWereAdded = getStore().addCredentials(domain, credentials);
+
+                if (jsonResponse) {
+                    if (credentialsWereAdded) {
+                        return HttpResponses.okJSON(new JSONObject()
+                                .element("message", "Credentials created")
+                                .element("notificationType", "SUCCESS"));
+                    } else {
+                        return HttpResponses.okJSON(new JSONObject()
+                                .element("message", "Credentials with specified ID already exist")
+                                // TODO: or domain does not exist at all?
+                                .element("notificationType", "ERROR"));
+                    }
+                }
                 return HttpResponses.redirectTo("../../domain/" + getUrlName());
             }
         }

src/main/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl.java

@@ -232,6 +232,12 @@
             return Messages.CertificateCredentialsImpl_DisplayName();
         }
 
+        @Override
+        public String getDescription() {
+            // TODO - this is ChatGPT content
+            return "Upload a file and store it securely (for example, a key file, config file, or license file).";
+        }
+
         /**
          * {@inheritDoc}
          */

src/main/java/com/cloudbees/plugins/credentials/impl/UsernamePasswordCredentialsImpl.java

@@ -134,6 +134,12 @@
             return Messages.UsernamePasswordCredentialsImpl_DisplayName();
         }
 
+        @Override
+        public String getDescription() {
+            // TODO - this is ChatGPT content
+            return "Use for basic auth (username and password) to services like Git, APIs, or registries.";
+        }
+
         /**
          * {@inheritDoc}
          */

src/main/resources/com/cloudbees/plugins/credentials/CredentialsStoreAction/DomainWrapper/dialog.jelly

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ The MIT License
+ ~
+ ~ Copyright (c) 2011-2016, CloudBees, Inc., Stephen Connolly.
+ ~
+ ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+ ~ of this software and associated documentation files (the "Software"), to deal
+ ~ in the Software without restriction, including without limitation the rights
+ ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ ~ copies of the Software, and to permit persons to whom the Software is
+ ~ furnished to do so, subject to the following conditions:
+ ~
+ ~ The above copyright notice and this permission notice shall be included in
+ ~ all copies or substantial portions of the Software.
+ ~
+ ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ ~ THE SOFTWARE.
+ -->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+    <st:setHeader name="X-Wizard-Title" value="${%Add Credentials}" />
+
+    <l:ajax>
+
+        <j:set var="relativePath" value="${request2.getParameter('relativePath')}"/>
+
+        <j:choose>
+            <j:when test="${request2.getParameter('refill') == 'true'}">
+                <j:set var="query" value="?refill=true&amp;relativePath=${relativePath}"/>
+            </j:when>
+            <j:otherwise>
+                <j:set var="query" value="?relativePath=${relativePath}"/>
+            </j:otherwise>
+        </j:choose>
+
+        <form action="${relativePath}dialog2${query}" method="GET" name="dialog">
+            <fieldset class="jenkins-!-display-contents">
+                <div>
+                    <legend class="jenkins-form-label">${%Select a type of credential}</legend>
+                    <div class="jenkins-choice-list">
+                        <j:forEach var="kind" items="${it.store.credentialsDescriptors}">
+                            <div class="jenkins-choice-list__item">
+                                <label>
+                                    <div class="jenkins-choice-list__item__icon">
+                                        <l:icon src="${kind.iconClassName}" />
+                                    </div>
+                                    <input type="radio" name="kind" value="${kind.id}" />
+                                    <div class="jenkins-choice-list__item__label">
+                                        ${kind.displayName}
+                                    </div>
+                                    <j:if test="${kind.description != null}">
+                                        <div class="jenkins-choice-list__item__description">${kind.description}</div>
+                                    </j:if>
+                                </label>
+                            </div>
+                        </j:forEach>
+                    </div>
+                </div>
+            </fieldset>
+
+            <f:bottomButtonBar borderless="true">
+                <button id="cr-dialog-next" class="jenkins-button jenkins-button--primary cr-bottom-button" disabled="true">${%Next}</button>
+            </f:bottomButtonBar>
+        </form>
+    </l:ajax>
+</j:jelly>