@skalfa/skalfa-api-core 1.0.29 → 1.0.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/auth/create-user-mail-token.js +2 -2
  2. package/dist/auth/create-user-mail-token.js.map +1 -1
  3. package/dist/auth/verify-user-mail-token.js +1 -5
  4. package/dist/auth/verify-user-mail-token.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/auth/create-user-mail-token.ts +3 -3
  7. package/src/auth/verify-user-mail-token.ts +1 -6
package/dist/auth/create-user-mail-token.js CHANGED
@@ -4,13 +4,13 @@ export async function createUserMailToken(userId) {
4
4
  const token = Math.floor(100000 + Math.random() * 900000).toString();
5
5
  const hash = crypto.createHash('sha256').update(token).digest('hex');
6
6
  const trx = await db.transaction();
7
+ await trx.table('user_mail_tokens').where('user_id', userId).whereNull("used_at").delete();
7
8
  await trx.table('user_mail_tokens').insert({
8
9
  user_id: userId,
9
10
  token: hash,
10
11
  created_at: new Date(),
11
12
  });
12
- const record = await trx.table('user_mail_tokens').orderBy('id', 'desc').first();
13
- await trx.commit();
13
+ const record = await trx.table('user_mail_tokens').where('user_id', userId).orderBy('id', 'desc').first();
14
14
  return {
15
15
  token: token,
16
16
  tokenId: record.id
package/dist/auth/create-user-mail-token.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"create-user-mail-token.js","sourceRoot":"","sources":["../../src/auth/create-user-mail-token.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAEvC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAAc;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAA;IAEpE,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACpE,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,WAAW,EAAE,CAAA;IAElC,MAAM,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC;QACzC,OAAO,EAAO,MAAM;QACpB,KAAK,EAAS,IAAI;QAClB,UAAU,EAAI,IAAI,IAAI,EAAE;KACzB,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,CAAA;IAEhF,MAAM,GAAG,CAAC,MAAM,EAAE,CAAA;IAElB,OAAO;QACL,KAAK,EAAM,KAAK;QAChB,OAAO,EAAI,MAAM,CAAC,EAAE;KACrB,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"create-user-mail-token.js","sourceRoot":"","sources":["../../src/auth/create-user-mail-token.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAEvC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAAc;IACtD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAA;IAEpE,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACpE,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,WAAW,EAAE,CAAA;IAElC,MAAM,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAA;IAE1F,MAAM,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC;QACzC,OAAO,EAAO,MAAM;QACpB,KAAK,EAAS,IAAI;QAClB,UAAU,EAAI,IAAI,IAAI,EAAE;KACzB,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,CAAA;IAEzG,OAAO;QACL,KAAK,EAAM,KAAK;QAChB,OAAO,EAAI,MAAM,CAAC,EAAE;KACrB,CAAA;AACH,CAAC"}
package/dist/auth/verify-user-mail-token.js CHANGED
@@ -2,11 +2,7 @@ import crypto from 'crypto';
2
2
  import { db } from '@skalfa/skalfa-orm';
3
3
  export async function verifyUserMailToken(userId, token) {
4
4
  const hashedToken = crypto.createHash("sha256").update(token).digest("hex");
5
- const record = await db.table("user_mail_tokens")
6
- .where("user_id", userId)
7
- .whereNull("used_at")
8
- .orderBy("id", "desc")
9
- .first();
5
+ const record = await db.table("user_mail_tokens").where("user_id", userId).whereNull("used_at").orderBy("id", "desc").first();
10
6
  if (!record)
11
7
  return false;
12
8
  if (record.token !== hashedToken)
package/dist/auth/verify-user-mail-token.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"verify-user-mail-token.js","sourceRoot":"","sources":["../../src/auth/verify-user-mail-token.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAEvC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAAc,EAAE,KAAa;IACrE,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE5E,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC;SAC9C,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC;SACxB,SAAS,CAAC,SAAS,CAAC;SACpB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,KAAK,EAAE,CAAC;IAEX,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAEzB,IAAI,MAAM,CAAC,KAAK,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAE/C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,WAAW,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IAExE,IAAI,WAAW,GAAG,EAAE;QAAE,OAAO,KAAK,CAAC;IAEnC,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"verify-user-mail-token.js","sourceRoot":"","sources":["../../src/auth/verify-user-mail-token.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAEvC,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,MAAc,EAAE,KAAa;IACrE,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE5E,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;IAC9H,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAA;IAEzB,IAAI,MAAM,CAAC,KAAK,KAAK,WAAW;QAAE,OAAO,KAAK,CAAC;IAE/C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,WAAW,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IAExE,IAAI,WAAW,GAAG,EAAE;QAAE,OAAO,KAAK,CAAC;IAEnC,OAAO,IAAI,CAAC;AACd,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skalfa/skalfa-api-core",
3
- "version": "1.0.29",
3
+ "version": "1.0.30",
4
4
  "description": "Core and Foundational utilities for the Skalfa API Framework.",
5
5
  "keywords": [
6
6
  "skalfa",
package/src/auth/create-user-mail-token.ts CHANGED
@@ -7,15 +7,15 @@ export async function createUserMailToken(userId: number) {
7
7
  const hash = crypto.createHash('sha256').update(token).digest('hex')
8
8
  const trx = await db.transaction()
9
9
 
10
+ await trx.table('user_mail_tokens').where('user_id', userId).whereNull("used_at").delete()
11
+
10
12
  await trx.table('user_mail_tokens').insert({
11
13
  user_id : userId,
12
14
  token : hash,
13
15
  created_at : new Date(),
14
16
  })
15
17
 
16
- const record = await trx.table('user_mail_tokens').orderBy('id', 'desc').first()
17
-
18
- await trx.commit()
18
+ const record = await trx.table('user_mail_tokens').where('user_id', userId).orderBy('id', 'desc').first()
19
19
 
20
20
  return {
21
21
  token : token,
package/src/auth/verify-user-mail-token.ts CHANGED
@@ -4,12 +4,7 @@ import { db } from '@skalfa/skalfa-orm'
4
4
  export async function verifyUserMailToken(userId: number, token: string) {
5
5
  const hashedToken = crypto.createHash("sha256").update(token).digest("hex");
6
6
 
7
- const record = await db.table("user_mail_tokens")
8
- .where("user_id", userId)
9
- .whereNull("used_at")
10
- .orderBy("id", "desc")
11
- .first();
12
-
7
+ const record = await db.table("user_mail_tokens").where("user_id", userId).whereNull("used_at").orderBy("id", "desc").first();
13
8
  if (!record) return false
14
9
 
15
10
  if (record.token !== hashedToken) return false;