WIP - fixed all namespacing in iam

Author: rpbaltazar

services/iam/app/controllers/iam/application_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class ApplicationController < ::ApplicationController
+module Ros
+  module Iam
+    class ApplicationController < ::ApplicationController
+    end
   end
 end

services/iam/app/controllers/iam/confirmations_controller.rb

@@ -1,49 +1,51 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class ConfirmationsController < Devise::ConfirmationsController
-    include IsTenantScoped
+module Ros
+  module Iam
+    class ConfirmationsController < Devise::ConfirmationsController
+      include IsTenantScoped
 
-    skip_before_action :authenticate_it!, only: %i[create show]
+      skip_before_action :authenticate_it!, only: %i[create show]
 
-    respond_to :json
+      respond_to :json
 
-    # POST /resource/confirmation
-    def create
-      Apartment::Tenant.switch tenant_schema(reset_params) do
-        return super unless find_user!
+      # POST /resource/confirmation
+      def create
+        Apartment::Tenant.switch tenant_schema(reset_params) do
+          return super unless find_user!
 
-        @current_user.send_confirmation_instructions
+          @current_user.send_confirmation_instructions
 
-        if successfully_sent?(@current_user)
-          render status: :ok, json: { message: 'ok' }
-        else
-          render status: :bad_request
+          if successfully_sent?(@current_user)
+            render status: :ok, json: { message: 'ok' }
+          else
+            render status: :bad_request
+          end
         end
       end
-    end
 
-    # Devise v4.7.1 expects this to be a GET request and not PUT which is
-    # definitely not what I expected.
-    # https://github.com/plataformatec/devise/blob/v4.7.1/app/controllers/devise/confirmations_controller.rb#L21
-    #
-    # GET /resource/confirmation
-    def show
-      mail_token = begin
-                     Ros::Jwt.new(confirmation_params[:token]).decode
-                   rescue JWT::DecodeError => e
-                     render status: :bad_request, json: { errors: e }
-                     return
-                   end
-
-      return unless mail_token
-
-      Apartment::Tenant.switch tenant_schema(mail_token) do
-        res = User.confirm_by_token(mail_token[:token])
-        if res.confirmed?
-          render status: :ok, json: { message: 'ok' }
-        else
-          render status: :bad_request, json: { errors: res.errors }
+      # Devise v4.7.1 expects this to be a GET request and not PUT which is
+      # definitely not what I expected.
+      # https://github.com/plataformatec/devise/blob/v4.7.1/app/controllers/devise/confirmations_controller.rb#L21
+      #
+      # GET /resource/confirmation
+      def show
+        mail_token = begin
+                       Ros::Jwt.new(confirmation_params[:token]).decode
+                     rescue JWT::DecodeError => e
+                       render status: :bad_request, json: { errors: e }
+                       return
+                     end
+
+        return unless mail_token
+
+        Apartment::Tenant.switch tenant_schema(mail_token) do
+          res = User.confirm_by_token(mail_token[:token])
+          if res.confirmed?
+            render status: :ok, json: { message: 'ok' }
+          else
+            render status: :bad_request, json: { errors: res.errors }
+          end
         end
       end
     end

services/iam/app/controllers/iam/passwords_controller.rb

@@ -1,54 +1,56 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class PasswordsController < Devise::PasswordsController
-    include IsTenantScoped
+module Ros
+  module Iam
+    class PasswordsController < Devise::PasswordsController
+      include IsTenantScoped
 
-    skip_before_action :authenticate_it!, only: %i[create update]
+      skip_before_action :authenticate_it!, only: %i[create update]
 
-    respond_to :json
+      respond_to :json
 
-    # POST /resource/password
-    def create
-      Apartment::Tenant.switch tenant_schema(password_params) do
-        return super unless find_user!
+      # POST /resource/password
+      def create
+        Apartment::Tenant.switch tenant_schema(password_params) do
+          return super unless find_user!
 
-        @current_user.send_reset_password_instructions
+          @current_user.send_reset_password_instructions
 
-        if successfully_sent?(@current_user)
-          render status: :ok, json: { message: 'ok' }
-        else
-          render status: :bad_request
+          if successfully_sent?(@current_user)
+            render status: :ok, json: { message: 'ok' }
+          else
+            render status: :bad_request
+          end
         end
       end
-    end
 
-    # PUT /resource/password
-    def update
-      mail_token = begin
-                     Ros::Jwt.new(reset_params[:token]).decode
-                   rescue JWT::DecodeError => e
-                     render status: :bad_request, json: { errors: e }
-                     return
-                   end
-
-      return unless mail_token
-
-      Apartment::Tenant.switch tenant_schema(mail_token) do
-        decoded_params = {
-          reset_password_token: mail_token[:token],
-          password: reset_params[:password],
-          password_confirmation: reset_params[:password_confirmation]
-        }
-
-        res = User.reset_password_by_token(decoded_params)
-
-        if res.persisted?
-          res.confirm unless res.confirmed?
-          @current_jwt = Ros::Jwt.new(res.jwt_payload)
-          render status: :ok, json: { message: 'ok' }
-        else
-          render status: :bad_request, json: { errors: res.errors }
+      # PUT /resource/password
+      def update
+        mail_token = begin
+                      Ros::Jwt.new(reset_params[:token]).decode
+                    rescue JWT::DecodeError => e
+                      render status: :bad_request, json: { errors: e }
+                      return
+                    end
+
+        return unless mail_token
+
+        Apartment::Tenant.switch tenant_schema(mail_token) do
+          decoded_params = {
+            reset_password_token: mail_token[:token],
+            password: reset_params[:password],
+            password_confirmation: reset_params[:password_confirmation]
+          }
+
+          res = User.reset_password_by_token(decoded_params)
+
+          if res.persisted?
+            res.confirm unless res.confirmed?
+            @current_jwt = Ros::Jwt.new(res.jwt_payload)
+            render status: :ok, json: { message: 'ok' }
+          else
+            render status: :bad_request, json: { errors: res.errors }
+          end
         end
       end
     end

services/iam/app/controllers/iam/sessions_controller.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class SessionsController < Devise::SessionsController
-    include IsTenantScoped
+module Ros
+  module Iam
+    class SessionsController < Devise::SessionsController
+      include IsTenantScoped
 
-    skip_before_action :authenticate_it!, only: :create
+      skip_before_action :authenticate_it!, only: :create
 
-    respond_to :json
+      respond_to :json
 
-    # POST /resource/sign_in
-    def create
-      Apartment::Tenant.switch tenant_schema(sign_in_params) do
-        return super unless login_user!
+      # POST /resource/sign_in
+      def create
+        Apartment::Tenant.switch tenant_schema(sign_in_params) do
+          return super unless login_user!
 
-        @current_jwt = Ros::Jwt.new(current_user.jwt_payload)
-        render json: json_resource(resource_class: user_resource, record: current_user)
+          @current_jwt = Ros::Jwt.new(current_user.jwt_payload)
+          render json: json_resource(resource_class: user_resource, record: current_user)
+        end
       end
     end
   end

services/iam/app/models/ros/iam/application_record.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class ApplicationRecord < ::ApplicationRecord
-    self.abstract_class = true
+module Ros
+  module Iam
+    class ApplicationRecord < ::ApplicationRecord
+      self.abstract_class = true
+    end
   end
 end

services/iam/app/policies/iam/application_policy.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class ApplicationPolicy < ::ApplicationPolicy
+module Ros
+  module Iam
+    class ApplicationPolicy < ::ApplicationPolicy
+    end
   end
 end

services/iam/app/resources/ros/iam/action_resource.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class ActionResource < Ros::Iam::ApplicationResource
-    # caching
-    attributes :name, :resource, :action_type
+module Ros
+  module Iam
+    class ActionResource < Ros::Iam::ApplicationResource
+      # caching
+      attributes :name, :resource, :action_type
 
-    def action_type
-      @model.type
+      def action_type
+        @model.type
+      end
     end
   end
 end

services/iam/app/resources/ros/iam/application_resource.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class ApplicationResource < ::ApplicationResource
-    abstract
+module Ros
+  module Iam
+    class ApplicationResource < ::ApplicationResource
+      abstract
+    end
   end
 end

services/iam/app/resources/ros/iam/credential_resource.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class CredentialResource < Ros::Iam::ApplicationResource
-    attributes :access_key_id, :owner_type, :owner_id, :secret_access_key
+module Ros
+  module Iam
+    class CredentialResource < Ros::Iam::ApplicationResource
+      attributes :access_key_id, :owner_type, :owner_id, :secret_access_key
 
-    filter :access_key_id
+      filter :access_key_id
 
-    def self.descriptions
-      {
-        access_key_id: 'The access key'
-      }
+      def self.descriptions
+        {
+          access_key_id: 'The access key'
+        }
+      end
     end
   end
 end

services/iam/app/resources/ros/iam/group_resource.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
-module Ros::Iam
-  class GroupResource < Ros::Iam::ApplicationResource
-    attributes :name
-    has_many :users
+module Ros
+  module Iam
+    class GroupResource < Ros::Iam::ApplicationResource
+      attributes :name
+      has_many :users
 
-    filter :name
+      filter :name
+    end
   end
 end