Migrate to pow

.github/workflows/main.yml

@@ -11,6 +11,10 @@ jobs:
   elixir-build-test:
     runs-on: ubuntu-latest
 
+    env:
+      MIX_ENV: test
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     steps:
       - name: 🛎️ Checkout
         uses: actions/checkout@v2
@@ -36,8 +40,8 @@ jobs:
       - name: 🔨 Build project
         run: set -a;source oli.env && mix clean && mix compile --warnings-as-errors
 
-      - name: ⚙️ Run tests
-        run: set -a;source oli.env && mix test.coverage
+      - name: ▶️ Run tests
+        run: set -a;source oli.env && mix coveralls.github
 
   ts-build-test:
     runs-on: ubuntu-latest

assets/styles/authoring/signin.scss → assets/styles/authoring/form-container.scss

@@ -1,5 +1,5 @@
 
-.signin {
+.form-container {
   --input-padding-x: 1.5rem;
   --input-padding-y: .75rem;
 
@@ -23,6 +23,12 @@
     font-weight: bold;
     transition: all 0.2s;
     text-transform: uppercase;
+    background-color: $secondary;
+    color: $white;
+
+    &:hover {
+      background-color: darken($secondary, 10%);
+    }
   }
 
   .form-label-group {
@@ -94,26 +100,54 @@
 
   a.btn-google:hover {
     color: white;
-    background-color: #ea4335;
+    background-color: #c0382c;
   }
 
-  .btn-facebook {
+  .btn-github {
     color: white;
-    background-color: #3b5998;
+    background-color: #24292e;
   }
 
-  a.btn-facebook:hover {
+  a.btn-github:hover {
     color: white;
-    background-color: #3b5998;
+    background-color: #000000;
   }
 
-  // .btn-identity {
-  //   color: white;
-  //   background-color: #3b5998;
-  // }
+}
+
+.provider {
+  font-size: 80%;
+  letter-spacing: .1rem;
+  font-weight: bold;
+  transition: all 0.2s;
+  text-transform: uppercase;
+  line-height: 1.5;
+  border-radius: 0.25rem;
+  padding: 0.375rem 2rem;
+  text-align: center;
+  vertical-align: middle;
+  user-select: none;
+}
+
+.provider-google {
+  color: white !important;
+  background-color: #ea4335 !important;
+
+  &.btn {
+    &:hover {
+      background-color: darken(#ea4335, 10%) !important;
+    }
+  }
+}
+
+.provider-github {
+  color: white !important;
+  background-color: #24292e !important;
+
+  &.btn {
+    &:hover {
+      background-color: darken(#24292e, 10%) !important;
+    }
+  }
+}
 
-  // a.btn-identity:hover {
-  //   color: white;
-  //   background-color: #3b5998;
-  // }
-}

assets/styles/delivery/form-container.scss

@@ -0,0 +1,2 @@
+/** use same styles defined in authoring **/
+@import '../authoring/form-container.scss';

assets/styles/delivery/main.scss

@@ -20,6 +20,10 @@ main.container {
   margin-top: 20px;
 }
 
+form .form-label-group .help-block {
+  color: #dc3545;
+}
+
 .activity-purpose {
   text-transform: uppercase;
   background-color: orangered;

config/config.exs

@@ -17,11 +17,14 @@ config :oli,
     env: Mix.env,
   },
   local_activity_manifests: Path.wildcard(File.cwd! <> "/assets/src/components/activities/*/manifest.json")
-    |> Enum.map(&File.read!/1)
+    |> Enum.map(&File.read!/1),
+  email_from_name: System.get_env("EMAIL_FROM_NAME", "OLI Torus"),
+  email_from_address: System.get_env("EMAIL_FROM_ADDRESS", "[email protected]"),
+  email_reply_to: System.get_env("EMAIL_REPLY_TO", "[email protected]")
 
 # Configures the endpoint
 config :oli, OliWeb.Endpoint,
-  live_view: [signing_salt: System.get_env("LIVE_VIEW_SALT") || "LIVE_VIEW_SALT"],
+  live_view: [signing_salt: System.get_env("LIVE_VIEW_SALT", "LIVE_VIEW_SALT")],
   url: [host: "localhost"],
   secret_key_base: "GE9cpXBwVXNaplyUCYbIWqERmC/OlcR5iVMwLX9/W7gzQRxkD1ETjda9E0jW/BW1",
   render_errors: [view: OliWeb.ErrorView, accepts: ~w(html json)],
@@ -46,26 +49,45 @@ config :logger, :console,
 # Use Jason for JSON parsing in Phoenix
 config :phoenix, :json_library, Jason
 
-# Configure OAuth
-config :ueberauth, Ueberauth,
-  providers: [
-    google: {Ueberauth.Strategy.Google, [default_scope: "email profile", callback_params: ["type"]]},
-    facebook: {Ueberauth.Strategy.Facebook, [default_scope: "email,public_profile", callback_params: ["type"]]},
-    identity: {Ueberauth.Strategy.Identity, [
-      callback_methods: ["POST"],
-      uid_field: :email,
-      request_path: "/auth/identity",
-      callback_path: "/auth/identity/callback",
-    ]}
+config :oli, :pow,
+  repo: Oli.Repo,
+  user: Oli.Accounts.Author,
+  current_user_assigns_key: :current_author,
+  session_key: "author_auth",
+  web_module: OliWeb,
+  routes_backend: OliWeb.Pow.AuthorRoutes,
+  plug: Pow.Plug.Session,
+  extensions: [PowResetPassword, PowEmailConfirmation, PowPersistentSession],
+  controller_callbacks: Pow.Extension.Phoenix.ControllerCallbacks,
+  mailer_backend: OliWeb.Pow.Mailer,
+  web_mailer_module: OliWeb,
+  pow_assent: [
+    providers: [
+      google: [
+        client_id: System.get_env("GOOGLE_CLIENT_ID"),
+        client_secret: System.get_env("GOOGLE_CLIENT_SECRET"),
+        strategy: Assent.Strategy.Google,
+        authorization_params: [
+          scope: "email profile"
+        ],
+        session_params: ["type"]
+      ],
+      github: [
+        client_id: System.get_env("GITHUB_CLIENT_ID"),
+        client_secret: System.get_env("GITHUB_CLIENT_SECRET"),
+        strategy: Assent.Strategy.Github,
+        authorization_params: [
+          scope: "read:user user:email"
+        ],
+        session_params: ["type"]
+      ]
+    ]
   ]
 
-config :ueberauth, Ueberauth.Strategy.Google.OAuth,
-  client_id: System.get_env("GOOGLE_CLIENT_ID"),
-  client_secret: System.get_env("GOOGLE_CLIENT_SECRET")
-
-config :ueberauth, Ueberauth.Strategy.Facebook.OAuth,
-  client_id: System.get_env("FACEBOOK_CLIENT_ID"),
-  client_secret: System.get_env("FACEBOOK_CLIENT_SECRET")
+if Mix.env == :dev do
+  config :mix_test_watch,
+    clear: true
+end
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.

config/dev.exs

@@ -14,6 +14,13 @@ config :oli, Oli.Repo,
   show_sensitive_data_on_connection_error: true,
   pool_size: 10
 
+# Configure email for development
+config :oli, Oli.Mailer,
+  adapter: Bamboo.LocalAdapter
+
+config :oli, OliWeb.Pow.Mailer,
+  adapter: Bamboo.LocalAdapter
+
 force_ssl = case System.get_env("FORCE_SSL", "true") do
   "true" -> [rewrite_on: [:x_forwarded_proto]]
   _ -> false

config/prod.exs

@@ -20,6 +20,13 @@ config :oli, OliWeb.Endpoint,
 # Do not print debug messages in production
 config :logger, level: :info
 
+# Configure email for production
+config :oli, Oli.Mailer,
+  adapter: Bamboo.SesAdapter
+
+config :oli, OliWeb.Pow.Mailer,
+  adapter: Bamboo.SesAdapter
+
 # ## SSL Support
 #
 # To get SSL working, you will need to add the `https` key

config/releases.exs

@@ -36,6 +36,12 @@ host =
     For example: host.example.com
     """
 
+# General OLI app config
+config :oli,
+  email_from_name: System.get_env("EMAIL_FROM_NAME", Application.fetch_env!(:oli, :email_from_name)),
+  email_from_address: System.get_env("EMAIL_FROM_ADDRESS", Application.fetch_env!(:oli, :email_from_address)),
+  email_reply_to: System.get_env("EMAIL_REPLY_TO", email_from)
+
 # Configure reCAPTCHA
 config :oli, :recaptcha,
   verify_url: "https://www.google.com/recaptcha/api/siteverify",
@@ -51,13 +57,19 @@ config :oli, OliWeb.Endpoint,
   live_view: [signing_salt: live_view_salt]
 
 # OAuth secrets need to be loaded at runtime
-config :ueberauth, Ueberauth.Strategy.Google.OAuth,
-  client_id: System.get_env("GOOGLE_CLIENT_ID"),
-  client_secret: System.get_env("GOOGLE_CLIENT_SECRET")
-
-config :ueberauth, Ueberauth.Strategy.Facebook.OAuth,
-  client_id: System.get_env("FACEBOOK_CLIENT_ID"),
-  client_secret: System.get_env("FACEBOOK_CLIENT_SECRET")
+config :oli, :pow,
+  pow_assent: [
+    providers: [
+      google: [
+        client_id: System.get_env("GOOGLE_CLIENT_ID"),
+        client_secret: System.get_env("GOOGLE_CLIENT_SECRET")
+      ],
+      github: [
+        client_id: System.get_env("GITHUB_CLIENT_ID"),
+        client_secret: System.get_env("GITHUB_CLIENT_SECRET")
+      ]
+    ]
+  ]
 
 # Configure Joken, we can just reuse the secret key base
 config :joken, default_signer: secret_key_base