Merge pull request #3 from midarrlabs/2-add-config

Add config

Author: trueChazza

README.md

@@ -40,18 +40,18 @@ end
 mix generate.vapid.keys
 ```
 
-3. Set environment variables for your generated keys:
+3. Set config for your generated keys:
 
-```yaml
-environment:
-  - VAPID_PUBLIC_KEY=someVapidPublicKey
-  - VAPID_PRIVATE_KEY=someVapidPrivateKey
-  - VAPID_SUBJECT=mailto:admin@email.com
+```elixir
+config :web_push_elixir,
+  vapid_public_key: "someVapidPublicKey",
+  vapid_private_key: "someVapidPrivateKey",
+  vapid_subject: "mailto:admin@email.com"
 ```
 
 ## Usage
 
-`WebPushElixir` provides a simple `send_notification/2` function that accepts 2 arguments:
+`WebPushElixir` provides a simple `send_notification/2` that takes 2 arguments:
 
 * `subscription`: the subscription information received from the client - [example demo](https://midarrlabs.github.io/web-push-elixir/)
 * `message`: the message string.

config/config.exs

@@ -0,0 +1,5 @@
+import Config
+
+if Mix.env() == :test do
+  import_config "test.exs"
+end

config/test.exs

@@ -0,0 +1,6 @@
+import Config
+
+config :web_push_elixir,
+       vapid_public_key: "someVapidPublicKey",
+       vapid_private_key: "someVapidPrivateKey",
+       vapid_subject: "mailto:admin@email.com"

lib/web_push_elixir.ex

@@ -80,7 +80,7 @@ defmodule WebPushElixir do
       JOSE.JWT.from_map(%{
         aud: URI.parse(endpoint).scheme <> "://" <> URI.parse(endpoint).host,
         exp: DateTime.to_unix(DateTime.utc_now()) + 12 * 3600,
-        sub: System.get_env("VAPID_SUBJECT")
+        sub: Application.get_env(:web_push_elixir, :vapid_subject)
       })
 
     json_web_key =
@@ -108,8 +108,8 @@ defmodule WebPushElixir do
   Returns the result of `HTTPoison.post`
   """
   def send_notification(subscription, message) do
-    vapid_public_key = url_decode(System.get_env("VAPID_PUBLIC_KEY"))
-    vapid_private_key = url_decode(System.get_env("VAPID_PRIVATE_KEY"))
+    vapid_public_key = url_decode(Application.get_env(:web_push_elixir, :vapid_public_key))
+    vapid_private_key = url_decode(Application.get_env(:web_push_elixir, :vapid_private_key))
 
     %{endpoint: endpoint, keys: %{p256dh: p256dh, auth: auth}} =
       Jason.decode!(subscription, keys: :atoms)

test/web_push_elixir_test.exs

@@ -10,11 +10,11 @@ defmodule WebPushElixirTest do
       vapid_subject: vapid_subject
     } = Mix.Tasks.Generate.Vapid.Keys.run([])
 
-    System.put_env("VAPID_PUBLIC_KEY", vapid_public_key)
+    Application.put_env(:web_push_elixir, :vapid_public_key, vapid_public_key)
 
-    System.put_env("VAPID_PRIVATE_KEY", vapid_private_key)
+    Application.put_env(:web_push_elixir, :vapid_private_key, vapid_private_key)
 
-    System.put_env("VAPID_SUBJECT", vapid_subject)
+    Application.put_env(:web_push_elixir, :vapid_subject, vapid_subject)
 
     {:ok, response} = WebPushElixir.send_notification(@subscription, "some message")