Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions admin/src/main/scala/com/neu/service/Services.scala
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,13 @@ class RoutedHttpService() extends Actor with ActorLogging with Directives {

def receive: Receive = Actor.emptyBehavior // No need to handle messages directly

def handleConnection: Receive = {
case b: Bound =>
log.info("***REST Server Started***")
case failed: CommandFailed =>
log.warning("***REST Server Could not be Started***" + failed.cmd.failureMessage)
def handleConnection: Receive = { case x: Matchable =>
x match {
case b: Bound =>
log.info("***REST Server Started***")
case failed: CommandFailed =>
log.warning("***REST Server Could not be Started***" + failed.cmd.failureMessage)
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@ import com.neu.core.AuthenticationManager
import com.neu.model.AuthTokenJsonProtocol.{ *, given }
import com.neu.model.*
import org.apache.pekko.http.scaladsl.model.*
import org.apache.pekko.http.scaladsl.model.headers.HttpCookie
import org.apache.pekko.http.scaladsl.server.RequestContext
import org.apache.pekko.http.scaladsl.server.Route
import org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal
import org.apache.pekko.stream.Materializer
import spray.json.*

import java.nio.charset.StandardCharsets
import java.util.Base64
import scala.concurrent.Await
import scala.concurrent.ExecutionContext
import scala.concurrent.Future
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,9 @@ export class ConfigFormComponent implements OnInit, OnDestroy {
if (webhook.type === OtherWebhookType) {
webhook.type = '';
}
if (webhook.password === '') {
webhook.password = null;
}
webhook.url = webhook.url.trim();
return webhook;
}),
Expand Down
Loading