Moving token generation to commonlib/rblib/util.rb

3 files changed, 2 insertions, 5 deletions

diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb
index edd151730..655b3ac58 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -61,11 +61,7 @@ class PostRedirect < ActiveRecord::Base
 
     # Makes a random token, suitable for using in URLs e.g confirmation messages.
     def self.generate_random_token
-        bits = 12 * 8
-        # Make range from value to double value, so number of digits in base 36
-        # encoding is quite long always.
-        rand_num = rand(max = 2**(bits+1)) + 2**bits
-        rand_num.to_s(base=36)
+        MySociety::Util.generate_token
     end
 
     # Make the token 
diff --git a/commonlib b/commonlib
-Subproject a901c2a431f7869f5c2eaee5808f8590ca78544
+Subproject 5baec579b8ede57d71e114a8721d2d4a2c667ef
diff --git a/config/environment.rb b/config/environment.rb
index 3ba4592a3..b0effaabd 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -24,6 +24,7 @@ load "validate.rb"
 load "config.rb"
 load "format.rb"
 load "debug_helpers.rb"
+load "util.rb"
 
 Rails::Initializer.run do |config|
   # Load intial mySociety config