build(deps-dev): bump credo from 0.10.1 to 0.10.2

Makefile

@@ -114,6 +114,36 @@ deploy.prod:
 	@echo "deploy to docker done!"
 	@echo "todo: restart docker container"
 
+reset:
+	$(call reset.help)
+	@echo "\n"
+reset.help:
+	$(call reset.help)
+	@echo "\n"
+reset.test:
+	env MIX_ENV=test mix ecto.drop
+	env MIX_ENV=test mix ecto.create
+reset.mock:
+	env MIX_ENV=mock mix ecto.reset
+reset.prod:
+	env MIX_ENV=prod mix ecto.reset
+
+seeds:
+	$(call reset.help)
+	@echo "\n"
+seeds.help:
+	$(call reset.help)
+	@echo "\n"
+seeds.mock:
+	@echo "------------------------------"
+	@echo "seeds the mock database"
+	env MIX_ENV=mock mix cps.seeds
+
+seeds.prod:
+	@echo "------------------------------"
+	@echo "seeds the prod database"
+	env MIX_ENV=prod mix cps.seeds
+
 test.help:
 	$(call test.help)
 	@echo "\n"
@@ -125,9 +155,8 @@ test.watch.wip:
 	mix test.watch --only wip
 test.watch.wip2:
 	mix test.watch --only wip2
-test.db_reset:
-	env MIX_ENV=test mix ecto.drop
-	env MIX_ENV=test mix ecto.create
+test.watch.bug:
+	mix test.watch --only bug
 test.report:
 	MIX_ENV=mix test.coverage
 	$(call browse,"./cover/excoveralls.html")

Makefile.include.mk

@@ -120,6 +120,28 @@ define console.help
 	@echo "  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 endef
 
+define reset.help
+	@echo "\n"
+	@echo "  [WARNING: reset db commands]"
+	@echo "  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+	@echo "  reset.test  : reset test db"
+	@echo "  ..................................."
+	@echo "  reset.mock  : reset mock db"
+	@echo "  ..................................."
+	@echo "  reset.prod  : reset prod db"
+	@echo "  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+endef
+
+define seeds.help
+	@echo "\n"
+	@echo "  [seeds db commands]"
+	@echo "  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+	@echo "  seeds.mock  : insert default communities etc .. to mock db"
+	@echo "  .........................................................."
+	@echo "  seeds.prod  : insert default communities etc .. to prod db"
+	@echo "  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+endef
+
 define test.help
 	@echo "\n"
 	@echo "  [valid test commands]"
@@ -130,6 +152,10 @@ define test.help
 	@echo "  ....................................................."
 	@echo "  test.watch.wip   : run @wip test in watch mode"
 	@echo "  ....................................................."
+	@echo "  test.watch.wip2  : shortcut for lots of @wip around"
+	@echo "  ....................................................."
+	@echo "  test.watch.bug  : sometimes fails for unkown reason"
+	@echo "  ....................................................."
 	@echo "  test.db_reset    : reset test database"
 	@echo "                   | needed when add new migration"
 	@echo "  ....................................................."

README.md

@@ -1,5 +1,5 @@
 
-![CPS Brand](https://github.com/mydearxym/mastani_server/blob/dev/docs/snapshots/cps_logo_md.png)
+![CPS Brand](https://github.com/mydearxym/mastani_server/blob/dev/docs/snapshots/cps_logo_md.png?raw=true)
 =========
 [![Build Status](https://travis-ci.org/coderplanets/coderplanets_server.svg?branch=dev)](https://travis-ci.org/coderplanets/coderplanets_server)
 [![codecov](https://codecov.io/gh/coderplanets/coderplanets_server/branch/dev/graph/badge.svg)](https://codecov.io/gh/coderplanets/coderplanets_server)

config/config.exs

@@ -21,6 +21,7 @@ config :logger, :console,
   metadata: [:request_id]
 
 config :phoenix, :format_encoders, json: Jason
+config :ecto, json_library: Jason
 
 # TODO move this config to secret later
 config :mastani_server, Helper.Guardian,
@@ -50,6 +51,16 @@ config :mastani_server, :general,
   user_achieve_favorite_weight: 2,
   user_achieve_follow_weight: 3
 
+config :mastani_server, :customization,
+  theme: "cyan",
+  community_chart: false,
+  brainwash_free: false,
+  banner_layout: "digest",
+  contents_layout: "digest",
+  content_divider: false,
+  mark_viewed: true,
+  display_density: "20"
+
 config :mastani_server, MastaniServerWeb.Gettext, default_locale: "zh_CN", locales: ~w(en zh_CN)
 
 import_config "#{Mix.env()}.exs"

config/prod.exs

@@ -83,6 +83,8 @@ config :mastani_server, :github_oauth,
   client_id: System.get_env("OAUTH_GITHUB_CLIENT_ID"),
   client_secret: System.get_env("OAUTH_GITHUB_CLIENT_SECRET")
 
+config :mastani_server, :radar_search, ip_service: System.get_env("IP_LOCATE_KEY")
+
 config :sentry,
   dsn: System.get_env("SENTRY_DSN"),
   environment_name: :prod,

lib/helper/PublicIpPlug.ex

@@ -0,0 +1,85 @@
+# https://www.cogini.com/blog/getting-the-client-public-ip-address-in-phoenix/
+defmodule Helper.PublicIpPlug do
+  @moduledoc "Get public IP address of request from x-forwarded-for header"
+  @behaviour Plug
+  @app :mastani_server
+
+  def init(opts), do: opts
+
+  def call(%{assigns: %{ip: _}} = conn, _opts), do: conn
+
+  def call(conn, _opts) do
+    process(conn, Plug.Conn.get_req_header(conn, "X-Forwarded-For"))
+  end
+
+  def process(conn, []) do
+    Plug.Conn.assign(conn, :ip, to_string(:inet.ntoa(get_peer_ip(conn))))
+  end
+
+  def process(conn, vals) do
+    if Application.get_env(@app, :trust_x_forwarded_for, false) do
+      ip_address = get_ip_address(conn, vals)
+
+      # Rewrite standard remote_ip field with value from header
+      # See https://hexdocs.pm/plug/Plug.Conn.html
+      conn = %{conn | remote_ip: ip_address}
+
+      Plug.Conn.assign(conn, :ip, to_string(:inet.ntoa(ip_address)))
+    else
+      Plug.Conn.assign(conn, :ip, to_string(:inet.ntoa(get_peer_ip(conn))))
+    end
+  end
+
+  defp get_ip_address(conn, vals)
+  defp get_ip_address(conn, []), do: get_peer_ip(conn)
+
+  defp get_ip_address(conn, [val | _]) do
+    # Split into multiple values
+    comps =
+      val
+      |> String.split(~r{\s*,\s*}, trim: true)
+      # Get rid of "unknown" values
+      |> Enum.filter(&(&1 != "unknown"))
+      # Split IP from port, if any
+      |> Enum.map(&hd(String.split(&1, ":")))
+      # Filter out blanks
+      |> Enum.filter(&(&1 != ""))
+      # Parse address into :inet.ip_address tuple
+      |> Enum.map(&parse_address(&1))
+      # Elminate internal IP addreses, e.g. 192.168.1.1
+      |> Enum.filter(&is_public_ip(&1))
+
+    case comps do
+      [] -> get_peer_ip(conn)
+      [comp | _] -> comp
+    end
+  end
+
+  @spec get_peer_ip(Plug.Conn.t()) :: :inet.ip_address()
+  defp get_peer_ip(conn) do
+    {ip, _port} = conn.peer
+    ip
+  end
+
+  @spec parse_address(String.t()) :: :inet.ip_address()
+  defp parse_address(ip) do
+    case :inet.parse_ipv4strict_address(to_charlist(ip)) do
+      {:ok, ip_address} -> ip_address
+      {:error, :einval} -> :einval
+    end
+  end
+
+  # Whether the input is a valid, public IP address
+  # http://en.wikipedia.org/wiki/Private_network
+  @spec is_public_ip(:inet.ip_address() | atom) :: boolean
+  defp is_public_ip(ip_address) do
+    case ip_address do
+      {10, _, _, _} -> false
+      {192, 168, _, _} -> false
+      {172, second, _, _} when second >= 16 and second <= 31 -> false
+      {127, 0, 0, _} -> false
+      {_, _, _, _} -> true
+      :einval -> false
+    end
+  end
+end