From d27786fa5a6a55bf1488ad38f8c4e9ba1eb603b6 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Thu, 11 Jul 2019 22:11:47 +1000
Subject: [PATCH] stripe

---
 client/src/components/account.status.jsx |  4 ++--
 server/src/account.rs                    |  2 --
 server/src/main.rs                       |  2 +-
 server/src/net.rs                        |  7 ++++++-
 server/src/payments.rs                   | 26 ++++++++++++++++++------
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/client/src/components/account.status.jsx b/client/src/components/account.status.jsx
index beb2a844..a2e61b0b 100644
--- a/client/src/components/account.status.jsx
+++ b/client/src/components/account.status.jsx
@@ -19,8 +19,8 @@ function BitsBtn(args) {
     function subscribeClick(e) {
         stripe.redirectToCheckout({
             items: [{plan: 'plan_FGmRwawcOJJ7Nv', quantity: 1}],
-            successUrl: 'http://localhost/payments/success',
-            cancelUrl: 'http://localhost/payments/cancel',
+            successUrl: 'http://localhost/api/payments/success',
+            cancelUrl: 'http://localhost/api/payments/cancel',
             clientReferenceId: account.id
         });
     }
diff --git a/server/src/account.rs b/server/src/account.rs
index 4d0197ee..dd5f988b 100644
--- a/server/src/account.rs
+++ b/server/src/account.rs
@@ -153,8 +153,6 @@ pub fn credit(tx: &mut Transaction, id: Uuid, credits: i64) -> Result<String, Er
     let row = result.iter().next()
         .ok_or(format_err!("account not updated {:?}", id))?;
 
-    println!("{:?}", row);
-
     let db_credits: i64 = row.get(0);
     let total = u32::try_from(db_credits)
         .or(Err(format_err!("user {:?} has unparsable balance {:?}", id, db_credits)))?;
diff --git a/server/src/main.rs b/server/src/main.rs
index e8398423..cef9548b 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -38,7 +38,7 @@ mod mob;
 mod mtx;
 mod names;
 mod net;
-// mod payments;
+mod payments;
 mod pg;
 mod player;
 mod pubsub;
diff --git a/server/src/net.rs b/server/src/net.rs
index 1d49f7c4..12eb66d7 100644
--- a/server/src/net.rs
+++ b/server/src/net.rs
@@ -14,7 +14,7 @@ use router::Router;
 // use ws::{connect};
 use account;
 use pg::PgPool;
-// use payments::{post_stripe_event};
+use payments::{stripe};
 
 pub const TOKEN_HEADER: &str = "x-auth-token";
 
@@ -207,10 +207,15 @@ impl Key for State { type Value = State; }
 
 pub fn start(pool: PgPool) {
     let mut router = Router::new();
+
+    // auth
     router.post("/api/login", login, "login");
     router.post("/api/logout", logout, "logout");
     router.post("/api/register", register, "register");
 
+    // payments
+    router.post("/api/payments/stripe", stripe, "stripe");
+
     let mut chain = Chain::new(router);
     chain.link(Read::<State>::both(State { pool }));
     chain.link_before(Read::<bodyparser::MaxBodyLength>::one(MAX_BODY_LENGTH));
diff --git a/server/src/payments.rs b/server/src/payments.rs
index 78ed1f7f..6fd9529e 100644
--- a/server/src/payments.rs
+++ b/server/src/payments.rs
@@ -1,3 +1,11 @@
+use std::io::Read;
+
+use net::State;
+use iron::prelude::*;
+use iron::response::HttpResponse;
+use iron::status;
+use persistent::Read as Readable;
+
 use uuid::Uuid;
 use postgres::transaction::Transaction;
 
@@ -6,7 +14,8 @@ use failure::err_msg;
 
 use stripe::{Event, EventObject, CheckoutSession, SubscriptionStatus};
 
-use net::{State, PgPool, MnmlHttpError};
+use net::{MnmlHttpError};
+use pg::{PgPool};
 use account;
 
 pub fn subscription_account(tx: &mut Transaction, sub: String) -> Result<Uuid, Error> {
@@ -183,16 +192,21 @@ fn process_stripe_event(event: Event, pool: &PgPool) -> Result<String, Error> {
     Ok(event.id.to_string())
 }
 
-pub fn post_stripe_event(state: web::Data<State>, body: web::Json::<Event>) -> Result<HttpResponse, MnmlHttpError> {
-    let event: Event = body.into_inner();
+pub fn stripe(req: &mut Request) -> IronResult<Response> {
+    let state = req.get::<Readable<State>>().unwrap();
+    let event = match req.get::<bodyparser::Struct<Event>>() {
+        Ok(Some(b)) => b,
+        _ => return Err(IronError::from(MnmlHttpError::BadRequest)),
+    };
+
     match process_stripe_event(event, &state.pool) {
         Ok(id)=> {
             info!("event processed successfully {:?}", id);
-            Ok(HttpResponse::Ok().finish())
+            Ok(Response::with(status::Ok))
         }
         Err(e) => {
             error!("{:?}", e);
-            Err(MnmlHttpError::ServerError)
+            Err(IronError::from(MnmlHttpError::ServerError))
         }
     }
 }
@@ -200,7 +214,7 @@ pub fn post_stripe_event(state: web::Data<State>, body: web::Json::<Event>) -> R
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::io::prelude::*;
+
     use std::fs::File;
 
     #[test]