early support for web ui
This commit is contained in:
parent
80fce3f115
commit
c865c09649
@ -9,3 +9,15 @@
|
||||
* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
pub use log::{info, log, warn};
|
||||
pub use tide::{Middleware, prelude::*, Request, Response, Result, utils::After};
|
||||
|
||||
pub use yggdrasil::*;
|
||||
|
||||
pub fn nest(db: Database) -> tide::Server<Database> {
|
||||
info!("Loading nest");
|
||||
|
||||
let mut nest = tide::with_state(db.to_owned());
|
||||
|
||||
nest
|
||||
}
|
@ -19,6 +19,7 @@ pub mod authlib;
|
||||
pub mod profile;
|
||||
pub mod session;
|
||||
pub mod aliases;
|
||||
pub mod admin;
|
||||
|
||||
pub async fn start(db: &Database) -> anyhow::Result<()> {
|
||||
let mut app = tide::with_state(db.to_owned());
|
||||
@ -53,13 +54,14 @@ pub async fn start(db: &Database) -> anyhow::Result<()> {
|
||||
});
|
||||
|
||||
// Routes
|
||||
app.at("/").nest(aliases::nest(db.to_owned()));
|
||||
|
||||
app.at("/auth/").nest(auth::nest(db.to_owned()));
|
||||
app.at("/session/").nest(session::nest(db.to_owned()));
|
||||
|
||||
app.at("/authlib/").nest(authlib::nest(db.to_owned()));
|
||||
|
||||
app.at("/").nest(aliases::nest(db.to_owned()));
|
||||
|
||||
app.at("/admin/").nest(admin::nest(db.to_owned()));
|
||||
|
||||
// Listen
|
||||
app.listen(format!("{}:{}", &db.config.address, &db.config.port)).await?;
|
||||
|
@ -15,9 +15,6 @@ use tide::{Request, Result};
|
||||
use yggdrasil::Database;
|
||||
|
||||
pub async fn delete_skin(req: Request<Database>) -> Result {
|
||||
// let authorization = req.header("authorization");
|
||||
// if (authorization.is_none()) { return Err(YggdrasilError::new_base().into()) }
|
||||
|
||||
Err(tide::Error::new(501, anyhow!("Not implemented yet")).into())
|
||||
}
|
||||
|
||||
|
@ -75,6 +75,16 @@ impl Account {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn set_password(&self, db: &Database, password: String) -> Result<()> {
|
||||
let password_hash = bcrypt::hash(password, 12)?;
|
||||
|
||||
sqlx::query!("UPDATE accounts SET password_hash = $1 WHERE id = $2", password_hash, self.id)
|
||||
.execute(&db.pool)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn new(db: &Database, email: String, language: String, country: String, password: String) -> Result<Account> {
|
||||
let password_hash = bcrypt::hash(password, 12)?;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user