From 1c26261fd71a027e7ed46676eb147ba814ebca38 Mon Sep 17 00:00:00 2001 From: Kalin Staykov Date: Wed, 13 Nov 2024 19:37:19 +0200 Subject: [PATCH] fix: migration syntax and insert query (#2597) --- .../sso_auth_axum/migrations/20231217000000_create_tables.sql | 2 +- projects/sso_auth_axum/src/lib.rs | 2 +- projects/sso_auth_axum/src/main.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/sso_auth_axum/migrations/20231217000000_create_tables.sql b/projects/sso_auth_axum/migrations/20231217000000_create_tables.sql index 3ccb68569..ae0362855 100644 --- a/projects/sso_auth_axum/migrations/20231217000000_create_tables.sql +++ b/projects/sso_auth_axum/migrations/20231217000000_create_tables.sql @@ -21,6 +21,6 @@ CREATE TABLE IF NOT EXISTS google_tokens ( access_secret TEXT NOT NULL, refresh_secret TEXT NOT NULL, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - FOREIGN KEY (user_id) REFERENCES users(id) CONFLICT REPLACE + FOREIGN KEY (user_id) REFERENCES users(id) ); diff --git a/projects/sso_auth_axum/src/lib.rs b/projects/sso_auth_axum/src/lib.rs index 96fc134a6..d5fc9ce4a 100644 --- a/projects/sso_auth_axum/src/lib.rs +++ b/projects/sso_auth_axum/src/lib.rs @@ -64,7 +64,7 @@ pub async fn refresh_token(email: String) -> Result { .execute(&pool) .await?; sqlx::query( - "INSERT INTO google_tokens (user_id,access_secret,refresh_secret) \ + "INSERT OR REPLACE INTO google_tokens (user_id,access_secret,refresh_secret) \ VALUES (?,?,?)", ) .bind(user.id) diff --git a/projects/sso_auth_axum/src/main.rs b/projects/sso_auth_axum/src/main.rs index 3b7701fb0..166aed7fb 100644 --- a/projects/sso_auth_axum/src/main.rs +++ b/projects/sso_auth_axum/src/main.rs @@ -96,7 +96,7 @@ async fn main() { let client = oauth2::basic::BasicClient::new( oauth2::ClientId::new( std::env::var("G_AUTH_CLIENT_ID") - .expect("G_AUTH_CLIENT Env var to be set."), + .expect("G_AUTH_CLIENT_ID Env var to be set."), ), Some(oauth2::ClientSecret::new( std::env::var("G_AUTH_SECRET")