Jengamon/noteboek - Change W6W6YBQ6VLEPWLG6GG5VJIJ3LGDISF42HAEC5KV3G5CAMCHIHXAQC

updating to use ulids n stuff

Created by Jengamon on February 1, 2024

W6W6YBQ6VLEPWLG6GG5VJIJ3LGDISF42HAEC5KV3G5CAMCHIHXAQC

Dependencies

In channels

main

Change contents

File addition: util.rs (----------)

[3.35]

use surrealdb::sql::Uuid;
use ulid::Ulid;
pub fn ulid_to_suuid(ulid: Ulid) -> Uuid {
    let uuid: uuid::Uuid = ulid.into();
    uuid.into()
}

Insertion in server/src/user.rs at line 9 [2.32]
[2.417]
[2.417]
```
use ulid::Ulid;
```

Insertion in server/src/user.rs at line 50 [2.32]

[2.1396]

        const DEFAULT_CODE: u64 = 3033132;
        const MAX_CODE: u64 = 999999;

Replacement in server/src/user.rs at line 53 [2.32]

B:BD[2.1475] → [2.1475:1615]

        ulid::Ulid::from_string(&self.id.to_string())
            .map(|ulid| ulid.timestamp_ms() % 999999)
            .unwrap_or(3033132)

[2.1475]

[2.1615]

        let ulid: Ulid = match Ulid::from_string(&self.id.id.to_raw()) {
            Ok(ulid) => ulid,
            Err(_) => return DEFAULT_CODE,
        };
        ulid.timestamp_ms() % MAX_CODE

Replacement in server/src/phonemes.rs at line 1 [3.73]

B:BD[3.73] → [3.74:178]

use axum::{extract::State, routing::get, Router};
use surrealdb::{engine::remote::ws::Client, Surreal};

[3.73]

[3.178]

use axum::{routing::get, Router};

Replacement in server/src/phonemes.rs at line 9 [3.73]

B:BD[3.297] → [3.297:374]

async fn hello_phonemes(State(db): State<Surreal<Client>>) -> &'static str {

[3.297]

[3.374]

async fn hello_phonemes() -> &'static str {

Insertion in server/src/main.rs at line 5 [3.431]
[2.3985]
[3.457]
```
mod util;
```
Deletion in server/src/auth.rs at line 8 [2.5984]
B:BD[2.6135] → [2.6135:6156]
```
use secrecy::Secret;
```
Insertion in server/src/auth.rs at line 14 [2.5984]
[2.6352]
[2.6352]
```
    util::ulid_to_suuid,
```
Replacement in server/src/auth.rs at line 36 [2.5984]
B:BD[2.6872] → [2.6872:6914]
```
        .route("/signup", post(new_user))
```
[2.6872]
[2.6914]
```
        .route("/signup", post(signup))
```
Replacement in server/src/auth.rs at line 39 [2.5984]
B:BD[2.6917] → [2.6917:6958]
```
#[derive(Debug, Deserialize, Serialize)]
```
[2.6917]
[2.6958]
```
#[derive(Debug, Deserialize)]
```

Insertion in server/src/auth.rs at line 41 [2.5984]

[2.6974]

    email: String,
    username: String,
    password: String,
}
#[derive(Serialize)]
struct SignupSafe {

Insertion in server/src/auth.rs at line 53 [2.5984]

[2.7048]

impl From<Signup> for SignupSafe {
    fn from(value: Signup) -> Self {
        Self {
            email: value.email,
            username: value.username,
            password: SecretPassword::new(Password::new(value.password)),
        }
    }
}

Replacement in server/src/auth.rs at line 64 [2.5984]
B:BD[2.7095] → [2.7095:7114]
```
async fn new_user(
```
[2.7095]
[2.7114]
```
async fn signup(
```

Replacement in server/src/auth.rs at line 69 [2.5984]

B:BD[2.7273] → [2.7273:7444]

    let users: Vec<User> = db.create("user").content(signup).await?;
    dbg!(&users);
    assert!(users.len() == 1);
    let Some(user) = users.into_iter().next() else {

[2.7273]

[2.7444]

    let id = ulid::Ulid::new();
    let user: Option<User> =
        db.create(("user", ulid_to_suuid(id))).content::<SignupSafe>(signup.into()).await?;
    let Some(user) = user else {

Replacement in server/src/auth.rs at line 110 [2.5984]

B:BD[2.8669] → [2.8669:8711]

        Redirect::to("/").into_response()

[2.8669]

[2.8711]

        StatusCode::NO_CONTENT.into_response()

File deletion: history.txt

BF:BFD[2.9365] → [2.9477:9512]

BF:BFD[2.9512] → [2.9513:9513]

B:BD[2.9513] → [2.9514:14138]

#V2
DEFINE TABLE user SCHEMAFULL;
DEFINE TABLE permission SCHEMAFULL;
DEFINE TABLE granted SCHEMAFULL;
USE NAMESPACE noteboek;
USE DATABASE noteboek;
DEFINE TABLE user SCHEMAFULL;
DEFINE TABLE permission SCHEMAFULL;
DEFINE TABLE granted SCHEMAFULL;
/**/q
q
USE NAMESPACE noteboek;
USE DATABASE noteboek;
DEFINE TABLE user SCHEMAFULL;
DEFINE FIELD email ON TABLE user TYPE string ASSERT string::is::email($value);
DEFINE FIELD username ON TABLE user TYPE string;
DEFINE FIELD code ON TABLE user TYPE int DEFAULT rand::int(0, 9999999);
DEFINE FIELD password ON TABLE user TYPE string;
DEFINE INDEX unique_id ON TABLE user COLUMNS username, code UNIQUE;
DEFINE TABLE permission SCHEMAFULL;
DEFINE FIELD id ON TABLE permission TYPE string;
DEFINE FIELD aspect ON TABLE permission TYPE string;
DEFINE TABLE granted SCHEMAFULL;
DEFINE FIELD in ON TABLE granted TYPE record<user>;
DEFINE FIELD out ON TABLE granted TYPE record<permission>;
DEFINE FIELD granted ON TABLE granted TYPE datetime DEFAULT time::now();
DEFINE INDEX unique_permissions ON TABLE granted COLUMNS in, out UNIQUE;
USE NAMESPACE noteboek;
USE DATABASE noteboek;
DEFINE TABLE user SCHEMAFULL;
DEFINE FIELD email ON TABLE user TYPE string ASSERT string::is::email($value);
DEFINE FIELD username ON TABLE user TYPE string;
USE NAMESPACE noteboek;
USE DATABASE noteboek;
DEFINE TABLE user SCHEMAFULL;
DEFINE FIELD email ON TABLE user TYPE string ASSERT string::is::email($value);
DEFINE FIELD username ON TABLE user TYPE string;
DEFINE FIELD code ON TABLE user TYPE int DEFAULT rand::ulid();
DEFINE FIELD password ON TABLE user TYPE string;
DEFINE INDEX unique_id ON TABLE user COLUMNS username, code UNIQUE;
DEFINE TABLE permission SCHEMAFULL;
DEFINE FIELD id ON TABLE permission TYPE string;
DEFINE FIELD aspect ON TABLE permission TYPE string;
DEFINE TABLE granted SCHEMAFULL;
DEFINE FIELD in ON TABLE granted TYPE record<user>;
DEFINE FIELD out ON TABLE granted TYPE record<permission>;
DEFINE FIELD granted ON TABLE granted TYPE datetime DEFAULT time::now();
DEFINE INDEX unique_permissions ON TABLE granted COLUMNS in, out UNIQUE;
USE NAMESPACE noteboek;
USE DATABASE noteboek;
DEFINE TABLE user SCHEMAFULL;
DEFINE FIELD email ON TABLE user TYPE string ASSERT string::is::email($value);
DEFINE FIELD username ON TABLE user TYPE string;
DEFINE FIELD id ON TABLE user TYPE string DEFAULT rand::ulid();
DEFINE FIELD password ON TABLE user TYPE string;
DEFINE INDEX unique_id ON TABLE user COLUMNS username, id UNIQUE;
DEFINE TABLE permission SCHEMAFULL;
DEFINE FIELD id ON TABLE permission TYPE string;
DEFINE FIELD aspect ON TABLE permission TYPE string;
DEFINE TABLE granted SCHEMAFULL;
DEFINE FIELD in ON TABLE granted TYPE record<user>;
DEFINE FIELD out ON TABLE granted TYPE record<permission>;
DEFINE FIELD granted ON TABLE granted TYPE datetime DEFAULT time::now();
DEFINE INDEX unique_permissions ON TABLE granted COLUMNS in, out UNIQUE;
USE NAMESPACE noteboek;
USE DATABASE noteboek;
DEFINE TABLE user SCHEMAFULL;
DEFINE FIELD email ON TABLE user TYPE string ASSERT string::is::email($value);
DEFINE FIELD username ON TABLE user TYPE string;
DEFINE FIELD id ON TABLE user TYPE string DEFAULT rand::ulid();
DEFINE FIELD password ON TABLE user TYPE string;
DEFINE INDEX unique_id ON TABLE user COLUMNS username, id UNIQUE;
DEFINE TABLE permission SCHEMAFULL;
DEFINE FIELD id ON TABLE permission TYPE string;
DEFINE FIELD aspect ON TABLE permission TYPE string;
DEFINE TABLE granted SCHEMAFULL;
DEFINE FIELD in ON TABLE granted TYPE record<user>;
DEFINE FIELD out ON TABLE granted TYPE record<permission>;
DEFINE FIELD granted ON TABLE granted TYPE datetime DEFAULT time::now();
DEFINE INDEX unique_permissions ON TABLE granted COLUMNS in, out UNIQUE;
USE NAMESPACE noteboek;
USE DATABASE noteboek;
DEFINE TABLE user SCHEMAFULL;
DEFINE FIELD email ON TABLE user TYPE string ASSERT string::is::email($value);
DEFINE FIELD username ON TABLE user TYPE string;
DEFINE FIELD id ON TABLE user TYPE string DEFAULT rand::ulid();
DEFINE FIELD password ON TABLE user TYPE string;
DEFINE INDEX unique_id ON TABLE user COLUMNS username, id UNIQUE;
DEFINE TABLE permission SCHEMAFULL;
DEFINE FIELD id ON TABLE permission TYPE string;
DEFINE FIELD aspect ON TABLE permission TYPE string;
DEFINE TABLE granted SCHEMAFULL;
DEFINE FIELD in ON TABLE granted TYPE record<user>;
DEFINE FIELD out ON TABLE granted TYPE record<permission>;
DEFINE FIELD granted ON TABLE granted TYPE datetime DEFAULT time::now();
DEFINE INDEX unique_permissions ON TABLE granted COLUMNS in, out UNIQUE;
INFO FOR TABLE user
DROP 
DELETE user.code;
REMOVE FIELD code ON user;
INFO FOR TABLE user

Deletion in server/migrations/20240201_000001_create_user_and_permission_table.surql at line 7 [2.14218]
B:BD[2.14425] → [2.14425:14489]
```
DEFINE FIELD id ON TABLE user TYPE string DEFAULT rand::ulid();
```
Replacement in server/migrations/20240201_000001_create_user_and_permission_table.surql at line 8 [2.14218]
B:BD[2.14538] → [2.14538:14604]
```
DEFINE INDEX unique_id ON TABLE user COLUMNS username, id UNIQUE;
```
[2.14538]
[2.14604]
```
DEFINE INDEX unique_email ON TABLE user COLUMNS email UNIQUE;
```
Deletion in server/migrations/20240201_000001_create_user_and_permission_table.surql at line 11 [2.14218]
B:BD[2.14641] → [2.14641:14690]
```
DEFINE FIELD id ON TABLE permission TYPE string;
```
File addition: .ignore (----------)
[2.9365]
```
history.txt
```
Replacement in server/Cargo.toml at line 24 [3.4662]
B:BD[3.5415] → [2.15289:15304]
```
ulid = "1.1.1"
```
[3.5415]
```
ulid = { version = "1.1.1", features = ["serde", "uuid"] }
uuid = "1.7.0"
```
Insertion in frontend/src/app.rs at line 1 [3.6404]
[3.6404]
[3.6405]
```
mod error;
```
Replacement in frontend/src/app.rs at line 76 [3.6404]
B:BD[2.15553] → [2.15553:15583]
```
#[derive(Deserialize, Debug)]
```
[2.15553]
[2.15583]
```
#[derive(Deserialize, Debug, PartialEq)]
```

Replacement in frontend/src/app.rs at line 106 [3.6404]

B:BD[2.16279] → [2.16279:16695]

async fn create_new_user(
    signup: &Signup,
) -> Result<std::collections::HashMap<String, String>, String> {
    Ok(gloo_net::http::Request::post("/api/v1/signup")
        .json(signup)
        .map_err(|e| format!("JSON creation error: {e}"))?
        .send()
        .await
        .map_err(|e| format!("Send error: {e}"))?
        .json()
        .await
        .map_err(|e| format!("JSON read error: {e}"))?)

[2.16279]

[2.16695]

async fn create_new_user(signup: &Signup) -> Result<gloo_net::http::Response, gloo_net::Error> {
    Ok(gloo_net::http::Request::post("/api/v1/signup").json(signup)?.send().await?)

Insertion in frontend/src/app.rs at line 112 [3.6404]

[2.16745]

    #[derive(Clone, Copy, PartialEq)]
    enum LoginViewMode {
        Signup,
        Login,
    }
    let (mode, set_mode) = create_signal(LoginViewMode::Login);

Replacement in frontend/src/app.rs at line 126 [3.6404]

B:BD[2.17239] → [2.17239:17390]

            let ret = create_new_user(&signup).await;
            if ret.is_ok() {
                user_status.refetch()
            }
            ret

[2.17239]

[2.17390]

            let resp = create_new_user(&signup).await.map_err(|err| error::ApiError {
                code: error::ErrorCode::JsSendError,
                message: err.to_string(),
            })?;
            let resp_parsed: Result<(), error::ApiError> = resp.json().await.map_err(|err| {
                error::ApiError { code: error::ErrorCode::JsReadError, message: err.to_string() }
            })?;
            resp_parsed

Replacement in frontend/src/app.rs at line 139 [3.6404]

B:BD[2.17409] → [2.17409:18190]

    mview! {
        [user_status.with(|user| match user {
            Some(Ok(status)) => match status {
                UserStatus::Anonymous => "not logged in".to_string(),
                UserStatus::LoggedIn { username, code } => format!("logged in as {username}#{code}")
            }.into_view(),
            Some(Err(e)) =>{
                let e = format!("{}", e);
                mview! {
                    div class="text-error bg-slate-500" { [e.clone()] }
                }.into_view()
            },
            None => "Loading...".into_view()
        })]
        Form action="/api/v1/login" method="POST" {
            input type="email" name="email";
            input type="password" name="password";
            button type="submit" {
                "Login"

[2.17409]

[2.18190]

    let login_view = move || {
        if user_status.with(|user| {
            user.as_ref().is_some_and(|status| {
                status.as_ref().is_ok_and(|status| status == &UserStatus::Anonymous)
            })
        }) {
            mview! {
            Form action="/api/v1/login" method="POST" class="join join-vertical my-2" {
                label for="email" class="label" {
                    span class="label-text" { "Email" }
                }
                input type="email" id="email" name="email" class="input input-bordered w-full max-w-xs";
                label for="password" class="label" {
                    span class="label-text" { "Password" }
                }
                input type="password" id="password" name="password" class="input input-bordered w-full max-w-xs";
                button type="submit" on:submit={move |_| user_status.refetch()} {
                    "Login"
                }

Replacement in frontend/src/app.rs at line 160 [3.6404]

B:BD[2.18214] → [2.18214:18905]

        h2 { "Signup" }
        Form action="" method="POST" {
            input type="username" name="username" prop:value=[username.get()] on:input={move |ev| set_username.set(event_target_value(&ev))};
            input type="email" name="email" prop:value=[email.get()] on:input={move |ev| set_email.set(event_target_value(&ev))};
            input type="password" name="password" prop:value=[password.get()] on:input={move |ev| set_password.set(event_target_value(&ev))};
            button type="submit" on:click={move |ev| {
                ev.prevent_default();
                signup.dispatch((username.get(), email.get(), password.get()));
            }} {
                "Login"

[2.18214]

[3.8770]

        .into_view()
        } else {
            mview! {}.into_view()
        }
    };
    let signup_view = move || {
        mview! {
            Form action="" method="POST" {
                input type="username" name="username" prop:value=[username.get()] on:input={move |ev| set_username.set(event_target_value(&ev))};
                input type="email" name="email" prop:value=[email.get()] on:input={move |ev| set_email.set(event_target_value(&ev))};
                input type="password" name="password" prop:value=[password.get()] on:input={move |ev| set_password.set(event_target_value(&ev))};
                button type="submit" on:click={move |ev| {
                    ev.prevent_default();
                    signup.dispatch((username.get(), email.get(), password.get()));
                }} {
                    "Register"
                }

Insertion in frontend/src/app.rs at line 179 [3.6404]

[3.8784]

            p { f["{:?}", signup.value().get()] }
        }.into_view()
    };
    mview! {
        div class="text-center" {
            [user_status.with(|user| match user {
                Some(Ok(status)) => match status {
                    UserStatus::Anonymous => "not logged in".to_string(),
                    UserStatus::LoggedIn { username, code } => format!("logged in as {username}#{code}")
                }.into_view(),
                Some(Err(e)) =>{
                    let e = format!("{}", e);
                    mview! {
                        div class="text-error bg-slate-500" { [e.clone()] }
                    }.into_view()
                },
                None => "Loading...".into_view()
            })]

Replacement in frontend/src/app.rs at line 199 [3.6404]

B:BD[3.8794] → [2.18906:18952]

        p { f["{:?}", signup.value().get()] }

[3.8794]

        [match mode.get() {
            LoginViewMode::Login => login_view(),
            LoginViewMode::Signup => signup_view(),
        }]

File addition: app (d--x------)
[4.800]

File addition: error.rs (----------)

[0.4997]

use core::fmt;
use serde::Deserialize;
#[derive(Deserialize, Clone, Copy, PartialEq, Eq, Hash, Debug)]
#[non_exhaustive]
#[serde(rename_all = "kebab-case")]
pub(crate) enum ErrorCode {
    // Frontend specific
    JsSendError,
    JsReadError,
    // Backend
    InvalidCredentials,
}
impl fmt::Display for ErrorCode {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        match self {
            Self::JsSendError => write!(f, "error sending json"),
            Self::JsReadError => write!(f, "error reading json"),
            Self::InvalidCredentials => write!(f, "invalid credentials"),
        }
    }
}
#[derive(Deserialize, Clone, Debug)]
pub(crate) struct ApiError {
    pub(crate) code: ErrorCode,
    pub(crate) message: String,
}
impl fmt::Display for ApiError {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        write!(f, "{}: {}", self.code, self.message)
    }
}

Insertion in Cargo.lock at line 3826 [4.24182157]
[2.21100]
[4.24219173]
```
 "uuid",
```
Insertion in Cargo.lock at line 4783 [4.24182157]
[3.86596]
[3.86596]
```
 "uuid",
```

updating to use ulids n stuff

Dependencies

In channels

Change contents

File addition: util.rs (----------)

Insertion in server/src/user.rs at line 9 [2.32]

Insertion in server/src/user.rs at line 50 [2.32]

Replacement in server/src/user.rs at line 53 [2.32]

Replacement in server/src/phonemes.rs at line 1 [3.73]

Replacement in server/src/phonemes.rs at line 9 [3.73]

Insertion in server/src/main.rs at line 5 [3.431]

Deletion in server/src/auth.rs at line 8 [2.5984]

Insertion in server/src/auth.rs at line 14 [2.5984]

Replacement in server/src/auth.rs at line 36 [2.5984]

Replacement in server/src/auth.rs at line 39 [2.5984]

Insertion in server/src/auth.rs at line 41 [2.5984]

Insertion in server/src/auth.rs at line 53 [2.5984]

Replacement in server/src/auth.rs at line 64 [2.5984]

Replacement in server/src/auth.rs at line 69 [2.5984]

Replacement in server/src/auth.rs at line 110 [2.5984]

File deletion: history.txt

Deletion in server/migrations/20240201_000001_create_user_and_permission_table.surql at line 7 [2.14218]

Replacement in server/migrations/20240201_000001_create_user_and_permission_table.surql at line 8 [2.14218]

Deletion in server/migrations/20240201_000001_create_user_and_permission_table.surql at line 11 [2.14218]

File addition: .ignore (----------)

Replacement in server/Cargo.toml at line 24 [3.4662]

Insertion in frontend/src/app.rs at line 1 [3.6404]

Replacement in frontend/src/app.rs at line 76 [3.6404]