service_ticket.rb in masover-castronaut-0.4.4.5

- old
+ new

@@ -12,15 +12,15 @@
 
       belongs_to :ticket_granting_ticket
       has_many :proxy_granting_tickets, :dependent => :destroy
 
       before_validation :dispense_ticket, :if => :new_record?
-      validates_presence_of :ticket, :client_hostname, :service, :username, :ticket_granting_ticket
+      validates_presence_of :ticket, :client_hostname, :service, :identifier, :ticket_granting_ticket
 
       def self.generate_ticket_for(service, client_host, ticket_granting_ticket)
         create! :service => service,
-                :username => ticket_granting_ticket.username,
+                :identifier => ticket_granting_ticket.identifier,
                 :client_hostname => client_host,
                 :ticket_granting_ticket => ticket_granting_ticket
       end
 
       def self.validate_ticket(service, ticket, allow_proxy_tickets = false)
@@ -39,10 +39,10 @@
           return Castronaut::TicketResult.new(service_ticket, "Ticket '#{ticket}' is a proxy ticket, but only service tickets are allowed here.", "INVALID_TICKET")
         end
 
         return Castronaut::TicketResult.new(service_ticket, "Ticket '#{ticket}' has expired.", "INVALID_TICKET") if service_ticket.expired?
 
-        mismatched_service_message = "The ticket '#{ticket}' belonging to user '#{service_ticket.username}' is valid, but the requested service '#{service}' does not match the service '#{service_ticket.service}' associated with this ticket."
+        mismatched_service_message = "The ticket '#{ticket}' belonging to user '#{service_ticket.identifier}' is valid, but the requested service '#{service}' does not match the service '#{service_ticket.service}' associated with this ticket."
 
         return Castronaut::TicketResult.new(service_ticket, mismatched_service_message, "INVALID_SERVICE") unless service_ticket.matches_service?(service)
 
         Castronaut::TicketResult.new(service_ticket, nil, "success")
       end