@joystick.js/node-canary 0.0.0-canary.360 → 0.0.0-canary.361

package/dist/app/accounts/login.js

@@ -1 +1 @@
-import i from"bcrypt";import o from"../databases/queries/accounts.js";import c from"./generate_account_session.js";import d from"../api/get_output.js";import n from"../../lib/types.js";const u=(s=null,e=null)=>o("add_session",{user_id:s,session:e}),_=(s=null)=>o("get_existing_session",{user_id:s}),l=(s=null)=>o("delete_old_sessions",{user_id:s}),p=(s=null,e=null)=>i.compareSync(s,e),m=async(s={})=>{const e=await o("user",{email_address:s.email_address||s.emailAddress,username:s.username});if(console.log({user:e}),!e)throw new Error(`A user with the ${s.email_address||s.emailAddress?"email address":"username"} ${s.email_address||s.emailAddress||s.username} could not be found.`);if(!p(s.password,e.password))throw new Error("Incorrect password.");const t=e?._id||e?.user_id;await l(t);let r=await _(t);console.log({user:e,session:r}),r||(r=c(),await u(t,r));const{password:f,sessions:y,...a}=e;return(n.is_function(process.joystick?.app_options?.accounts?.events?.onLogin)||n.is_function(process.joystick?.app_options?.accounts?.events?.on_login))&&(process.joystick?.app_options?.accounts?.events?.onLogin||process.joystick?.app_options?.accounts?.events?.on_login)({...r,user:e}),{...r,user:d({...a},s?.output)}};var A=m;export{A as default};
+import i from"bcrypt";import t from"../databases/queries/accounts.js";import c from"./generate_account_session.js";import d from"../api/get_output.js";import n from"../../lib/types.js";const u=(s=null,e=null)=>t("add_session",{user_id:s,session:e}),_=(s=null)=>t("get_existing_session",{user_id:s}),p=(s=null)=>t("delete_old_sessions",{user_id:s}),l=(s=null,e=null)=>i.compareSync(s,e),m=async(s={})=>{const e=await t("user",{email_address:s.email_address||s.emailAddress,username:s.username});if(!e)throw new Error(`A user with the ${s.email_address||s.emailAddress?"email address":"username"} ${s.email_address||s.emailAddress||s.username} could not be found.`);if(!l(s.password,e.password))throw new Error("Incorrect password.");const o=e?._id||e?.user_id;await p(o);let r=await _(o);r||(r=c(),await u(o,r));const{password:f,sessions:y,...a}=e;return(n.is_function(process.joystick?.app_options?.accounts?.events?.onLogin)||n.is_function(process.joystick?.app_options?.accounts?.events?.on_login))&&(process.joystick?.app_options?.accounts?.events?.onLogin||process.joystick?.app_options?.accounts?.events?.on_login)({...r,user:e}),{...r,user:d({...a},s?.output)}};var x=m;export{x as default};

package/dist/app/databases/queries/mongodb/accounts.js

@@ -1 +1 @@
-import o from"../../../../lib/generate_id.js";const n={add_password_reset_token:(e={})=>process.databases._users?.collection("users").updateOne({emailAddress:e.email_address},{$addToSet:{passwordResetTokens:{token:e.token,requestedAt:new Date().toISOString()}}}),add_role:async(e={})=>!(e?.role?await process.databases._users?.collection("roles").findOne({role:e?.role}):null)&&e?.role?(await process.databases._users?.collection("roles").insertOne({_id:o(16),role:e?.role}),{_id:e?.user_id,action:"add",role:e?.role,ok:!0,error:null}):{action:"add",role:e?.role,ok:!1,error:e?.role?`Role already exists: ${e?.role}.`:"Must pass a name for role to add."},add_session:async(e={})=>{await process.databases._users?.collection("users").updateOne({_id:e.user_id},{$addToSet:{sessions:e.session}})},create_email_verification_token:async(e={})=>{const s=o(16);return await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$addToSet:{verifyEmailTokens:{userId:e?.user_id,token:s}}}),s},create_user:async(e={})=>{const s=o(16);return await process.databases._users?.collection("users").insertOne({_id:s,...e,sessions:[]}),s},delete_old_sessions:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});if(s){const r=s?.sessions?.filter(a=>new Date(a?.token_expires_at).toISOString()>new Date().toISOString());await process.databases._users?.collection("users").updateOne({_id:e.user_id},{$set:{sessions:r}})}},delete_user:async(e={})=>process.databases._users?.collection("users").deleteOne({_id:e?.user_id}),existing_user:async(e={})=>{let s,r;return e?.email_address&&(s=await process.databases._users?.collection("users").findOne({emailAddress:e.email_address})),e?.username&&(r=await process.databases._users?.collection("users").findOne({username:e.username})),s||r?{existing_email_address:s?.emailAddress,existing_username:r?.username}:null},get_existing_session:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return s?.sessions?.length>0?(s?.sessions.sort((a,t)=>a.token_expires_at>t.token_expires_at?-1:1)).shift():null},get_password_reset_token:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return s&&s?.passwordResetTokens&&s?.passwordResetTokens[0]?.token||null},grant_role:async(e={})=>await process.databases._users?.collection("users").findOne({_id:e?.user_id})?(await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$addToSet:{roles:e?.role}}),await process.databases._users?.collection("roles").findOne({role:e?.role})||await process.databases._users?.collection("roles").insertOne({_id:o(16),role:e?.role}),{_id:e?.user_id,action:"grant",role:e?.role,ok:!0,error:null}):{_id:e?.user_id,action:"grant",role:e?.role,ok:!1,error:`User not found with the _id ${e?.user_id}.`},list_roles:async()=>(await process.databases._users?.collection("roles").find().toArray()||[]).map(({role:s})=>s),mark_email_verified_at:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$set:{emailVerified:!0,emailVerifiedAt:new Date().toISOString(),verifyEmailTokens:s?.verifyEmailTokens?.filter(r=>r?.token===e?.token)}}),!0},remove_reset_token:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$set:{passwordResetTokens:s?.passwordResetTokens?.filter(({token:r})=>r!==e?.token)}}),process.databases._users?.collection("users").findOne({_id:e?.user_id})},remove_role:async(e={})=>(e?.role?await process.databases._users?.collection("roles").findOne({role:e?.role}):null)?(await process.databases._users?.collection("users").updateMany({roles:{$in:[e?.role]}},{$pull:{roles:e?.role}}),await process.databases._users?.collection("roles").deleteOne({role:e?.role}),{_id:e?.user_id,action:"remove",role:e?.role,ok:!0,error:null}):{action:"add",role:e?.role,ok:!1,error:`Could not find an existing role with the name ${e?.role}.`},reset_user_sessions:async(e={})=>{await process.databases._users?.collection("users").findOne({_id:e?.user_id})&&await process.databases._users?.collection("users").updateOne({_id:e.user_id},{$set:{sessions:[]}})},revoke_role:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return s&&s.roles?(await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$pull:{roles:e?.role}}),{_id:e?.user_id,action:"revoke",role:e?.role,ok:!0,error:null}):{_id:e?.user_id,action:"revoke",role:e?.role,ok:!1,error:`User not found with the _id ${e?.user_id}.`}},set_new_password:async(e={})=>process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$set:{password:e?.hashed_password}}),user:async(e={})=>e?.email_address?await process.databases._users?.collection("users").findOne({emailAddress:e.email_address}):e?.username?await process.databases._users?.collection("users").findOne({username:e.username}):e?._id?await process.databases._users?.collection("users").findOne({_id:e._id}):null,user_has_role:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return s&&s.roles?s?.roles?.includes(e?.role):!1},user_with_login_token:async(e={})=>await process.databases._users?.collection("users").findOne({"sessions.token":e?.token}),user_with_reset_token:async(e={})=>await process.databases._users?.collection("users").findOne({"passwordResetTokens.token":e["passwordResetTokens.token"]}),user_with_verify_email_token:async(e={})=>await process.databases._users?.collection("users").findOne({"verifyEmailTokens.token":e?.token})};var l=n;export{l as default};
+import a from"../../../../lib/generate_id.js";const n={add_password_reset_token:(e={})=>process.databases._users?.collection("users").updateOne({emailAddress:e.email_address},{$addToSet:{passwordResetTokens:{token:e.token,requestedAt:new Date().toISOString()}}}),add_role:async(e={})=>!(e?.role?await process.databases._users?.collection("roles").findOne({role:e?.role}):null)&&e?.role?(await process.databases._users?.collection("roles").insertOne({_id:a(16),role:e?.role}),{_id:e?.user_id,action:"add",role:e?.role,ok:!0,error:null}):{action:"add",role:e?.role,ok:!1,error:e?.role?`Role already exists: ${e?.role}.`:"Must pass a name for role to add."},add_session:async(e={})=>{await process.databases._users?.collection("users").updateOne({_id:e.user_id},{$addToSet:{sessions:e.session}})},create_email_verification_token:async(e={})=>{const s=a(16);return await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$addToSet:{verifyEmailTokens:{userId:e?.user_id,token:s}}}),s},create_user:async(e={})=>{const s=a(16);return await process.databases._users?.collection("users").insertOne({_id:s,...e,sessions:[]}),s},delete_old_sessions:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});if(s){const r=s?.sessions?.filter(o=>new Date(o?.tokenExpiresAt||o?.token_expires_at).toISOString()>new Date().toISOString());await process.databases._users?.collection("users").updateOne({_id:e.user_id},{$set:{sessions:r}})}},delete_user:async(e={})=>process.databases._users?.collection("users").deleteOne({_id:e?.user_id}),existing_user:async(e={})=>{let s,r;return e?.email_address&&(s=await process.databases._users?.collection("users").findOne({emailAddress:e.email_address})),e?.username&&(r=await process.databases._users?.collection("users").findOne({username:e.username})),s||r?{existing_email_address:s?.emailAddress,existing_username:r?.username}:null},get_existing_session:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return s?.sessions?.length>0?(s?.sessions.sort((o,t)=>(o.tokenExpiresAt||o.token_expires_at)>(t.tokenExpiresAt||t.token_expires_at)?-1:1)).shift():null},get_password_reset_token:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return s&&s?.passwordResetTokens&&s?.passwordResetTokens[0]?.token||null},grant_role:async(e={})=>await process.databases._users?.collection("users").findOne({_id:e?.user_id})?(await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$addToSet:{roles:e?.role}}),await process.databases._users?.collection("roles").findOne({role:e?.role})||await process.databases._users?.collection("roles").insertOne({_id:a(16),role:e?.role}),{_id:e?.user_id,action:"grant",role:e?.role,ok:!0,error:null}):{_id:e?.user_id,action:"grant",role:e?.role,ok:!1,error:`User not found with the _id ${e?.user_id}.`},list_roles:async()=>(await process.databases._users?.collection("roles").find().toArray()||[]).map(({role:s})=>s),mark_email_verified_at:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$set:{emailVerified:!0,emailVerifiedAt:new Date().toISOString(),verifyEmailTokens:s?.verifyEmailTokens?.filter(r=>r?.token===e?.token)}}),!0},remove_reset_token:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$set:{passwordResetTokens:s?.passwordResetTokens?.filter(({token:r})=>r!==e?.token)}}),process.databases._users?.collection("users").findOne({_id:e?.user_id})},remove_role:async(e={})=>(e?.role?await process.databases._users?.collection("roles").findOne({role:e?.role}):null)?(await process.databases._users?.collection("users").updateMany({roles:{$in:[e?.role]}},{$pull:{roles:e?.role}}),await process.databases._users?.collection("roles").deleteOne({role:e?.role}),{_id:e?.user_id,action:"remove",role:e?.role,ok:!0,error:null}):{action:"add",role:e?.role,ok:!1,error:`Could not find an existing role with the name ${e?.role}.`},reset_user_sessions:async(e={})=>{await process.databases._users?.collection("users").findOne({_id:e?.user_id})&&await process.databases._users?.collection("users").updateOne({_id:e.user_id},{$set:{sessions:[]}})},revoke_role:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return s&&s.roles?(await process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$pull:{roles:e?.role}}),{_id:e?.user_id,action:"revoke",role:e?.role,ok:!0,error:null}):{_id:e?.user_id,action:"revoke",role:e?.role,ok:!1,error:`User not found with the _id ${e?.user_id}.`}},set_new_password:async(e={})=>process.databases._users?.collection("users").updateOne({_id:e?.user_id},{$set:{password:e?.hashed_password}}),user:async(e={})=>e?.email_address?await process.databases._users?.collection("users").findOne({emailAddress:e.email_address}):e?.username?await process.databases._users?.collection("users").findOne({username:e.username}):e?._id?await process.databases._users?.collection("users").findOne({_id:e._id}):null,user_has_role:async(e={})=>{const s=await process.databases._users?.collection("users").findOne({_id:e?.user_id});return s&&s.roles?s?.roles?.includes(e?.role):!1},user_with_login_token:async(e={})=>await process.databases._users?.collection("users").findOne({"sessions.token":e?.token}),user_with_reset_token:async(e={})=>await process.databases._users?.collection("users").findOne({"passwordResetTokens.token":e["passwordResetTokens.token"]}),user_with_verify_email_token:async(e={})=>await process.databases._users?.collection("users").findOne({"verifyEmailTokens.token":e?.token})};var l=n;export{l as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@joystick.js/node-canary",
   "type": "module",
-  "version": "0.0.0-canary.360",
+  "version": "0.0.0-canary.361",
   "description": "The Node.js framework for Joystick.",
   "main": "./dist/index.js",
   "scripts": {

package/src/app/accounts/login.js

@@ -28,10 +28,6 @@ const login = async (login_options = {}) => {
     username: login_options.username,
   });
 
-  console.log({
-    user,
-  })
-
   if (!user) {
     throw new Error(
       `A user with the ${
@@ -55,11 +51,6 @@ const login = async (login_options = {}) => {
 
   let session = await get_existing_session(user_id);
 
-  console.log({
-    user,
-    session,
-  })
-
   if (!session) {
     session = generate_account_session();
     await add_session_to_user(user_id, session);

package/src/app/databases/queries/mongodb/accounts.js

@@ -85,7 +85,7 @@ const accounts = {
     if (user) {
       const sessions = user?.sessions?.filter((session) => {
         // NOTE: If tokenExpiresAt is after today, it hasn't expired yet, so keep it.
-        return new Date(session?.token_expires_at).toISOString() > new Date().toISOString();
+        return new Date(session?.tokenExpiresAt || session?.token_expires_at).toISOString() > new Date().toISOString();
       });
 
       await process.databases._users?.collection("users").updateOne({
@@ -124,7 +124,7 @@ const accounts = {
 
     if (user?.sessions?.length > 0) {
       const sessions_by_last_to_expire = user?.sessions.sort((a, b) => {
-        return a.token_expires_at > b.token_expires_at ? -1 : 1;
+        return (a.tokenExpiresAt || a.token_expires_at) > (b.tokenExpiresAt || b.token_expires_at) ? -1 : 1;
       });
 
       return sessions_by_last_to_expire.shift();