merge dev to main (#287)

* Update general_oauth_routes.ts

* Update server.ts

* Update general_oauth_routes.ts

* debug logs

* Update google_oauth20_manager.ts

src/main/typescript/middlewares/oauth/general_oauth_routes.ts

@@ -13,6 +13,7 @@ export function register_general_oauth_routes(app: Application) {
             if (err) {
                 res.status(500).send();
             } else {
+                debug('session destroyed!');
                 res.status(200).send();
             }
         });

src/main/typescript/middlewares/oauth/google_oauth20_manager.ts

@@ -4,15 +4,16 @@ import jwt from 'jsonwebtoken';
 
 import { User } from '../../models/user.model';
 import { server_settings, security_settings } from '../../../json/config.json';
+import { debug } from '../../tools/logmanager';
 
 export function register_google_oauth_20_routes(app: Application) {
     // Either sign-in or sign-up and then sign-in
     app.post('/auth/google', async (req, res) => {
         const credential = req.body.credential;
-        const tokenFromBody = req.body.g_csrf_token;
-        const cookie = req.cookies['g_csrf_token'];
 
-        if ((credential === undefined || tokenFromBody === undefined || cookie === undefined) || (tokenFromBody != cookie)) {
+        debug('credential: ' + credential);
+
+        if (credential === undefined) {
             return res.redirect(server_settings.frontend_url + '/auth/failed');
         }