Merge branch 'development' of https://git.poyner.page/david/sms-portal into develop

backend/routes/bnums.js

@@ -24,12 +24,16 @@ router.post("/addlocal", async (req, res) => {
     if (creds.length === 0) {
       return res.status(400).json({
         success: false,
-        message: "there's no client id or secret configured for this user",
+        message: "no secrets have been configured yet!",
       });
     }
 
+    const validatedNum = {
+      number: value.number,
+    };
+
     if (findExisting.length === 0) {
-      const addBnums = new Bnums(num);
+      const addBnums = new Bnums(validatedNum);
       addBnums.userId = creds[0].userId;
       await addBnums.save();
     } else {
@@ -70,6 +74,13 @@ router.get("/getlocal", async (req, res) => {
       userId: thetoken._id,
     });
 
+    if (creds.length === 0) {
+      return res.status(400).json({
+        success: false,
+        message: "no secrets have been configured yet!",
+      });
+    }
+
     const getNumbers = await Bnums.find({ userId: thetoken._id });
 
     if (getNumbers.length === 0) {
@@ -78,10 +89,6 @@ router.get("/getlocal", async (req, res) => {
         message: "no numbers exist in the db for this user!",
       });
     }
-    //   throw {
-    //     message: "no numbers exist in the db for this user!",
-    //   };
-    // }
 
     res.status(200).json({ success: true, message: getNumbers });
   } catch (err) {
@@ -96,6 +103,13 @@ router.get("/getremote", async (req, res) => {
       userId: thetoken._id,
     });
 
+    if (creds.length === 0) {
+      return res.status(400).json({
+        success: false,
+        message: "no secrets have been configured yet!",
+      });
+    }
+
     msger.CONFIG.setConfig(authConfig(creds));
     const bnum = msger.BNUM.getInstance();
     const getBnums = await bnum.get();
@@ -112,8 +126,6 @@ router.get("/getremote", async (req, res) => {
       });
     }
 
-    console.log(getBnums);
-
     if (getBnums && getBnums.message) {
       const checkFail = getBnums.message.includes("fail");
       if (checkFail)
@@ -136,6 +148,13 @@ router.get("/register", async (req, res) => {
       userId: thetoken._id,
     });
 
+    if (creds.length === 0) {
+      return res.status(400).json({
+        success: false,
+        message: "no secrets have been configured yet!",
+      });
+    }
+
     msger.CONFIG.setConfig(authConfig(creds));
     const findBnums = await Bnums.find({ userId: thetoken._id });
 
@@ -157,7 +176,7 @@ router.get("/register", async (req, res) => {
     if (registeredBnums && registeredBnums.message) {
       const checkFail = registeredBnums.message.includes("fail");
       if (checkFail) {
-        throw { message: "Request failed!" };
+        throw { message: registeredBnums.message };
       }
     }
 

backend/routes/sms.js

@@ -18,6 +18,14 @@ router.post("/send", async (req, res) => {
     const creds = await MsgAuth.find({
       userId: thetoken._id,
     });
+
+    if (creds.length === 0) {
+      return res.status(400).json({
+        success: false,
+        message: "no secrets have been configured yet!",
+      });
+    }
+
     msger.CONFIG.setConfig(authConfig(creds));
 
     const smsData = req.body;

backend/routes/subscription.js

@@ -26,6 +26,14 @@ router.get("/getremote", async (req, res) => {
     const creds = await MsgAuth.find({
       userId: thetoken._id,
     });
+
+    if (creds.length === 0) {
+      return res.status(400).json({
+        success: false,
+        message: "no secrets have been configured yet!",
+      });
+    }
+
     msger.CONFIG.setConfig(authConfig(creds));
     const sub = msger.Subscription.getInstance();
     const getSub = await sub.get({});
@@ -38,7 +46,7 @@ router.get("/getremote", async (req, res) => {
     if (getSub && getSub.message) {
       const checkFail = getSub.message.includes("fail");
       if (checkFail) {
-        throw { message: "Request failed! Check API secrets." };
+        throw { message: getSub.message };
       }
     }
 
@@ -64,6 +72,14 @@ router.get("/new", async (req, res) => {
     const creds = await MsgAuth.find({
       userId: thetoken._id,
     });
+
+    if (creds.length === 0) {
+      return res.status(400).json({
+        success: false,
+        message: "no secrets have been configured yet!",
+      });
+    }
+
     msger.CONFIG.setConfig(authConfig(creds));
     const sub = msger.Subscription.getInstance();
     const createSub = await sub.create({});
@@ -72,7 +88,7 @@ router.get("/new", async (req, res) => {
     if (createSub && createSub.message) {
       const checkFail = createSub.message.includes("fail");
       if (checkFail) {
-        throw { message: "Request failed! Check API secrets." };
+        throw { message: createSub.message };
       }
     }
 

frontend/src/Home.js

@@ -75,19 +75,17 @@ const Home = () => {
           </Grid>
 
           <Grid item xs={12}>
-            <Paper className={classes.paper}>
-              <SimpleTabs
-                classes={classes}
-                sms={sms}
-                setSms={setSms}
-                sub={sub}
-                setSub={setSub}
-                contacts={contacts}
-                setContacts={setContacts}
-                sentmsg={sentmsg}
-                setSentmsg={setSentmsg}
-              />
-            </Paper>
+            <SimpleTabs
+              classes={classes}
+              sms={sms}
+              setSms={setSms}
+              sub={sub}
+              setSub={setSub}
+              contacts={contacts}
+              setContacts={setContacts}
+              sentmsg={sentmsg}
+              setSentmsg={setSentmsg}
+            />
           </Grid>
         </Grid>
       </div>

frontend/src/components/Appbar.js

@@ -19,7 +19,7 @@ export default function ButtonAppBar(props) {
       <AppBar position="static">
         <Toolbar>
           <Typography variant="h6" className={classes.title}>
-            Messager
+            smsMessenger
           </Typography>
           <Button
             color="inherit"