chore(front): clean up env vars

Author: hamir-suspect

front/config/runtime.exs

@@ -177,14 +177,6 @@ config :front,
        :new_project_onboarding_workflow_templates_path,
        System.fetch_env!("WORKFLOW_TEMPLATES_YAMLS_PATH") <> "_new"
 
-config :front,
-       :hide_bitbucket_me_page,
-       System.get_env("HIDE_BITBUCKET_ME_PAGE") == "true"
-
-config :front,
-       :hide_gitlab_me_page,
-       System.get_env("HIDE_GITLAB_ME_PAGE") == "true"
-
 config :front,
        :single_tenant,
        System.get_env("SINGLE_TENANT") == "true"

front/lib/front/feature_hub_provider.ex

@@ -12,7 +12,8 @@ defmodule Front.FeatureHubProvider do
   import Front.Utils
 
   @impl FeatureProvider.Provider
-  def provide_features(nil, _opts \\ []) do
+  def provide_features(org_id, opts \\ [])
+  def provide_features(nil, _opts) do
     %InternalApi.Feature.ListFeaturesRequest{}
     |> FeatureClient.list_features()
     |> unwrap(fn response ->
@@ -25,7 +26,7 @@ defmodule Front.FeatureHubProvider do
     end)
   end
 
-  def provide_features(org_id, _opts \\ []) do
+  def provide_features(org_id, _opts) do
     FeatureClient.list_organization_features(%{org_id: org_id})
     |> unwrap(fn response ->
       features =

front/lib/front_web/templates/account/show.html.eex

@@ -18,7 +18,7 @@
       <div class="mt4 pv3 bt b--lighter-gray">
         <div class="f4 b mb3">Repository access</div>
         <div class="dib ba b--lighter-gray br2 w-100">
-          <%= if not Application.get_env(:front, :hide_bitbucket_me_page) do %>
+          <%= if not FeatureProvider.feature_enabled?(:bitbucket) do %>
           <div class="pa2 bb b--lighter-gray">
           <% else %>
           <div class="pa2">

front/lib/front_web/templates/account/welcome/okta.html.eex

@@ -11,7 +11,7 @@
 
       <div class="">
         <div class="dib ba b--lighter-gray br2 w-100">
-          <%= if not Application.get_env(:front, :hide_bitbucket_me_page) do %>
+          <%= if not FeatureProvider.feature_enabled?(:bitbucket) do %>
           <div class="pa2 bb b--lighter-gray">
           <% else %>
           <div class="pa2">
@@ -55,7 +55,7 @@
                 <span><a href="https://github.com/<%= @user.github_login %>" target="_blank">@<%= @user.github_login %></a></span>
             <% end %>
           </div>
-          <%= if not Application.get_env(:front, :hide_bitbucket_me_page) do %>
+          <%= if not FeatureProvider.feature_enabled?(:bitbucket) do %>
           <div class="pa2">
             <span class="b">Bitbucket</span> ·
             <%= case {@user.bitbucket_scope, @user.bitbucket_login} do %>
@@ -78,7 +78,7 @@
             <% end %>
           </div>
           <% end %>
-          <%= if not Application.get_env(:front, :hide_gitlab_me_page) do %>
+          <%= if not FeatureProvider.feature_enabled?(:gitlab) do %>
           <div class="pa2">
             <span class="b">GitLab</span> ·
             <%= case {@user.gitlab_scope, @user.gitlab_login} do %>

front/test/front_web/controllers/account_controller_test.exs

@@ -33,17 +33,15 @@ defmodule FrontWeb.AccountControllerTest do
       refute html_response(conn, 200) =~ "/account/update_repo_scope/github"
     end
 
-    test "when bitbucket feature is disabled => do not show bitbucket scope", %{conn: conn} do
-      Application.put_env(:front, :hide_bitbucket_me_page, true)
+    test "when bitbucket feature is disabled => do not show bitbucket scope", %{conn: conn, org_id: org_id} do
+      Support.Stubs.Feature.disable_feature(org_id, "bitbucket")
 
       conn =
         conn
         |> get("/account")
 
       refute html_response(conn, 200) =~ "Bitbucket"
       assert html_response(conn, 200) =~ "GitHub"
-
-      Application.put_env(:front, :hide_bitbucket_me_page, false)
     end
   end