test: add generate vapid keys

Author: trueChazza

lib/mix/tasks/generate_vapid_keys.ex

@@ -3,7 +3,13 @@ defmodule Mix.Tasks.Generate.Vapid.Keys do
   use Mix.Task
 
   @shortdoc "Generate vapid keys"
-  def run(_) do
-    WebPushElixir.output_key_pair(WebPushElixir.gen_key_pair()).()
+  def run(_args) do
+    {public_key, private_key} = :crypto.generate_key(:ecdh, :prime256v1)
+
+    %{
+      vapid_public_key: Base.url_encode64(public_key, padding: false),
+      vapid_private_key: Base.url_encode64(private_key, padding: false),
+      vapid_subject: "mailto:admin@email.com"
+    }
   end
-end
+end

lib/web_push_elixir.ex

@@ -1,6 +1,4 @@
 defmodule WebPushElixir do
-  require Logger
-
   defp url_encode(string) do
     Base.url_encode64(string, padding: false)
   end
@@ -75,7 +73,7 @@ defmodule WebPushElixir do
     %{ciphertext: cipher_text <> cipher_tag, salt: salt}
   end
 
-  defp get_signed_json_web_token(endpoint, vapid_public_key, vapid_private_key) do
+  defp sign_json_web_token(endpoint, vapid_public_key, vapid_private_key) do
     json_web_token =
       JOSE.JWT.from_map(%{
         aud: URI.parse(endpoint).scheme <> "://" <> URI.parse(endpoint).host,
@@ -86,7 +84,7 @@ defmodule WebPushElixir do
     json_web_key =
       JOSE.JWK.from_key(
         {:ECPrivateKey, 1, vapid_private_key, {:namedCurve, {1, 2, 840, 10045, 3, 1, 7}},
-          vapid_public_key, nil}
+         vapid_public_key, nil}
       )
 
     {%{alg: :jose_jws_alg_ecdsa}, signed_json_web_token} =
@@ -95,21 +93,6 @@ defmodule WebPushElixir do
     signed_json_web_token
   end
 
-  def gen_key_pair() do
-    {public_key, private_key} = :crypto.generate_key(:ecdh, :prime256v1)
-
-    {url_encode(public_key), url_encode(private_key)}
-  end
-
-  def output_key_pair({public_key, private_key}) do
-    fn ->
-      Logger.info(%{:vapid_public_key => public_key})
-      Logger.info(%{:vapid_private_key => private_key})
-
-      Logger.info(%{:vapid_subject => "mailto:admin@email.com"})
-    end
-  end
-
   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"))
@@ -120,7 +103,7 @@ defmodule WebPushElixir do
     encrypted = encrypt(message, auth, p256dh, vapid_public_key, vapid_private_key)
 
     signed_json_web_token =
-      get_signed_json_web_token(endpoint, vapid_public_key, vapid_private_key)
+      sign_json_web_token(endpoint, vapid_public_key, vapid_private_key)
 
     HTTPoison.post(endpoint, encrypted.ciphertext, %{
       "Authorization" => "WebPush #{signed_json_web_token}",

test/generate_vapid_keys_test.exs

@@ -0,0 +1,11 @@
+defmodule GenerateVapidKeysTest do
+  use ExUnit.Case
+
+  test "it should generate" do
+    assert %{
+             vapid_public_key: <<_public_key::binary>>,
+             vapid_private_key: <<_private_key::binary>>,
+             vapid_subject: "mailto:admin@email.com"
+           } = Mix.Tasks.Generate.Vapid.Keys.run([])
+  end
+end

test/web_push_elixir_test.exs

@@ -1,32 +1,20 @@
 defmodule WebPushElixirTest do
   use ExUnit.Case
 
-  import ExUnit.CaptureLog
-
   @subscription ~c"{\"endpoint\":\"http://localhost:4040/some-endpoint\",\"keys\":{\"p256dh\":\"BIPUL12DLfytvTajnryr2PRdAgXS3HGKiLqndGcJGabyhHheJYlNGCeXl1dn18gSJ1WAkAPIxr4gK0_dQds4yiI=\",\"auth\":\"FPssNDTKnInHVndSTdbKFw==\"}}"
 
-  test "it should output key pair" do
-    assert capture_log(WebPushElixir.output_key_pair(WebPushElixir.gen_key_pair())) =~
-             "vapid_public_key:"
-
-    assert capture_log(WebPushElixir.output_key_pair(WebPushElixir.gen_key_pair())) =~
-             "vapid_private_key:"
-
-    assert capture_log(WebPushElixir.output_key_pair(WebPushElixir.gen_key_pair())) =~
-             "vapid_subject:"
-
-    assert capture_log(WebPushElixir.output_key_pair(WebPushElixir.gen_key_pair())) =~
-             "mailto:admin@email.com"
-  end
-
   test "it should send notification" do
-    {vapid_public_key, vapid_private_key} = WebPushElixir.gen_key_pair()
+    %{
+      vapid_public_key: vapid_public_key,
+      vapid_private_key: vapid_private_key,
+      vapid_subject: vapid_subject
+    } = Mix.Tasks.Generate.Vapid.Keys.run([])
 
     System.put_env("VAPID_PUBLIC_KEY", vapid_public_key)
 
     System.put_env("VAPID_PRIVATE_KEY", vapid_private_key)
 
-    System.put_env("VAPID_SUBJECT", "mailto:admin@email.com")
+    System.put_env("VAPID_SUBJECT", vapid_subject)
 
     {:ok, response} = WebPushElixir.send_notification(@subscription, "some message")