From 53fb0fe3c5e5ea50b6122638fcc43afcb59dab3b Mon Sep 17 00:00:00 2001
From: HF <pixelplanetdev@gmail.com>
Date: Tue, 11 Jan 2022 14:59:20 +0100
Subject: [PATCH] add mailverification to adminapi

---
 src/routes/{adminapi/index.js => adminapi.js} | 12 +++++++-----
 src/routes/adminapi/README.md                 | 10 ----------
 utils/synapse/testmodule.py                   |  2 ++
 3 files changed, 9 insertions(+), 15 deletions(-)
 rename src/routes/{adminapi/index.js => adminapi.js} (90%)
 delete mode 100644 src/routes/adminapi/README.md

diff --git a/src/routes/adminapi/index.js b/src/routes/adminapi.js
similarity index 90%
rename from src/routes/adminapi/index.js
rename to src/routes/adminapi.js
index cb8aca1d..8693bf2c 100644
--- a/src/routes/adminapi/index.js
+++ b/src/routes/adminapi.js
@@ -1,10 +1,10 @@
 import express from 'express';
 
-import logger from '../../core/logger';
-import RegUser from '../../data/models/RegUser';
-import { getIPFromRequest } from '../../utils/ip';
-import { compareToHash } from '../../utils/hash';
-import { APISOCKET_KEY } from '../../core/config';
+import logger from '../core/logger';
+import RegUser from '../data/models/RegUser';
+import { getIPFromRequest } from '../utils/ip';
+import { compareToHash } from '../utils/hash';
+import { APISOCKET_KEY } from '../core/config';
 
 const router = express.Router();
 
@@ -48,6 +48,7 @@ router.post('/checklogin', async (req, res) => {
       'name',
       'email',
       'password',
+      'verified',
     ],
   };
   let userString;
@@ -100,6 +101,7 @@ router.post('/checklogin', async (req, res) => {
       id: reguser.id,
       name: reguser.name,
       email: reguser.email,
+      verified: !!reguser.verified,
     },
   });
 });
diff --git a/src/routes/adminapi/README.md b/src/routes/adminapi/README.md
deleted file mode 100644
index 16f5849f..00000000
--- a/src/routes/adminapi/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# AdminAPI
-
-API which is used for connecting with external applications and bridges to fetch informations.
-Modtools are in ./api
-
-Connections to here just possible with header:
-
-```
-Authorization: "Bearer APISOCKETKEY"
-```
diff --git a/utils/synapse/testmodule.py b/utils/synapse/testmodule.py
index 3d0191ed..d0a5fb03 100644
--- a/utils/synapse/testmodule.py
+++ b/utils/synapse/testmodule.py
@@ -52,6 +52,8 @@ class MyAuthProvider:
             if not resp["success"]:
                 raise Exception(resp["errors"][0])
             userdata = resp['userdata']
+            if not userdata['verified']:
+                raise Exception('User is not mail verified');
             return (userdata['id'], userdata['name'], userdata['email'])
         except Exception as e:
             logger.warning('Could not login via ppfun: %s', e)