Merge remote-tracking branch 'origin/develop' into develop

Author: hlxid

src/main/scala/ScalatraBootstrap.scala

@@ -11,7 +11,7 @@ import org.scalatra._
   * This class provides all runtime information for Scalatra. Servlets are mounted here.
   */
 class ScalatraBootstrap extends LifeCycle {
-  val apiVersion = "3.0.0-2"
+  val apiVersion = "3.0.0-3"
   implicit val swagger: CodeOverflowSwagger = new CodeOverflowSwagger(apiVersion)
 
   override def init(context: ServletContext) {

src/main/scala/org/codeoverflow/chatoverflow/ui/web/rest/config/ConfigController.scala

@@ -90,6 +90,9 @@ class ConfigController(implicit val swagger: Swagger) extends JsonServlet with C
         } else if (chatOverflow.isLoaded) {
           ResultMessage(success = false, "Framework already loaded.")
 
+        } else if (password == "") {
+          ResultMessage(success = false, "Password must not be empty.")
+
         } else {
           chatOverflow.credentialsService.setPassword(password.toCharArray)
 

src/main/scala/org/codeoverflow/chatoverflow/ui/web/rest/config/ConfigControllerDefinition.scala

@@ -51,7 +51,7 @@ trait ConfigControllerDefinition extends SwaggerSupport with TagSupport with Aut
       summary "Registers the user with the given password. Can only be called if there is no credentials file."
       description "Creates a credentials file with the given password. Acts like post(login) after this (returning an auth key)."
       tags controllerTag
-      parameter bodyParam[Password]("body").description("Requires the user framework password. The auth key is based on this input."))
+      parameter bodyParam[Password]("body").description("Requires the user framework password (must not be empty). The auth key is based on this input."))
 
   override def controllerTag: String = "config"
 

src/main/scala/org/codeoverflow/chatoverflow/ui/web/rest/connector/ConnectorController.scala

@@ -47,6 +47,9 @@ class ConnectorController(implicit val swagger: Swagger) extends JsonServlet wit
               if (connectorClass.isEmpty) {
                 ResultMessage(success = false, "Connector type not found.")
 
+              } else if (sourceIdentifier == "") {
+                ResultMessage(success = false, "Source identifier must not be empty.")
+
               } else if (!ConnectorRegistry.addConnector(sourceIdentifier, uniqueTypeString)) {
                 ResultMessage(success = false, "Unable to add connector.")
 

src/main/scala/org/codeoverflow/chatoverflow/ui/web/rest/connector/ConnectorControllerDefinition.scala

@@ -28,7 +28,7 @@ trait ConnectorControllerDefinition extends SwaggerSupport with TagSupport with
       description "Creates a connector with given sourceIdentifier and connector type."
       tags controllerTag
       parameter authHeader
-      parameter bodyParam[ConnectorRef]("body").description("Requires platform specific source identifier and connector type."))
+      parameter bodyParam[ConnectorRef]("body").description("Requires platform specific source identifier (must not be empty) and connector type."))
   val deleteConnector: OperationBuilder =
     (apiOperation[ResultMessage]("deleteConnector")
       summary "Deletes a specific connector."

src/main/scala/org/codeoverflow/chatoverflow/ui/web/rest/plugin/PluginInstanceController.scala

@@ -228,6 +228,9 @@ class PluginInstanceController(implicit val swagger: Swagger) extends JsonServle
             } else if (!chatOverflow.pluginFramework.pluginExists(pluginName, pluginAuthor)) {
               ResultMessage(success = false, "Plugin type does not exist.")
 
+            } else if (instanceName == "") {
+              ResultMessage(success = false, "Instance name must not be empty.")
+
             } else {
               val pluginType = chatOverflow.pluginFramework.getPlugin(pluginName, pluginAuthor)
 

src/main/scala/org/codeoverflow/chatoverflow/ui/web/rest/plugin/PluginInstanceControllerDefinition.scala

@@ -66,7 +66,7 @@ trait PluginInstanceControllerDefinition extends SwaggerSupport with TagSupport
       description "Creates a new plugin instance with given name and plugin type."
       tags controllerTag
       parameter authHeader
-      parameter bodyParam[PluginInstanceRef]("body").description("Requires new instance name and PluginType (name and author)."))
+      parameter bodyParam[PluginInstanceRef]("body").description("Requires new instance name (must not be empty) and PluginType (name and author)."))
   val deleteInstance: OperationBuilder =
     (apiOperation[ResultMessage]("deleteInstance")
       summary "Removes a plugin instance."