Use hyphenated UUID format

Author: jedediah

app/models/user/identity.rb

@@ -5,15 +5,15 @@ module Identity
 
         USERNAME_REGEX = /\A([a-zA-Z0-9_]{1,16}|[0-9a-f]{24})\z/
         USERNAME_NORMALIZED_REGEX = /\A([a-z0-9_]{1,16}|[0-9a-f]{24})\z/
-        UUID_REGEX = /\A[0-9a-f]{32}\z/
+        UUID_REGEX = /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/
         PLAYER_ID_REGEX = /\A([a-zA-Z0-9_ ]{1,16}|_[0-9a-f]{24})\z/ # some old usernames have spaces
 
         class MojangUuidValidator < ActiveModel::EachValidator
             def validate_each(user, attr, uuid)
                 if uuid !~ UUID_REGEX
                     user.errors.add(attr, "is not a valid UUID")
                 else
-                    v = UUIDTools::UUID.parse_hexdigest(uuid).version
+                    v = UUIDTools::UUID.parse(uuid).version
                     v == 4 or user.errors.add(attr, "must be version 4 (was version #{v})")
                 end
             end
@@ -144,14 +144,19 @@ def with_past_username(username)
 
             def normalize_uuid(uuid)
                 if uuid.is_a? UUIDTools::UUID
-                    uuid.hexdigest
-                elsif uuid
-                    uuid.gsub(/-/,'').downcase
+                    uuid.to_s
+                elsif uuid =~ /\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/
+                    uuid.downcase
+                elsif uuid =~ /\A(\h{8})(\h{4})(\h{4})(\h{4})(\h{12})\z/
+                    "#{$1}-#{$2}-#{$3}-#{$4}-#{$5}".downcase
+                else
+                    # Validation will catch it
+                    uuid
                 end
             end
 
             def uuid_invalid_reason(uuid)
-                unless UUIDTools::UUID.parse_hexdigest(uuid).version == 4
+                unless UUIDTools::UUID.parse(uuid).version == 4
                     "Not a v4 UUID (probably generated for an offline login)"
                 end
             end
@@ -190,7 +195,7 @@ def has_uuid?(uuid)
         end
 
         def uuid_obj
-            UUIDTools::UUID.parse_hexdigest(self.uuid)
+            UUIDTools::UUID.parse(self.uuid)
         end
 
         # The API client can deserialize this into a tc.oc.api.PlayerId

script/convert_uuids_to_standard_format.rb

@@ -0,0 +1,9 @@
+require_relative 'script_helpers'
+
+# Hyphenates User UUIDs
+
+puts "Scanning for convertible UUIDs (will take about #{User.count / 7000.0} seconds)..."
+
+User.where(uuid: /[0-9a-f]{32}/).each_print_progress do |user|
+    user.set(uuid: User.normalize_uuid(user.uuid))
+end

test/unit/user_test.rb

@@ -40,8 +40,8 @@ class UserTest < ActiveSupport::TestCase
     end
 
     test "uuid normalized on save" do
-        user = User.create!(username: "Woot", uuid: "01234567-89AB-4DEF-8123-456789ABCDEF", player_id: "Woot")
-        assert_equal "0123456789ab4def8123456789abcdef", user.uuid
+        user = User.create!(username: "Woot", uuid: "0123456789AB4DEF8123456789ABCDEF", player_id: "Woot")
+        assert_equal "01234567-89ab-4def-8123-456789abcdef", user.uuid
     end
 
     test "invalid uuid format fails validation" do