fd7cf3e35e
Security - Express console had no tenant scoping at all: LoginAdmin hardcoded tenantid 0 into every JWT and none of the 85 admin handlers filtered by tenant, so any client given a console login would read every other client's bookings, customers, pricing and reports. Adds DoormileAuth.Tenantid (nil = Doormile staff, unrestricted; set = client, scoped), emits it in the token, and scopes reads, guards writes and pins tenantid on create. - Miler telemetry (/miler/logs, /miler/status, /miler/consignments/logs) took userid from the request body, letting any authenticated rider write another rider's status and GPS trail — data the dispatch layer reasons over. Identity now comes from the token. - POST /miler/reset-pin was unauthenticated and overwrote a PIN given only a phone number, so reset-pin + verify-pin took over any rider account. Now requires admin/manager/executive auth. Correctness - Date ranges compared the container's UTC clock against timestamps the DB writes as IST wall-clock (DSN sets TimeZone=Asia/Kolkata), so "today so far" ended 5h30m in the past and silently dropped everything created after noon IST from every report. Sets TZ in the image and adds utils.DBNow/DBToday, which stay correct regardless of container timezone. - CreateMiler never set Configid, so console-created riders got the column default of 1 while LoginMiler looks up configid 1001 — every such rider was unable to log in, reported as "no miler account found". - Delivery wrote no consignment history row, so a tracking timeline never showed the parcel arriving. Features - Delivery OTP is now real (crypto/rand, issued to the receiver, verified and cleared on delivery) but opt-in per client via Tenant.Requiredeliveryotp, defaulting off — friction worth it for a courier parcel, not a food order. - Express bookings accept pickuplocationid, so the console can name a client site (a DailyGrubs kitchen) instead of retyping its address; validated against the tenant and carried through to the consignment. - TenantLocation.Locationname, miler tenantid/hubid, Nagercoil (629) opened. - PUT /miler/availability accepts both "status" and "availabilitystatus", and /miler/location no longer drops speed/heading — both were contract mismatches against the doc the Flutter dev was given. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
69 lines
2.9 KiB
Go
69 lines
2.9 KiB
Go
package models
|
|
|
|
import "time"
|
|
|
|
// Tenant represents the pre-existing 'tenants' table
|
|
type Tenant struct {
|
|
Tenantid int `json:"tenantid" gorm:"primaryKey;column:tenantid"`
|
|
Tenantname string `json:"tenantname" gorm:"column:tenantname"`
|
|
Primaryemail string `json:"primaryemail" gorm:"column:primaryemail"`
|
|
Primarycontact string `json:"primarycontact" gorm:"column:primarycontact"`
|
|
Status string `json:"status" gorm:"column:status;default:Active"`
|
|
// Requiredeliveryotp decides whether the receiver must read a code back to
|
|
// the rider. Worth the friction for a courier handing over a valuable
|
|
// parcel; not for a food order, where it just slows every drop down.
|
|
// Defaults off: turning it on platform-wide would block deliveries for
|
|
// clients whose customer app has no way to show the code yet.
|
|
Requiredeliveryotp bool `json:"requiredeliveryotp" gorm:"column:requiredeliveryotp;default:false"`
|
|
Createdat time.Time `json:"createdat" gorm:"column:createdat;default:CURRENT_TIMESTAMP"`
|
|
Updatedat time.Time `json:"updatedat" gorm:"column:updatedat;default:CURRENT_TIMESTAMP"`
|
|
}
|
|
|
|
func (Tenant) TableName() string {
|
|
return "tenants"
|
|
}
|
|
|
|
// Customer represents the pre-existing 'customers' table
|
|
type Customer struct {
|
|
Customerid int `json:"customerid" gorm:"primaryKey;column:customerid"`
|
|
Firstname string `json:"firstname" gorm:"column:firstname"`
|
|
Lastname string `json:"lastname" gorm:"column:lastname"`
|
|
Contactno string `json:"contactno" gorm:"column:contactno"`
|
|
Email string `json:"email" gorm:"column:email"`
|
|
Status int `json:"status" gorm:"column:status"`
|
|
Createdat time.Time `json:"createdat" gorm:"column:createdat"`
|
|
Updatedat time.Time `json:"updatedat" gorm:"column:updatedat"`
|
|
}
|
|
|
|
func (Customer) TableName() string {
|
|
return "customers"
|
|
}
|
|
|
|
// CustomerLocation represents the pre-existing 'customerlocations' table
|
|
type CustomerLocation struct {
|
|
Locationid int `json:"locationid" gorm:"primaryKey;column:locationid"`
|
|
Customerid int `json:"customerid" gorm:"column:customerid"`
|
|
Address string `json:"address" gorm:"column:address"`
|
|
City string `json:"city" gorm:"column:city"`
|
|
State string `json:"state" gorm:"column:state"`
|
|
Postcode string `json:"postcode" gorm:"column:postcode"`
|
|
Latitude string `json:"latitude" gorm:"column:latitude"`
|
|
Longitude string `json:"longitude" gorm:"column:longitude"`
|
|
Status int `json:"status" gorm:"column:status"`
|
|
}
|
|
|
|
func (CustomerLocation) TableName() string {
|
|
return "customerlocations"
|
|
}
|
|
|
|
// AppLocation represents the pre-existing 'applocations' table
|
|
type AppLocation struct {
|
|
Applocationid int `json:"applocationid" gorm:"primaryKey;column:applocationid"`
|
|
Applocationname string `json:"applocationname" gorm:"column:applocationname"`
|
|
Status string `json:"status" gorm:"column:status"`
|
|
}
|
|
|
|
func (AppLocation) TableName() string {
|
|
return "applocations"
|
|
}
|