From 536f9cf58fd73829fec9f018319930d6c8d2ff03 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 19 Jan 2023 21:00:50 +0100
Subject: [PATCH] progress

---
 .../20230119194229_customer_id.down.sql         |  1 +
 .../20230119194229_customer_id.up.sql           |  2 ++
 backend/windmill-api/src/workspaces.rs          | 17 +++++++----------
 3 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 backend/migrations/20230119194229_customer_id.down.sql
 create mode 100644 backend/migrations/20230119194229_customer_id.up.sql

diff --git a/backend/migrations/20230119194229_customer_id.down.sql b/backend/migrations/20230119194229_customer_id.down.sql
new file mode 100644
index 0000000000..d2f607c5b8
--- /dev/null
+++ b/backend/migrations/20230119194229_customer_id.down.sql
@@ -0,0 +1 @@
+-- Add down migration script here
diff --git a/backend/migrations/20230119194229_customer_id.up.sql b/backend/migrations/20230119194229_customer_id.up.sql
new file mode 100644
index 0000000000..c9d078918c
--- /dev/null
+++ b/backend/migrations/20230119194229_customer_id.up.sql
@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE workspace_settings ADD COLUMN customer_id VARCHAR(100) NOT NULL DEFAULT false;
diff --git a/backend/windmill-api/src/workspaces.rs b/backend/windmill-api/src/workspaces.rs
index 06a6bc5a8f..b8f8ff72cd 100644
--- a/backend/windmill-api/src/workspaces.rs
+++ b/backend/windmill-api/src/workspaces.rs
@@ -24,7 +24,7 @@ use axum::{
     routing::{delete, get, post},
     Json, Router,
 };
-use stripe::{CreateBillingPortalSession, CustomerId};
+use stripe::CustomerId;
 use windmill_audit::{audit_log, ActionKind};
 use windmill_common::{
     error::{to_anyhow, Error, JsonResult, Result},
@@ -211,7 +211,7 @@ async fn stripe_checkout(
     authed: Authed,
     Path(w_id): Path<String>,
     Extension(base_url): Extension<Arc<BaseUrl>>,
-) -> Result<Redirect, Error> {
+) -> Result<Redirect> {
     // #[cfg(feature = "enterprise")]
     {
         let client = stripe::Client::new(std::env::var("STRIPE_KEY").expect("STRIPE_KEY"));
@@ -241,12 +241,10 @@ async fn stripe_checkout(
                 .await
                 .unwrap()
         };
-
-        Ok(Redirect::to(
-            &checkout_session
-                .url
-                .ok_or_else(|| anyh("issue going to checkout page")),
-        ))
+        let uri = checkout_session
+            .url
+            .ok_or_else(|| Error::InternalErr(format!("stripe checkout redirect issue")))?;
+        Ok(Redirect::to(&uri))
     }
 }
 
@@ -265,8 +263,7 @@ async fn stripe_portal(
             .await
             .map_err(to_anyhow)?
     };
-    println!("created a {:?}", portal_session.url);
-    Ok(())
+    Ok(Redirect::to(&portal_session.url))
 }
 
 async fn exists_workspace(