usman 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 305e0b1f3fcbaf48dfa3ef61edcc5fc8f1f735c7
-  data.tar.gz: 0f29c10f24fe0a2a18fe7c30b3f48b3f37d57ae8
+  metadata.gz: 62800b6f073efd50739af97e19089839e9356b0d
+  data.tar.gz: 8aa69a51f5b800ae068f22a60fbc4d169a584913
 SHA512:
-  metadata.gz: edca824f4e840bd5fd8786455cdd5f598d2543caa35060aca8f221270c0ee3b16800526620f0976d6b600e2f1c3b456a5bb7e4d555a988fcd0b3c264ed2cf730
-  data.tar.gz: 929e61aa9eddab89d2658005482b6abbf1e00c28302286f49dafe4adae2dbe534ea4b9e4f20df18456a39d70e58361f0aaa09897f3d75f184fdc89366e0551cc
+  metadata.gz: 6bda771ec286d380b5d87f8661b559dc15c37d6b86b3b5ba3c9b3189f4acf5b19f95fff9179ee462efdaac5d84d57eddb01c4f9fb707bca372ee685fbb4e17b3
+  data.tar.gz: c0f413d6bdadf9439fb047ba9b36a9cf26a432eb5f358d3d9738759a8a17ba6d47ab7289ca3a0ab35d9b4d2b0557536b706ecff74a5e63ca0c41acdac71390f9

data/app/controllers/usman/api/v1/profile_controller.rb

@@ -19,12 +19,13 @@ module Usman
                 @user.gender = permitted_params[:gender]
                 @user.date_of_birth = permitted_params[:date_of_birth]
                 @user.email = permitted_params[:email]
-
+                
                 @country = Country.find_by_id(permitted_params[:country_id])
                 @city = City.find_by_id(permitted_params[:city_id])
 
                 if @user.valid?
                   @user.save
+                  @user.approve!
                   @current_registration.user = @user
                   
                   @current_registration.country = @country if @country

data/app/controllers/usman/users_controller.rb

@@ -3,6 +3,20 @@ module Usman
 
     before_action :require_site_admin
     
+    def update_status
+      @user = @r_object = User.find(params[:id])
+      case params[:status]
+      when "pending"
+        @user.pending!
+      when "approved"
+        @user.approve!
+      when "suspended"
+        @user.suspend!
+      end
+      set_notification(true, I18n.t('status.success'), I18n.t('state.changed', item: default_item_name.titleize, new_state: @r_object.status))
+      render_row
+    end
+
     def make_super_admin
       @user = @r_object = User.find(params[:id])
       if @user

data/app/helpers/usman/api_helper.rb

@@ -44,8 +44,8 @@ module Usman
           proc_code = Proc.new do
             @success = false
             @errors = {
-              heading: I18n.translate("api.general.user_is_pending.heading"),
-              message: I18n.translate("api.general.user_is_pending.message")
+              heading: I18n.translate("api.authentication.user_is_pending.heading"),
+              message: I18n.translate("api.authentication.user_is_pending.message")
             }
           end
           render_json_response(proc_code)
@@ -54,8 +54,8 @@ module Usman
           proc_code = Proc.new do
             @success = false
             @errors = {
-              heading: I18n.translate("api.general.user_is_suspended.heading"),
-              message: I18n.translate("api.general.user_is_suspended.message")
+              heading: I18n.translate("api.authentication.user_is_suspended.heading"),
+              message: I18n.translate("api.authentication.user_is_suspended.message")
             }
           end
           render_json_response(proc_code)

data/app/models/device.rb

@@ -168,9 +168,7 @@ class Device < ApplicationRecord
     self.save
 
     self.verify!
-    self.registration.verify!
-    self.registration.user.approve! if self.registration.user
-
+    
     # Clearing the OTP so that next time if he uses the same, it shows error
     self.otp = nil
     self.save
@@ -217,6 +215,12 @@ class Device < ApplicationRecord
     self.tac_accepted_at = Time.now
     self.save
 
+    # Verify the Registration as it is now complete
+    self.registration.verify!
+
+    # Approve the user if it not already approved
+    self.registration.user.approve! if self.registration.user
+
     return true, {}
   end
 

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - kpvarma