This commit is contained in:
Eugene Pankov 2022-08-28 00:28:12 +02:00
parent 797ac4073c
commit c179585742
No known key found for this signature in database
GPG key ID: 5896FCBBDD1CF4F4
5 changed files with 10 additions and 6 deletions

View file

@ -84,8 +84,7 @@ pub async fn sanitize_db(db: &mut DatabaseConnection) -> Result<(), WarpgateErro
.filter(Role::Column::Name.eq(BUILTIN_ADMIN_ROLE_NAME))
.all(db)
.await?
.iter()
.next()
.first()
{
Some(x) => x.to_owned(),
None => {
@ -101,8 +100,7 @@ pub async fn sanitize_db(db: &mut DatabaseConnection) -> Result<(), WarpgateErro
.filter(Target::Column::Kind.eq(TargetKind::WebAdmin))
.all(db)
.await?
.iter()
.next()
.first()
{
Some(x) => x.to_owned(),
None => {

View file

@ -1,7 +1,7 @@
#![feature(let_else, drain_filter, duration_constants)]
pub mod consts;
mod data;
mod state;
pub mod consts;
pub use data::*;
pub use state::{SessionState, SessionStateInit, State};
mod config_providers;

View file

@ -25,6 +25,7 @@
"@openapitools/openapi-generator-cli": "^2.5.1",
"@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",
"@tsconfig/svelte": "^3.0.0",
"@types/shell-escape": "^0.2.1",
"@typescript-eslint/eslint-plugin": "^5.28.0",
"@typescript-eslint/parser": "^5.28.0",
"bootstrap": "^5.2.0-beta1",

View file

@ -237,6 +237,11 @@
dependencies:
"@types/node" "*"
"@types/shell-escape@^0.2.1":
version "0.2.1"
resolved "https://registry.yarnpkg.com/@types/shell-escape/-/shell-escape-0.2.1.tgz#34631545340aa61bbabb672b906f1b910cd42757"
integrity sha512-95hZXmBvwtvsLMPefKT9xquUSAJXsVDUaipyUiYoYi3ZdLhZ3w30w230Ugs96IdoJQb5ECvj0D82Jj/op00qWQ==
"@typescript-eslint/eslint-plugin@^5.28.0":
version "5.28.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.28.0.tgz#6204ac33bdd05ab27c7f77960f1023951115d403"

View file

@ -14,8 +14,8 @@ use warpgate_common::{
HTTPConfig, ListenEndpoint, MySQLConfig, Role, SSHConfig, Secret, Target, TargetOptions,
TargetWebAdminOptions, User, UserAuthCredential, WarpgateConfigStore,
};
use warpgate_core::Services;
use warpgate_core::consts::BUILTIN_ADMIN_ROLE_NAME;
use warpgate_core::Services;
use crate::config::load_config;