improve support for Google

R-Sandor · R-Sandor · commit 1219a4afa288 · 2025-08-30T06:48:02.000-04:00
diff --git a/server/src/main/java/dev/findfirst/security/oauth2client/OauthUserService.java b/server/src/main/java/dev/findfirst/security/oauth2client/OauthUserService.java
@@ -72,7 +72,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
     Supplier<User> signup = () -> {
       try {
         if (email != null && !email.isEmpty()) {
-          return signupUser(username, email);
+          return signupUser(email, email);
         } else {
           return signupUser(username, oauth2PlaceholderEmail);
         }
diff --git a/server/src/main/resources/db/migration/V1.0.14__extend_username_column_size.sql b/server/src/main/resources/db/migration/V1.0.14__extend_username_column_size.sql
@@ -0,0 +1,3 @@
+ALTER TABLE "users"
+  ALTER COLUMN username TYPE VARCHAR(255),
+  ALTER COLUMN username SET NOT NULL;

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic`
`72`	`72`	`Supplier<User> signup = () -> {`
`73`	`73`	`try {`
`74`	`74`	`if (email != null && !email.isEmpty()) {`
`75`		`- return signupUser(username, email);`
	`75`	`+ return signupUser(email, email);`
`76`	`76`	`} else {`
`77`	`77`	`return signupUser(username, oauth2PlaceholderEmail);`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ALTER TABLE "users"`
	`2`	`+ ALTER COLUMN username TYPE VARCHAR(255),`
	`3`	`+ ALTER COLUMN username SET NOT NULL;`