M .drone.yml => .drone.yml +14 -14
@@ 129,7 129,7 @@ steps:
---
kind: pipeline
type: docker
-name: api_ci
+name: backplane_ci
trigger:
event:
exclude:
@@ 137,10 137,10 @@ trigger:
- rollback
steps:
- - name: api_fmt
+ - name: backplane_fmt
image: coresdev/stk_build_env
commands:
- - cd starkingdoms-api
+ - cd starkingdoms-backplane
- rustfmt **/*.rs --check --edition 2021 --color always
environment:
SCCACHE_REGION: us-east-1
@@ 155,10 155,10 @@ steps:
RUSTC_WRAPPER: sccache
SCCACHE_USE_SSL: "true"
CARGO_INCREMENTAL: "0"
- - name: api_clippy
+ - name: backplane_clippy
image: coresdev/stk_build_env
commands:
- - cd starkingdoms-api
+ - cd starkingdoms-backplane
- cargo clippy --color always
environment:
SCCACHE_REGION: us-east-1
@@ 173,10 173,10 @@ steps:
RUSTC_WRAPPER: sccache
SCCACHE_USE_SSL: "true"
CARGO_INCREMENTAL: "0"
- - name: api_build
+ - name: backplane_build
image: coresdev/stk_build_env
commands:
- - cd starkingdoms-api
+ - cd starkingdoms-backplane
- cargo build --release --color always
environment:
SCCACHE_REGION: us-east-1
@@ 191,12 191,12 @@ steps:
RUSTC_WRAPPER: sccache
SCCACHE_USE_SSL: "true"
CARGO_INCREMENTAL: "0"
- - name: upload_api
+ - name: upload_backplane
image: plugins/s3
depends_on:
- - api_build
- - api_fmt
- - api_clippy
+ - backplane_build
+ - backplane_fmt
+ - backplane_clippy
settings:
bucket:
from_secret: s3_bucket
@@ 206,8 206,8 @@ steps:
from_secret: s3_access_key
secret_key:
from_secret: s3_secret_key
- source: target/release/starkingdoms-api
- target: builds/${DRONE_COMMIT_SHA}/starkingdoms-api
+ source: target/release/starkingdoms-backplane
+ target: builds/${DRONE_COMMIT_SHA}/starkingdoms-backplane
path_style: true
---
@@ 217,7 217,7 @@ name: trigger_deploy
depends_on:
- client_ci
- server_ci
- - api_ci
+ - backplane_ci
trigger:
event:
exclude:
M .gitignore => .gitignore +1 -1
@@ 12,4 12,4 @@ assets/final
starkingdoms-client/node_modules
starkingdoms-client/dist
client/node_modules
-starkingdoms-api/config.toml>
\ No newline at end of file
+starkingdoms-backplane/config.toml<
\ No newline at end of file
M Cargo.lock => Cargo.lock +1 -30
@@ 1594,7 1594,6 @@ dependencies = [
"byteorder",
"diesel_derives",
"itoa",
- "pq-sys",
"serde_json",
]
@@ 1626,17 1625,6 @@ dependencies = [
]
[[package]]
-name = "diesel_json"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc50de1d729b55dfbb03e2d2db846684e3ab585f4ee9cfc3c675d236f951888"
-dependencies = [
- "diesel",
- "serde",
- "serde_json",
-]
-
-[[package]]
name = "diesel_migrations"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ 3018,15 3006,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
-name = "pq-sys"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0052426df997c0cbd30789eb44ca097e3541717a7b8fa36b1c464ee7edebd"
-dependencies = [
- "vcpkg",
-]
-
-[[package]]
name = "proc-macro-crate"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ 3489,7 3468,7 @@ dependencies = [
]
[[package]]
-name = "starkingdoms-api"
+name = "starkingdoms-backplane"
version = "0.0.1"
dependencies = [
"actix-cors",
@@ 3498,7 3477,6 @@ dependencies = [
"bb8",
"diesel",
"diesel-async",
- "diesel_json",
"diesel_migrations",
"env_logger",
"hmac",
@@ 3510,7 3488,6 @@ dependencies = [
"serde",
"serde_json",
"sha2",
- "starkingdoms-common",
"toml 0.8.8",
]
@@ 3972,12 3949,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
M Cargo.toml => Cargo.toml +1 -1
@@ 1,7 1,7 @@
[workspace]
members = [
"server",
- "starkingdoms-api",
+ "starkingdoms-backplane",
"starkingdoms-common"
]
resolver = "2"
D starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/down.sql => starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/down.sql +0 -1
@@ 1,1 0,0 @@
-DROP TABLE savefiles;>
\ No newline at end of file
D starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/up.sql => starkingdoms-api/migrations/2023-11-30-181014_create_table_savefiles/up.sql +0 -5
@@ 1,5 0,0 @@
-CREATE TABLE savefiles (
- id BIGINT NOT NULL PRIMARY KEY,
- user_id BIGINT NOT NULL REFERENCES users(id),
- save_data jsonb NOT NULL
-);>
\ No newline at end of file
D starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/down.sql => starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/down.sql +0 -1
@@ 1,1 0,0 @@
-ALTER TABLE users DROP COLUMN latest_savefile;>
\ No newline at end of file
D starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/up.sql => starkingdoms-api/migrations/2023-11-30-183150_alter_table_users_add_latest_savefile/up.sql +0 -1
@@ 1,1 0,0 @@
-ALTER TABLE users ADD COLUMN latest_savefile BIGINT NULL REFERENCES savefiles(id);>
\ No newline at end of file
R starkingdoms-api/.env => starkingdoms-backplane/.env +0 -0
R starkingdoms-api/Cargo.toml => starkingdoms-backplane/Cargo.toml +3 -5
@@ 1,9 1,9 @@
[package]
-name = "starkingdoms-api"
+name = "starkingdoms-backplane"
version = "0.0.1"
authors = ["core <core@e3t.cc>"]
edition = "2021"
-description = "The API server that powers StarKingdoms"
+description = "The backplane (auth) server that powers StarKingdoms"
license = "AGPL-3"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ 26,6 26,4 @@ password-hash = "0.5"
rs-snowflake = "0.6"
jwt = "0.16"
sha2 = "0.10"
-hmac = "0.12"
-starkingdoms-common = { version = "0.1", path = "../starkingdoms-common" }
-diesel_json = "0.2">
\ No newline at end of file
+hmac = "0.12"<
\ No newline at end of file
R starkingdoms-api/build.rs => starkingdoms-backplane/build.rs +0 -0
R starkingdoms-api/diesel.toml => starkingdoms-backplane/diesel.toml +0 -0
R starkingdoms-api/migrations/.keep => starkingdoms-backplane/migrations/.keep +0 -0
R starkingdoms-api/migrations/00000000000000_diesel_initial_setup/down.sql => starkingdoms-backplane/migrations/00000000000000_diesel_initial_setup/down.sql +0 -0
R starkingdoms-api/migrations/00000000000000_diesel_initial_setup/up.sql => starkingdoms-backplane/migrations/00000000000000_diesel_initial_setup/up.sql +0 -0
R starkingdoms-api/migrations/2023-11-30-013338_create_table_users/down.sql => starkingdoms-backplane/migrations/2023-11-30-013338_create_table_users/down.sql +0 -0
R starkingdoms-api/migrations/2023-11-30-013338_create_table_users/up.sql => starkingdoms-backplane/migrations/2023-11-30-013338_create_table_users/up.sql +0 -0
R starkingdoms-api/src/auth.rs => starkingdoms-backplane/src/auth.rs +0 -0
R starkingdoms-api/src/config.rs => starkingdoms-backplane/src/config.rs +0 -0
R starkingdoms-api/src/error.rs => starkingdoms-backplane/src/error.rs +0 -0
R starkingdoms-api/src/main.rs => starkingdoms-backplane/src/main.rs +0 -0
R starkingdoms-api/src/models.rs => starkingdoms-backplane/src/models.rs +1 -12
@@ 26,15 26,4 @@ pub struct User {
pub username: String,
pub password_hash: String,
pub permission_level: i32,
- pub latest_savefile: Option<i64>,
-}
-
-#[derive(Queryable, Selectable, Insertable, Identifiable, Debug, PartialEq, Clone)]
-#[diesel(table_name = crate::schema::savefiles)]
-#[diesel(check_for_backend(diesel::pg::Pg))]
-#[diesel(belongs_to(User))]
-pub struct Savefile {
- pub id: i64,
- pub user_id: i64,
- pub save_data: Json<PlayerSaveFile>,
-}
+}<
\ No newline at end of file
R starkingdoms-api/src/response.rs => starkingdoms-backplane/src/response.rs +0 -0
R starkingdoms-api/src/routes/login.rs => starkingdoms-backplane/src/routes/login.rs +0 -0
R starkingdoms-api/src/routes/mod.rs => starkingdoms-backplane/src/routes/mod.rs +0 -0
R starkingdoms-api/src/routes/signup.rs => starkingdoms-backplane/src/routes/signup.rs +0 -1
@@ 56,7 56,6 @@ pub async fn signup_req(
username: req.username.to_string(),
password_hash: hash.to_string(),
permission_level: 0,
- latest_savefile: None,
};
handle_error!(
R starkingdoms-api/src/schema.rs => starkingdoms-backplane/src/schema.rs +0 -11
@@ 1,21 1,10 @@
// @generated automatically by Diesel CLI.
diesel::table! {
- savefiles (id) {
- id -> Int8,
- user_id -> Int8,
- save_data -> Jsonb,
- }
-}
-
-diesel::table! {
users (id) {
id -> Int8,
username -> Varchar,
password_hash -> Varchar,
permission_level -> Int4,
- latest_savefile -> Nullable<Int8>,
}
}
-
-diesel::allow_tables_to_appear_in_same_query!(savefiles, users,);
R starkingdoms-api/src/tokens.rs => starkingdoms-backplane/src/tokens.rs +0 -0
M starkingdoms-client/src/config.json => starkingdoms-client/src/config.json +2 -1
@@ 32,5 32,6 @@
"isDevelopment": true,
"isPrimary": false
}
- }
+ },
+ "backplane": "https://backplane.starkingdoms.io"
}