Fix registration form errors

grav-admin/user/js/registration/registration.vue

@@ -1,8 +1,8 @@
 <template>
-<section class="shadowbox">
+<section v-if="allow" class="shadowbox">
 <h2>Register</h2>
 <account v-if="step == 1" :err="err" @submit="create" />
-<billing v-if="step == 2 && !trial" :err="err" :sub="sub"/>
+<billing v-if="step == 2" :err="err" :sub="sub"/>
 <completed v-if="step == 3" :err="err" :status="sub.paymentStatus"/>
 </section>
 </template>
@@ -20,6 +20,7 @@ const token = ref("")
 const user = ref(null)
 const sub = ref(null)
 const trial = ref(false)
+const allow = ref(true)
 
 const clientSecret = new URLSearchParams(window.location.search).get(
   'payment_intent_client_secret'
@@ -111,8 +112,15 @@ onMounted(() => {
     trial.value = true
   }
   
+  
   getUser().then( u => {
-    if (u) { user.value = u; intent(u) }
+    if (u) { user.value = u; console.log(u); intent(u) }
+    
+    // If user's account was not created through a trial form but the
+    // current path is /free-trial, hide the form.
+    if (u && u.status != "Trial" && trial.value) {
+      allow.value == false
+    }
   })
 })
 </script>

skouter.go

@@ -3123,6 +3123,7 @@ func createTrialSubscription(cid string) (*stripe.Subscription, error) {
     }
     subscriptionParams.AddExpand("latest_invoice.payment_intent")
     s, err := subscription.New(subscriptionParams)
+
     
     return s, err
 }
@@ -3217,6 +3218,7 @@ func subscribe(w http.ResponseWriter, db *sql.DB, r *http.Request) {
 // existing instance if possible. It's main purpose is to supply a
 // client secret used for sending billing information to stripe.
 func trialSubscribe(w http.ResponseWriter, db *sql.DB, r *http.Request) {
+	stripe.Key = os.Getenv("STRIPE_SECRET_KEY")
 	claims, err := getClaims(r)
 	user, err := queryUser(db, claims.Id)
 
@@ -3258,6 +3260,7 @@ func trialSubscribe(w http.ResponseWriter, db *sql.DB, r *http.Request) {
 		user.Sub.Start = int(s.CurrentPeriodStart)
 		user.Sub.ClientSecret = s.LatestInvoice.PaymentIntent.ClientSecret
 		user.Sub.PaymentStatus = string(s.LatestInvoice.PaymentIntent.Status)
+		user.Sub.Status = string(s.Status)
 		
 		// Inserting from here is unnecessary and confusing because
 		// new subs are already handled by the stripe hook. It remains for