From a83e84a4412155edeccfb42e01beb4d13e00d61e Mon Sep 17 00:00:00 2001 From: Mr Swift Date: Sun, 27 Oct 2024 17:21:04 +0330 Subject: [PATCH] Debug: change auth and fix a few small mistakes --- server/controllers/GPS.InstalledDevice.js | 2 +- server/controllers/GPS.Renewal.js | 19 +++++++------------ server/database.js | 4 ++-- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/server/controllers/GPS.InstalledDevice.js b/server/controllers/GPS.InstalledDevice.js index 473d21e..83191e8 100644 --- a/server/controllers/GPS.InstalledDevice.js +++ b/server/controllers/GPS.InstalledDevice.js @@ -17,7 +17,7 @@ module.exports.deviceRegistration = [ if (!device) { throw res.status(404).json({ msg: 'این IMEI وجود ندارد' }) // eslint-disable-next-line eqeqeq - } else if (device.status == 1) { + } else if (device.status == 1 || device.status == 0) { throw res.status(404).json({ msg: 'این IMEI قبلا ثبت شده' }) } else { diff --git a/server/controllers/GPS.Renewal.js b/server/controllers/GPS.Renewal.js index e7d8fe0..5886732 100644 --- a/server/controllers/GPS.Renewal.js +++ b/server/controllers/GPS.Renewal.js @@ -6,8 +6,6 @@ const User = require('../models/GPS.User'); const Score = require('../models/GPS.Score'); const InstalledDevice = require('../models/GPS.InstalledDevice'); -const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI2NzBmY2NhNmFmOWE3ODMzNDgxZWIzODkiLCJpYXQiOjE3MzAwMjk4ODUsImV4cCI6MTczMDYzNDY4NX0.2qGgmlcllXr240rJ56ID9P01Kib-74enlEUY4Ifi-f2" - module.exports.create = [ [ @@ -21,12 +19,11 @@ module.exports.create = [ async (req, res) => { try { // eslint-disable-next-line eqeqeq - if(token == req.headers["apic-token-secret"]){ const { IMEI, renewDate, renewType, price } = req.body const device = await InstalledDevice.findOne({IMEI}).populate('deviceId') if(!device){ - req.status(200) - throw new Error(_sr.fa.response.success_save) + res.status(200) + throw new Error(_sr.fa.response.success_save+1) } // eslint-disable-next-line eqeqeq if(device.status == 1 ){ @@ -51,17 +48,15 @@ module.exports.create = [ user.walletBalance += data.profit user.score += device.deviceId.score user.save() + res.status(201).json({msg:_sr.fa.response.success_save}) }else{ - req.status(200) - throw new Error(_sr.fa.response.success_save) + res.status(200) + throw new Error(_sr.fa.response.success_save+2) } - }else{ - req.status(401) - throw new Error('unauthenticated') - } + } catch (error) { - req.json({msg:error.message}) + res.json({msg:error.message}) } } diff --git a/server/database.js b/server/database.js index 0c3d53e..d6351c0 100644 --- a/server/database.js +++ b/server/database.js @@ -1,9 +1,9 @@ /* eslint-disable no-unused-vars */ const mongoose = require('mongoose') // mongodb database connection string. change it as per your needs. here "mydb" is the name of the database. You don't need to create DB from mongodb terminal. mongoose create the database automatically. -const inHostUrl = 'mongodb://root:9a82d91402ee06cb@danak-db-public.danakcorp.com:52694/asanserv_database?authSource=admin' +const outHostUrl = 'mongodb://root:9a82d91402ee06cb@danak-db-public.danakcorp.com:52694/asanserv_database?authSource=admin' // const outHostUrl = 'mongodb://root:KPTt76tImNBBMm4Kor8QA9gB@hotaka.liara.cloud:33794/asanserv_database?authSource=admin' -const outHostUrl = 'mongodb://root:9a82d91402ee06cb@srv-captain--asan-service-db:27017/asanserv_database?authSource=admin' +const inHostUrl = 'mongodb://root:9a82d91402ee06cb@srv-captain--asan-service-db:27017/asanserv_database?authSource=admin' const init = ()=>{ try { mongoose.connect(outHostUrl, {