Merge pull request #653 from laravel/add-publishable-key

[10.0] Add publishable key to Cashier
laravel · Apr 25, 2019 · 65d623d · 65d623d
2 parents fe576a2 + d5a0936
commit 65d623d
Showing 1 changed file with 42 additions and 6 deletions.
diff --git a/src/Cashier.php b/src/Cashier.php
@@ -15,12 +15,19 @@ class Cashier
     const STRIPE_VERSION = '2019-03-14';
 
     /**
-     * The Stripe API key.
+     * The publishable Stripe API key.
      *
      * @var string
      */
     protected static $stripeKey;
 
+    /**
+     * The secret Stripe API key.
+     *
+     * @var string
+     */
+    protected static $stripeSecret;
+
     /**
      * The current currency.
      *
@@ -43,7 +50,7 @@ class Cashier
     protected static $formatCurrencyUsing;
 
     /**
-     * Get the Stripe API key.
+     * Get the pulishable Stripe API key.
      *
      * @return string
      */
@@ -53,15 +60,15 @@ public static function stripeKey()
             return static::$stripeKey;
         }
 
-        if ($key = getenv('STRIPE_SECRET')) {
+        if ($key = getenv('STRIPE_KEY')) {
             return $key;
         }
 
-        return config('services.stripe.secret');
+        return config('services.stripe.key');
     }
 
     /**
-     * Set the Stripe API key.
+     * Set the publishable Stripe API key.
      *
      * @param  string  $key
      * @return void
@@ -71,6 +78,35 @@ public static function setStripeKey($key)
         static::$stripeKey = $key;
     }
 
+    /**
+     * Get the secret Stripe API key.
+     *
+     * @return string
+     */
+    public static function stripeSecret()
+    {
+        if (static::$stripeSecret) {
+            return static::$stripeSecret;
+        }
+
+        if ($key = getenv('STRIPE_SECRET')) {
+            return $key;
+        }
+
+        return config('services.stripe.secret');
+    }
+
+    /**
+     * Set the secret Stripe API key.
+     *
+     * @param  string  $key
+     * @return void
+     */
+    public static function setStripeSecret($key)
+    {
+        static::$stripeSecret = $key;
+    }
+
     /**
      * Get the default Stripe API options.
      *
@@ -80,7 +116,7 @@ public static function setStripeKey($key)
     public static function stripeOptions(array $options = [])
     {
         return array_merge([
-            'api_key' => static::stripeKey(),
+            'api_key' => static::stripeSecret(),
             'stripe_version' => static::STRIPE_VERSION,
         ], $options);
     }