From 4566e48bee8929222dfa17d99ffc0d1ea27569b7 Mon Sep 17 00:00:00 2001
From: michaeljguarino <mjg@plural.sh>
Date: Wed, 18 Sep 2024 11:53:40 -0400
Subject: [PATCH] Fix sso login (#1361)

---
 apps/core/lib/core/services/users.ex               |  6 +++---
 apps/core/test/services/users_test.exs             | 12 ++++++++++--
 apps/graphql/test/mutations/user_mutation_test.exs |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/apps/core/lib/core/services/users.ex b/apps/core/lib/core/services/users.ex
index d01a9978c..b0d765adc 100644
--- a/apps/core/lib/core/services/users.ex
+++ b/apps/core/lib/core/services/users.ex
@@ -367,13 +367,13 @@ defmodule Core.Services.Users do
   """
   @spec bootstrap_user(Core.OAuth.method, map) :: user_resp
   def bootstrap_user(service, %{email: email} = attrs) do
-    case get_user_by_email(email) do
-      nil ->
+    case {service, get_user_by_email(email)} do
+      {_, nil} ->
         attrs
         |> Map.merge(login_args(service))
         |> Map.put(:password, Ecto.UUID.generate())
         |> create_user()
-      %User{login_method: ^service} = user ->
+      {service, %User{login_method: svc} = user} when service == :sso or service == svc ->
         update_user(login_args(service), user)
       _ -> {:error, "you don't have login with #{service} enabled"}
     end
diff --git a/apps/core/test/services/users_test.exs b/apps/core/test/services/users_test.exs
index 8caa07b93..f610408ca 100644
--- a/apps/core/test/services/users_test.exs
+++ b/apps/core/test/services/users_test.exs
@@ -514,7 +514,7 @@ defmodule Core.Services.UsersTest do
     end
   end
 
-  describe "#bootstrap_users/2" do
+  describe "#bootstrap_user/2" do
     test "it will create new users and set login method" do
       {:ok, user} = Users.bootstrap_user(:google, %{email: "someone@gmail.com", name: "New User"})
 
@@ -532,11 +532,19 @@ defmodule Core.Services.UsersTest do
       assert upd.login_method == :google
     end
 
-    test "it will not allow logins w/o login method set" do
+    test "it will not allow logins w/o correct login method set" do
       user = insert(:user)
 
       {:error, _} = Users.bootstrap_user(:google, %{email: user.email})
     end
+
+    test "it will allow sso logins w/ whatever login method set" do
+      user = insert(:user)
+
+      {:ok, upd} = Users.bootstrap_user(:sso, %{email: user.email})
+
+      assert upd.id == user.id
+    end
   end
 
   describe "#create_trust_relationship" do
diff --git a/apps/graphql/test/mutations/user_mutation_test.exs b/apps/graphql/test/mutations/user_mutation_test.exs
index 13a85faf9..66f0dcb43 100644
--- a/apps/graphql/test/mutations/user_mutation_test.exs
+++ b/apps/graphql/test/mutations/user_mutation_test.exs
@@ -50,7 +50,7 @@ defmodule GraphQl.UserMutationTest do
     end
 
     test "it will fail on invalid captchas" do
-      {:ok, user} = Users.create_user(%{
+      {:ok, _} = Users.create_user(%{
         name: "Michael Guarino",
         email: "mjg@plural.sh",
         password: "super strong password"