From 2bae8bd861d6317087e8185a5cfb3e9d98ec6151 Mon Sep 17 00:00:00 2001
From: xbgmsharp <xbgmsharp@gmail.com>
Date: Mon, 6 Feb 2023 21:37:19 +0100
Subject: [PATCH] Fix and Update parameters check for auth functions

---
 initdb/02_4_signalk_auth.sql | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/initdb/02_4_signalk_auth.sql b/initdb/02_4_signalk_auth.sql
index 797c6db..13e8468 100644
--- a/initdb/02_4_signalk_auth.sql
+++ b/initdb/02_4_signalk_auth.sql
@@ -151,6 +151,7 @@ begin
   return (
   select role from auth.accounts
    where accounts.email = user_role.email
+     and user_role.pass is NOT NULL
      and accounts.pass = crypt(user_role.pass, accounts.pass)
   );
 end;
@@ -203,8 +204,8 @@ api.signup(in email text, in pass text, in firstname text, in lastname text) ret
 declare
   _role name;
 begin
-  IF email IS NULL AND email = ''
-	 AND pass IS NULL AND pass = '' THEN
+  IF email IS NULL OR email = ''
+	 OR pass IS NULL OR pass = '' THEN
     RAISE EXCEPTION 'Invalid input'
         USING HINT = 'Check your parameter';
   END IF;
@@ -231,23 +232,26 @@ declare
   vessel_rec record;
   _vessel_id text;
 begin
-  IF vessel_email IS NULL AND vessel_email = ''
-	AND vessel_name IS NULL AND vessel_name = '' THEN
+  IF vessel_email IS NULL OR vessel_email = ''
+	  OR vessel_name IS NULL OR vessel_name = '' THEN
     RAISE EXCEPTION 'Invalid input'
         USING HINT = 'Check your parameter';
   END IF;
+  IF public.isnumeric(vessel_mmsi) IS False THEN
+    vessel_mmsi = NULL;
+  END IF;
   -- check vessel exist
   SELECT * INTO vessel_rec
     FROM auth.vessels vessel
     WHERE vessel.owner_email = vessel_email;
-  if vessel_rec is null then
+  IF vessel_rec IS NULL THEN
       RAISE WARNING 'Register new vessel name:[%] mmsi:[%] for [%]', vessel_name, vessel_mmsi, vessel_email;
       INSERT INTO auth.vessels (owner_email, mmsi, name, role)
 	      VALUES (vessel_email, vessel_mmsi::NUMERIC, vessel_name, 'vessel_role') RETURNING vessel_id INTO _vessel_id;
     vessel_rec.role := 'vessel_role';
     vessel_rec.owner_email = vessel_email;
     vessel_rec.vessel_id = _vessel_id;
-  end if;
+  END IF;
 
   -- Get app_jwt_secret
   SELECT value INTO app_jwt_secret