usman 0.2.3 → 0.2.5

data/config/locales/usman/authentication.en.yml

@@ -1,28 +1,25 @@
 en:
   authentication:
-    login_required:
-        heading: "Login Required / Session Expired"
-        message: "You need to login to perform this action."
     permission_denied:
-        heading: "Permission Denied"
-        message: "You don't have permission to perform this action"
+      heading: "Permission Denied"
+      message: "You don't have permission to perform this action"
     session_expired:
-        heading: "Session Expired"
-        message: "Your session has been expired. Please sign in again"
+      heading: "Session Expired"
+      message: "Your session has been expired. Please sign in again"
     invalid_login:
-        heading: "Invalid Login"
-        message: "Invalid Username/Email or password."
+      heading: "Invalid Login"
+      message: "Invalid Username/Email or password."
     user_is_pending:
-        heading: "Account Pending"
-        message: "Your account is not yet approved, please contact administrator to activate your account"
+      heading: "Account Pending"
+      message: "Your account is not yet approved, please contact administrator to activate your account"
     user_is_suspended:
-        heading: "Account Suspended"
-        message: "Your account is suspended, please contact administrator"
+      heading: "Account Suspended"
+      message: "Your account is suspended, please contact administrator"
     logged_in:
-        heading: "Signed In"
-        message: "You have successfully signed in"
+      heading: "Signed In"
+      message: "You have successfully signed in"
     logged_out:
-        heading: "Signed Out"
-        message: "You have successfully signed out"
-    masquerade: "You have successfully logged in as - %{user}"
+      heading: "Signed Out"
+      message: "You have successfully signed out"
+    masquerade: "لقد سجلت الدخول بنجاح - %{user}"
     sign_in_back: "You have successfully signed in back as %{user}"

data/config/routes.rb

@@ -14,6 +14,10 @@ Usman::Engine.routes.draw do
   get   '/my_account',        to: "my_account#index",  as:   :my_account
   get   '/dashboard/usman',   to: "dashboard#index",  as:   :dashboard
   
+  resources :registrations, only: [:index, :show] do
+    resources :devices, :controller => "registration_devices"
+  end
+
   resources :users do
     member do
       put :masquerade, as: :masquerade
@@ -34,19 +38,34 @@ Usman::Engine.routes.draw do
   end
 
   resources :permissions
-
+  
   namespace :api do
     namespace :v1 do
-      post :register, :controller => "/api/v1/registrations"
-      post :resend_otp, :controller => "/api/v1/registrations"
-      post :verify, :controller => "/api/v1/registrations"
+      
+      # Registrations
+      post :register, :controller => "registrations"
+      post :resend_otp, :controller => "registrations"
+      post :verify, :controller => "registrations"
+      post :accept_tac, :controller => "registrations"
+
+      # Profile
+      post :create_profile, :controller => "profile"
+      post :update_profile, :controller => "profile"
     end
   end
-
-  get '/api/v1/docs/usman',         to: "docs#index",  as:   :docs_index
   
-  #get "/api/v1/docs/register", :controller => "/usman/api_docs"
-  #get "/api/v1/docs/resend_otp", :controller => "/usman/api_docs"
-  #get "/api/v1/docs/verify", :controller => "/usman/api_docs"
+  scope :docs do
+    namespace :api do
+      namespace :v1 do
+        get 'index', :controller => "docs"
+        get 'register', :controller => "docs"
+        get 'resend_otp', :controller => "docs"
+        get 'verify_otp', :controller => "docs"
+        get 'accept_tac', :controller => "docs"
+        get 'create_profile', :controller => "docs"
+        get 'update_profile', :controller => "docs"
+      end
+    end
+  end
 
 end

data/db/migrate/20170904080436_add_tac_accepted_at_to_devices.rb

@@ -0,0 +1,5 @@
+class AddTacAcceptedAtToDevices < ActiveRecord::Migration[5.1]
+  def change
+    add_column :devices, :tac_accepted_at, :datetime
+  end
+end

data/db/migrate/20170905041104_add_gender_to_users.rb

@@ -0,0 +1,6 @@
+class AddGenderToUsers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :users, :gender, :string, default: :nogender
+    add_column :users, :date_of_birth, :date
+  end
+end

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,28 +90,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -345,15 +345,19 @@ files:
 - app/assets/images/ms-icon-310x310.png
 - app/assets/images/ms-icon-70x70.png
 - app/assets/sketches/logo.sketch
-- app/controllers/api/v1/base_controller.rb
-- app/controllers/api/v1/registrations_controller.rb
 - app/controllers/usman/admin_controller.rb
+- app/controllers/usman/api/v1/base_controller.rb
+- app/controllers/usman/api/v1/docs_base_controller.rb
+- app/controllers/usman/api/v1/docs_controller.rb
+- app/controllers/usman/api/v1/profile_controller.rb
+- app/controllers/usman/api/v1/registrations_controller.rb
 - app/controllers/usman/application_controller.rb
 - app/controllers/usman/dashboard_controller.rb
-- app/controllers/usman/docs_controller.rb
 - app/controllers/usman/features_controller.rb
 - app/controllers/usman/my_account_controller.rb
 - app/controllers/usman/permissions_controller.rb
+- app/controllers/usman/registration_devices_controller.rb
+- app/controllers/usman/registrations_controller.rb
 - app/controllers/usman/resource_controller.rb
 - app/controllers/usman/roles_controller.rb
 - app/controllers/usman/sessions_controller.rb
@@ -378,14 +382,23 @@ files:
 - app/uploaders/feature_image_uploader.rb
 - app/uploaders/image_uploader.rb
 - app/uploaders/profile_picture_uploader.rb
+- app/views/kuppayam/api/docs/_navigation.html.erb
 - app/views/layouts/kuppayam/_footer.html.erb
 - app/views/layouts/kuppayam/_header.html.erb
 - app/views/layouts/kuppayam/_navbar.html.erb
 - app/views/layouts/kuppayam/_sidebar.html.erb
 - app/views/layouts/kuppayam/profile.html.erb
+- app/views/usman/api/v1/docs/register/_neg_case_1.html.erb
+- app/views/usman/api/v1/docs/register/_neg_case_2.html.erb
+- app/views/usman/api/v1/docs/register/_neg_case_3.html.erb
+- app/views/usman/api/v1/docs/register/_pos_case_1.html.erb
+- app/views/usman/api/v1/docs/resend_otp/_neg_case_1.html.erb
+- app/views/usman/api/v1/docs/resend_otp/_pos_case_1.html.erb
+- app/views/usman/api/v1/docs/verify_otp/_neg_case_1.html.erb
+- app/views/usman/api/v1/docs/verify_otp/_neg_case_2.html.erb
+- app/views/usman/api/v1/docs/verify_otp/_neg_case_3.html.erb
+- app/views/usman/api/v1/docs/verify_otp/_pos_case_1.html.erb
 - app/views/usman/dashboard/index.html.erb
-- app/views/usman/docs/index.html.erb
-- app/views/usman/docs/register.html.erb
 - app/views/usman/features/_form.html.erb
 - app/views/usman/features/_index.html.erb
 - app/views/usman/features/_row.html.erb
@@ -398,6 +411,14 @@ files:
 - app/views/usman/permissions/_row.html.erb
 - app/views/usman/permissions/_show.html.erb
 - app/views/usman/permissions/index.html.erb
+- app/views/usman/registration_devices/_form.html.erb
+- app/views/usman/registration_devices/_index.html.erb
+- app/views/usman/registration_devices/_row.html.erb
+- app/views/usman/registrations/_form.html.erb
+- app/views/usman/registrations/_index.html.erb
+- app/views/usman/registrations/_row.html.erb
+- app/views/usman/registrations/_show.html.erb
+- app/views/usman/registrations/index.html.erb
 - app/views/usman/roles/_form.html.erb
 - app/views/usman/roles/_index.html.erb
 - app/views/usman/roles/_row.html.erb
@@ -414,12 +435,10 @@ files:
 - app/views/usman/users/_row.html.erb
 - app/views/usman/users/_show.html.erb
 - app/views/usman/users/index.html.erb
+- config/locales/usman/api.ar.yml
+- config/locales/usman/api.en.yml
 - config/locales/usman/authentication.ar.yml
 - config/locales/usman/authentication.en.yml
-- config/locales/usman/general.ar.yml
-- config/locales/usman/general.en.yml
-- config/locales/usman/mobile_registration.ar.yml
-- config/locales/usman/mobile_registration.en.yml
 - config/routes.rb
 - db/data/dummy/features.csv
 - db/data/dummy/permissions.csv
@@ -437,6 +456,8 @@ files:
 - db/migrate/20170819113218_add_registration_id_to_users.rb
 - db/migrate/20170819113219_create_devices.rb
 - db/migrate/20170825020624_add_otp_verified_at_to_devices.rb
+- db/migrate/20170904080436_add_tac_accepted_at_to_devices.rb
+- db/migrate/20170905041104_add_gender_to_users.rb
 - lib/tasks/usman/data.rake
 - lib/tasks/usman/master_data.rake
 - lib/temp/features.rake

data/app/controllers/api/v1/base_controller.rb

@@ -1,13 +0,0 @@
-module Api
-  module V1
-    class BaseController < ActionController::API
-
-      include ActionController::HttpAuthentication::Token::ControllerMethods
-      include Usman::ApiHelper
-      
-      before_action :require_auth_token
-
-    end
-  end
-
-end

data/app/controllers/api/v1/registrations_controller.rb

@@ -1,115 +0,0 @@
-module Api
-  module V1
-    class RegistrationsController < BaseController
-
-      skip_before_action :require_auth_token      
-
-      def register
-        proc_code = Proc.new do
-          @reg_data = Usman::MobileRegistrationService.new(params)
-          @errors = @reg_data.errors
-          @success = false
-          if @errors[:heading].blank?
-            @success = true
-            @alert = {
-              heading: I18n.translate("mobile_registration.otp_sent.heading"),
-              message: I18n.translate("mobile_registration.otp_sent.message")
-            }
-            @data = {
-                      registration: @reg_data.registration,
-                      device: @reg_data.device
-                    }
-          end
-        end
-        render_json_response(proc_code)
-      end
-
-      def resend_otp
-        proc_code = Proc.new do
-          @device = Device.where("uuid = ?", params[:uuid]).first
-          if @device
-            if @device.blocked?
-              @success = false
-              @errors = {
-                heading: I18n.translate("mobile_registration.device_blocked.heading"),
-                message: I18n.translate("mobile_registration.device_blocked.message"),
-                details: {}
-              }
-            else
-              valid, validation_errors = @device.resend_otp(params[:dialing_prefix], params[:mobile_number])
-              if valid
-                @success = true
-                @alert = {
-                  heading: I18n.translate("mobile_registration.new_otp_sent.heading"),
-                  message: I18n.translate("mobile_registration.new_otp_sent.message")
-                }
-                @data = {}
-              else
-                @success = false
-                @errors = {
-                  heading: I18n.translate("mobile_registration.otp_not_matching.heading"),
-                  message: I18n.translate("mobile_registration.otp_not_matching.message"),
-                  details: validation_errors
-                }
-              end
-            end
-          else
-            @success = false
-            @errors = {
-              heading: I18n.translate("general.unexpected_failure.heading"),
-              message: I18n.translate("general.unexpected_failure.message"),
-              details: {
-                uuid: "is invalid"
-              }
-            }
-          end
-        end
-        render_json_response(proc_code)
-      end
-
-      def verify
-        proc_code = Proc.new do
-          @device = Device.where("uuid = ?", params[:uuid]).first
-          if @device
-            if @device.blocked?
-              @success = false
-              @errors = {
-                heading: I18n.translate("mobile_registration.device_blocked.heading"),
-                message: I18n.translate("mobile_registration.device_blocked.message"),
-                details: {}
-              }
-            else
-              valid, validation_errors = @device.validate_otp(params[:otp], params[:dialing_prefix], params[:mobile_number])
-              if valid
-                @success = true
-                @alert = {
-                  heading: I18n.translate("mobile_registration.verification_success.heading"),
-                  message: I18n.translate("mobile_registration.verification_success.message")
-                }
-                @data = { api_token: @device.api_token }
-              else
-                @success = false
-                @errors = {
-                  heading: I18n.translate("mobile_registration.otp_not_matching.heading"),
-                  message: I18n.translate("mobile_registration.otp_not_matching.message"),
-                  details: validation_errors
-                }
-              end
-            end
-          else
-            @success = false
-            @errors = {
-              heading: I18n.translate("general.unexpected_failure.heading"),
-              message: I18n.translate("general.unexpected_failure.message"),
-              details: {
-                uuid: "is invalid"
-              }
-            }
-          end
-        end
-        render_json_response(proc_code)
-      end
-    end
-  end
-end
-

data/app/controllers/usman/docs_controller.rb

@@ -1,41 +0,0 @@
-module Usman
-  class DocsController < Kuppayam::BaseController
-
-    include Usman::AuthenticationHelper
-
-    layout 'kuppayam/docs'
-
-    before_action :current_user
-
-    def index
-    end
-
-    def register
-    end
-
-    def resend_otp
-    end
-
-    def verify
-    end
-
-    private
-
-    def set_default_title
-      set_title("API Docs | #{params[:action].to_s.titleize}")
-    end
-
-    def breadcrumbs_configuration
-      {
-        heading: "API Documentation",
-        description: "Requests and response structures with examples",
-        links: [{name: "Index", link: docs_index_path, icon: 'fa-list'}]
-      }
-    end
-
-    def set_navs
-      set_nav("docs")
-    end
-
-  end
-end