Changeset 37692

Timestamp:

2023-04-21T14:07:55+12:00 (12 months ago)

Author:

davidb

Message:

Makes more sense for the variable named to be greenstone_username; and so does not need to @-part being stripped off; tested with a Google sign-in account with a Google username part that was different to the Greenstone username

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/GoogleSigninJDBCRealm.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/GoogleSigninJDBCRealm.java

@@ -398 +398 @@
         
         // Google Client Token ID has been passed in as 'credentials'
-        String google_user_email = getGreenstoneUsernameFromGoogleTokenId(credentials);
-
-        if (google_user_email != null) {
-        String google_username = google_user_email.replaceAll("@.*$","");
-        System.err.println("**** Using the following username derived from verified Google email address as Greenstone3 username = '" + google_username + "'");
-        
-        principal = super.getPrincipal(google_username);
+        String greenstone_username = getGreenstoneUsernameFromGoogleTokenId(credentials);
+
+        if (greenstone_username != null) {
+        System.err.println("**** Using the following username derived from verified Google email address as Greenstone3 username = '" + greenstone_username + "'");
+        
+        principal = super.getPrincipal(greenstone_username);
         }
         else {