+1 -1

apps/sower/lib/sower_web/user_auth.ex

reviewed

··· 193 193 end 194 194 end) 195 195 |> Phoenix.Component.assign_new(:user_timezone, fn -> 196 196 - case Phoenix.LiveView.get_connect_params(socket) |> get_in(["timezone"]) do 196 196 + case socket |> Phoenix.LiveView.get_connect_params() |> get_in(["timezone"]) do 197 197 nil -> 198 198 "Etc/UTC" 199 199

+16 -14

apps/sower/test/sower_web/user_auth_test.exs

reviewed

··· 123 123 session = conn |> put_session(:user_token, user_token) |> get_session() 124 124 125 125 {:cont, updated_socket} = 126 126 - UserAuth.on_mount(:mount_current_user, %{}, session, %LiveView.Socket{}) 126 126 + UserAuth.on_mount(:mount_current_user, %{}, session, mount_socket()) 127 127 128 128 assert updated_socket.assigns.current_user.id == user.id 129 129 end ··· 133 133 session = conn |> put_session(:user_token, user_token) |> get_session() 134 134 135 135 {:cont, updated_socket} = 136 136 - UserAuth.on_mount(:mount_current_user, %{}, session, %LiveView.Socket{}) 136 136 + UserAuth.on_mount(:mount_current_user, %{}, session, mount_socket()) 137 137 138 138 assert updated_socket.assigns.current_user == nil 139 139 end ··· 142 142 session = conn |> get_session() 143 143 144 144 {:cont, updated_socket} = 145 145 - UserAuth.on_mount(:mount_current_user, %{}, session, %LiveView.Socket{}) 145 145 + UserAuth.on_mount(:mount_current_user, %{}, session, mount_socket()) 146 146 147 147 assert updated_socket.assigns.current_user == nil 148 148 end ··· 154 154 session = conn |> put_session(:user_token, user_token) |> get_session() 155 155 156 156 {:cont, updated_socket} = 157 157 - UserAuth.on_mount(:ensure_authenticated, %{}, session, %LiveView.Socket{}) 157 157 + UserAuth.on_mount(:ensure_authenticated, %{}, session, mount_socket()) 158 158 159 159 assert updated_socket.assigns.current_user.id == user.id 160 160 end ··· 163 163 user_token = "invalid_token" 164 164 session = conn |> put_session(:user_token, user_token) |> get_session() 165 165 166 166 - socket = %LiveView.Socket{ 167 167 - endpoint: SowerWeb.Endpoint, 168 168 - assigns: %{__changed__: %{}, flash: %{}} 169 169 - } 166 166 + socket = mount_socket() 170 167 171 168 {:halt, updated_socket} = UserAuth.on_mount(:ensure_authenticated, %{}, session, socket) 172 169 assert updated_socket.assigns.current_user == nil ··· 175 172 test "redirects to login page if there isn't a user_token", %{conn: conn} do 176 173 session = conn |> get_session() 177 174 178 178 - socket = %LiveView.Socket{ 179 179 - endpoint: SowerWeb.Endpoint, 180 180 - assigns: %{__changed__: %{}, flash: %{}} 181 181 - } 175 175 + socket = mount_socket() 182 176 183 177 {:halt, updated_socket} = UserAuth.on_mount(:ensure_authenticated, %{}, session, socket) 184 178 assert updated_socket.assigns.current_user == nil ··· 195 189 :redirect_if_user_is_authenticated, 196 190 %{}, 197 191 session, 198 198 - %LiveView.Socket{} 192 192 + mount_socket() 199 193 ) 200 194 end 201 195 ··· 207 201 :redirect_if_user_is_authenticated, 208 202 %{}, 209 203 session, 210 210 - %LiveView.Socket{} 204 204 + mount_socket() 211 205 ) 212 206 end 213 207 end ··· 265 259 refute conn.halted 266 260 refute conn.status 267 261 end 262 262 + end 263 263 + 264 264 + defp mount_socket(connect_params \\ %{}) do 265 265 + %LiveView.Socket{ 266 266 + endpoint: SowerWeb.Endpoint, 267 267 + assigns: %{__changed__: %{}, flash: %{}}, 268 268 + private: %{connect_params: connect_params} 269 269 + } 268 270 end 269 271 end