Repeat SSO user lookup by emails in username/nickname fields

When logging in with e.g. OpenID Connect/Azure, two email addresses may be provided, one in "email" field and another in "username" or "nickname". Since this is exactly the opposite of what the separate Azure backend does, migration from Azure to OpenID Connect/Azure needs to try both emails which may be different.

src/api/app/models/user.rb

@@ -233,6 +233,17 @@ class User < ApplicationRecord
 
         return user
       end
+
+      username = auth['username'] || auth['nickname']
+      if username.include? '@'
+        user = find_by_email(username)
+
+        if user
+          user.mark_login!
+
+          return user
+        end
+      end
     end
   end
 

[Sjoerd Simons]

how will this impact the collabora deployment using keycloak?