@live-change/phone-service 0.8.88 → 0.8.90

package/auth.js

@@ -2,18 +2,20 @@ import App from '@live-change/framework'
 const validation = App.validation
 import definition from './definition.js'
 
+const preFilter = phone => {
+  // replace leading + with 0
+  phone = phone.replace(/^\+/, '0')
+  phone = phone.replace(/[^0-9]/g, '')
+  return phone
+}
+
 const User = definition.foreignModel('user', 'User')
 const Phone = definition.model({
   name: 'Phone',
   properties: {
     phone: {
       type: String,
-      preFilter: phone => {
-        // replace leading + with 0
-        phone = phone.replace(/^\+/, '0')
-        phone = phone.replace(/[^0-9]/g, '')
-        return phone
-      },
+      preFilter,
       validation: ['nonEmpty', 'phone']
     }
   },
@@ -72,6 +74,7 @@ definition.event({
     }
   },
   async execute({ user, phone }) {
+    phone = preFilter(phone)
     await Phone.delete(phone)
   }
 })
@@ -99,8 +102,9 @@ definition.trigger({
     }
   },
   async execute({ phone }, context, emit) {
+    phone = preFilter(phone)
     const phoneData = await Phone.get(phone)
-    if(phoneData) throw { properties: { phone: 'taken' } }
+    if(phoneData) throw { properties: { phone: 'phoneTaken' } }
     return true
   }
 })
@@ -114,6 +118,7 @@ definition.trigger({
     }
   },
   async execute({ phone }, context, emit) {
+    phone = preFilter(phone)
     const phoneData = await Phone.get(phone)
     if(!phoneData) throw { properties: { phone: 'notFound' } }
     return phoneData
@@ -129,6 +134,7 @@ definition.trigger({
     }
   },
   async execute({ phone }, context, emit) {
+    phone = preFilter(phone)
     const phoneData = await Phone.get(phone)
     return phoneData
   }
@@ -148,8 +154,9 @@ definition.trigger({
   },
   async execute({ user, phone }, { service }, emit) {
     if(!phone) throw new Error("no phone")
+    phone = preFilter(phone)
     const phoneData = await Phone.get(phone)
-    if(phoneData) throw { properties: { phone: 'taken' } }
+    if(phoneData) throw { properties: { phone: 'phoneTaken' } }
     await service.trigger({ type: 'contactConnected' }, {
       contactType: 'phone_Phone',
       contact: phone,
@@ -176,6 +183,7 @@ definition.trigger({
     }
   },
   async execute({ user, phone }, { client, service }, emit) {
+    phone = preFilter(phone)
     const phoneData = await Phone.get(phone)
     if(!phoneData) throw { properties: { phone: 'notFound' } }
     if(phoneData.user !== user) throw { properties: { phone: 'notFound' } }
@@ -196,6 +204,7 @@ definition.trigger({
   },
   waitForEvents: true,
   async execute({ phone, session }, { client, service }, emit) {
+    phone = preFilter(phone)
     const phoneData = await Phone.get(phone)
     if(!phoneData) throw { properties: { phone: 'notFound' } }
     const { user } = phoneData

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/phone-service",
-  "version": "0.8.88",
+  "version": "0.8.90",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,12 +22,12 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.88",
-    "@live-change/relations-plugin": "^0.8.88",
+    "@live-change/framework": "^0.8.90",
+    "@live-change/relations-plugin": "^0.8.90",
     "got": "^11.8.3",
     "html-to-text": "8.1.0",
     "jsdom": "^24.1.0",
     "smsapi": "2.0.9"
   },
-  "gitHead": "f80b7c8bf00dc6cc41124fa402edebc7b596e83c"
+  "gitHead": "745223326ab078f2155434fe684611fc1398df9d"
 }