X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2af0840ff314f9d1e0265a4a1b50fc6db4af9047..03356be5887ec2075f68e42bf8fa0928fa0ce249:/app/models/client_application.rb diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 11422e481..aa7cb1c34 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -10,7 +10,8 @@ class ClientApplication < ActiveRecord::Base validates :key, :presence => true, :uniqueness => true validates :name, :url, :secret, :presence => true validates :url, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i - validates :support_url, :callback_url, :allow_blank => true, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i + validates :support_url, :allow_blank => true, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i + validates :callback_url, :allow_blank => true, :format => %r{\A[a-z][a-z0-9.+-]*://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i before_validation :generate_keys, :on => :create