snf_core 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b4999331d8f73d14e49edaa89395e04937ee3a2891d7270ece2aae9f6bb696c
-  data.tar.gz: b82f422af01f29febd6cd7560a4c18f85b32707074c663ec51db92090969a5b5
+  metadata.gz: e5c3846a61247a975565c121fb8a4f40fc5df57bd7c194aa6cc057fc065147c2
+  data.tar.gz: 62b4e90257c49fe1b9bfdc8483cbe8222745b81d2da6fb9e25df3e0859db782b
 SHA512:
-  metadata.gz: f30201d8ebe23d009b4e20c395343a0f5c4c01de791d8172d618fe9b56bab355a5e8a19e4804f34ffca9693683ca2018c75d144f150430be66b5dd9ace9f6184
-  data.tar.gz: 2db335013cff279cfa40e2243b56a63082ca735aab71b369a6a030db9e8afbb6a49a693605457ffa5825b3380dd9d044141f695296256d6107c4ec9a23ed29e0
+  metadata.gz: 4d10278f0afecf87dc071c2398d1233823882a4d3d1352751367b851ae2bcd3b505227c97779b58aafb856eb7a4ac17918f6e292e3223276751289c1dac949c9
+  data.tar.gz: 0fec193cecf15421b0731383602c24b550839dd20ca2a94d5b15b2d44641dba4d7118f588ec24be00c64d8540b5bece0aaba921b17885d74be0b4c3434e29472

data/app/controllers/snf_core/application_controller.rb

@@ -9,7 +9,7 @@ module SnfCore
     def is_allowed
       user_role = UserRole.find_by(user: current_user)
       role = Role.find(user_role.role_id)
-      render json: { error: "Not authorized" }, status: :ok unless role.name == "registrar" || role.name == "dean"
+      render json: { error: "Not authorized" }, status: :ok unless role.name == "User" || role.name == "Admin"
     end
 
     def current_user

data/app/controllers/snf_core/auth_controller.rb

@@ -2,6 +2,30 @@ module SnfCore
   class AuthController < ApplicationController
     before_action :token_service
 
+    def validate_token
+      token = params[:token]
+      return render json: { valid: false }, status: :unauthorized unless token
+
+      begin
+        payload = @token_service.decode(token)
+        user = User.find_by(id: payload["user"]["id"])
+
+        if user
+          user_role = UserRole.find_by(user: user)
+          role = Role.find(user_role.role_id)
+          render json: {
+            valid: true,
+            user: user.as_json(except: [ :password_digest ]),
+            role: role.name
+          }
+        else
+          render json: { valid: false }, status: :unauthorized
+        end
+      rescue JWT::DecodeError => e
+        render json: { valid: false, error: "Invalid token" }, status: :unauthorized
+      end
+    end
+
     def signup
       ActiveRecord::Base.transaction do
         @address = Address.new(address_params)
@@ -11,6 +35,10 @@ module SnfCore
           @user.address = @address
 
           if @user.save
+            # Assign default user role
+            user_role = Role.find_by(name: "User")
+            UserRole.create!(user: @user, role: user_role)
+
             @business = Business.new(
               user: @user,
               business_name: signup_params[:business_name],
@@ -45,14 +73,13 @@ module SnfCore
     def login
       user = User.find_by(phone_number: auth_params[:phone_number])
       return render json: { success: false, error: "User doesn't exist" }, status: :unauthorized unless user
-      return render json: { success: false, warn: true, error: "Password has not been reset please reset your password to continue!" }, status: :unauthorized unless user.password_changed
       return render json: { success: false, error: "Invalid email or password" }, status: :unauthorized unless user.authenticate(auth_params[:password])
       user_role = UserRole.find_by(user: user)
       return render json: { success: false, error: "No role was assigned to your user" }, status: :unauthorized unless user_role
 
       role = Role.find(user_role.role_id)
       token = @token_service.encode({ user: user.as_json.except("password_digest", "created_at", "updated_at"), role: role.name })
-      render json: { success: true, token: token }
+      render json: { success: true, token: token, user: user.as_json(except: [ :password_digest ]), role: role.name }
     end
 
     private

data/app/services/snf_core/token_service.rb

@@ -9,8 +9,8 @@ module SnfCore
     def decode(token)
       body = JWT.decode(token, ENV["SECRET_KEY_BASE"] || "secret_key_base")[0]
       HashWithIndifferentAccess.new body
-    rescue
-      raise StandardError.new("Invalid token")
+    rescue JWT::DecodeError, JSON::ParserError => e
+      raise JWT::DecodeError.new("Invalid token")
     end
   end
 end

data/config/routes.rb

@@ -1,4 +1,6 @@
 SnfCore::Engine.routes.draw do
+  mount SnfCore::Engine => "/snf_core"
   post "auth/login"
   post "auth/signup"
+  post "auth/validate_token"
 end

data/db/seeds.rb

@@ -0,0 +1,4 @@
+# Create default roles if they don't exist
+[ 'User', 'Admin', 'SystemAdmin' ].each do |role_name|
+  SnfCore::Role.find_or_create_by!(name: role_name)
+end

data/lib/snf_core/version.rb

@@ -1,3 +1,3 @@
 module SnfCore
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

data/spec/dummy/log/development.log

@@ -8919,3 +8919,4 @@ FOREIGN KEY ("user_id")
   ActiveRecord::InternalMetadata Update (0.8ms)  UPDATE "ar_internal_metadata" SET "value" = 'test', "updated_at" = '2025-03-12 19:56:14.866070' WHERE "ar_internal_metadata"."key" = 'environment' /*application='Dummy'*/
   ActiveRecord::InternalMetadata Load (0.4ms)  SELECT * FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = 'schema_sha1' ORDER BY "ar_internal_metadata"."key" ASC LIMIT 1 /*application='Dummy'*/
   ActiveRecord::InternalMetadata Create (0.5ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ('schema_sha1', 'e5ce873c596e29727a72a2140a63fcb330b84481', '2025-03-12 19:56:14.870566', '2025-03-12 19:56:14.870570') RETURNING "key" /*application='Dummy'*/
+  ActiveRecord::SchemaMigration Load (4.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC /*application='Dummy'*/