identity_provider.rb in osso-0.0.5.pre.gamma

- old
+ new

@@ -8,12 +8,10 @@
       belongs_to :oauth_client
       has_many :users
       before_save :set_status
       validate :sso_cert_valid
 
-      enum status: { pending: "PENDING", configured: 'CONFIGURED', active: "ACTIVE", error: "ERROR"}
-
       PEM_HEADER = "-----BEGIN CERTIFICATE-----\n"
       PEM_FOOTER = "\n-----END CERTIFICATE-----"
 
       def name
         service.titlecase
@@ -39,18 +37,20 @@
       end
 
       alias acs_url assertion_consumer_service_url
 
       def set_status
-        self.status = 'configured' if sso_url && sso_cert && pending?
+        return if status != 'PENDING'
+
+        self.status = 'CONFIGURED' if sso_url && sso_cert
       end
 
       def active!
-        update(status: 'active')
+        update(status: 'ACTIVE')
       end
 
       def error!
-        update(status: 'error')
+        update(status: 'ERROR')
       end
 
       def root_url
         return "https://#{ENV['HEROKU_APP_NAME']}.herokuapp.com" if ENV['HEROKU_APP_NAME']
 