oauth improve

Author: skadefro

OpenFlow/src/DBHelper.ts

@@ -51,11 +51,9 @@ export class DBHelper {
             if (ids.indexOf(role._id) == -1) {
                 ids.push(role._id);
                 result.push(role);
-                // console.log(role.name + " " + role._id);
                 const _subroles: Role[] = await this.GetRoles(role._id, ident + 1);
                 for (let y = 0; y < _subroles.length; y++) {
                     const subrole = _subroles[y];
-                    // console.log(role.name + " " + subrole.name + " " + subrole._id);
                     if (ids.indexOf(subrole._id) == -1) {
                         ids.push(subrole._id);
                         result.push(subrole);

OpenFlow/src/DatabaseConnection.ts

@@ -8,6 +8,7 @@ import { Config } from "./Config";
 import { TokenUser, Base, WellknownIds, Rights, NoderedUtil, mapFunc, finalizeFunc, reduceFunc, Ace, UpdateOneMessage, UpdateManyMessage, InsertOrUpdateOneMessage, Role, Rolemember, User } from "@openiap/openflow-api";
 import { DBHelper } from "./DBHelper";
 import * as client from "prom-client";
+import { OAuthProvider } from "./OAuthProvider";
 // tslint:disable-next-line: typedef
 const safeObjectID = (s: string | number | ObjectID) => ObjectID.isValid(s) ? new ObjectID(s) : null;
 const isoDatePattern = new RegExp(/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/);
@@ -23,7 +24,7 @@ Object.defineProperty(Promise, 'retry', {
     configurable: true,
     writable: true,
     value: function retry(retries, executor) {
-        console.log(`${retries} retries left!`)
+        console.warn(`${retries} retries left!`)
 
         if (typeof retries !== 'number') {
             throw new TypeError('retries is not a number')
@@ -374,7 +375,7 @@ export class DatabaseConnection {
                         mysort = neworderby;
                     }
                 } catch (error) {
-                    console.log(error, orderby);
+                    console.error(error, orderby);
                 }
                 if (neworderby == null) mysort[(orderby as string)] = 1;
             } else {
@@ -391,7 +392,7 @@ export class DatabaseConnection {
                         myhint = newhint;
                     }
                 } catch (error) {
-                    console.log(error, hint);
+                    console.error(error, hint);
                 }
                 if (newhint == null) myhint[(hint as string)] = 1;
             } else {
@@ -457,8 +458,6 @@ export class DatabaseConnection {
         if (!top) { top = 500; }
         if (!skip) { skip = 0; }
         let arr: T[] = [];
-
-
         DatabaseConnection.mongodb_query_count.labels(collectionname).inc();
         const end = DatabaseConnection.mongodb_query.startTimer();
         let _pipe = this.db.collection(collectionname).find(_query);
@@ -546,7 +545,7 @@ export class DatabaseConnection {
                         myhint = newhint;
                     }
                 } catch (error) {
-                    console.log(error, hint);
+                    console.error(error, hint);
                 }
                 if (newhint == null) myhint[(hint as string)] = 1;
             } else {
@@ -818,6 +817,11 @@ export class DatabaseConnection {
             end({ collection: collectionname });
             DBHelper.cached_roles = [];
         }
+        if (collectionname == "config" && item._type == "oauthclient") {
+            if (user.HasRoleName("admins")) {
+                setTimeout(() => OAuthProvider.LoadClients(), 1000);
+            }
+        }
         DatabaseConnection.traversejsondecode(item);
         if (Config.log_inserts) this._logger.debug("[" + user.username + "][" + collectionname + "] inserted " + item.name);
         return item;
@@ -1019,6 +1023,11 @@ export class DatabaseConnection {
             (q.item as any).passwordhash = await Crypt.hash((q.item as any).newpassword);
             delete (q.item as any).newpassword;
         }
+        if (q.collectionname == "config" && q.item._type == "oauthclient") {
+            if (user.HasRoleName("admins")) {
+                setTimeout(() => OAuthProvider.LoadClients(), 1000);
+            }
+        }
         this._logger.silly("[" + user.username + "][" + q.collectionname + "] Updating " + (q.item.name || q.item._name) + " in database");
 
         if (q.query === null || q.query === undefined) {
@@ -1363,7 +1372,6 @@ export class DatabaseConnection {
                 await this._DeleteFile(arr[i]._id);
                 end({ collection: collectionname });
             }
-            // if (Config.log_deletes) console.log(JSON.parse(JSON.stringify(query)));
             if (Config.log_deletes) this._logger.verbose("[" + user.username + "][" + collectionname + "] deleted " + arr.length + " items in database");
             return arr.length;
         } else {

OpenFlow/src/LoginProvider.ts

@@ -144,12 +144,23 @@ export class LoginProvider {
         });
 
         app.use(function (req, res, next) {
-            res.header('Access-Control-Allow-Origin', (req.headers.origin as any));
-            res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+            logger.debug(req.originalUrl);
+            const origin: string = (req.headers.origin as any);
+            if (NoderedUtil.IsNullEmpty(origin)) {
+                res.header('Access-Control-Allow-Origin', '*');
+            } else {
+                res.header('Access-Control-Allow-Origin', origin);
+            }
+            res.header("Access-Control-Allow-Methods", "DELETE, POST, PUT, GET, OPTIONS");
+            res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Access-Control-Allow-Headers, Authorization");
             res.header('Cache-Control', 'private, no-cache, no-store, must-revalidate');
             res.header('Expires', '-1');
             res.header('Pragma', 'no-cache');
-            next();
+            if (req.originalUrl == "/oidc/me" && req.method == "OPTIONS") {
+                res.send("ok");
+            } else {
+                next();
+            }
         });
         app.get("/Signout", (req: any, res: any, next: any): void => {
             // const providerid: string = req.cookies.provider;
@@ -187,7 +198,7 @@ export class LoginProvider {
         });
         await LoginProvider.RegisterProviders(app, baseurl);
         app.get("/user", async (req: any, res: any, next: any): Promise<void> => {
-            // console.log("/user " + !(req.user == null));
+            // logger.debug("/user " + !(req.user == null));
             res.setHeader("Content-Type", "application/json");
             if (req.user) {
                 const user: User = await DBHelper.FindById(req.user._id);
@@ -198,7 +209,7 @@ export class LoginProvider {
             res.end();
         });
         app.get("/jwt", (req: any, res: any, next: any): void => {
-            // console.log("/jwt " + !(req.user == null));
+            // logger.debug("/jwt " + !(req.user == null));
             res.setHeader("Content-Type", "application/json");
             if (req.user) {
                 const user: TokenUser = TokenUser.From(req.user);
@@ -209,7 +220,7 @@ export class LoginProvider {
             res.end();
         });
         app.get("/jwtlong", (req: any, res: any, next: any): void => {
-            // console.log("/jwtlong " + !(req.user == null));
+            // logger.debug("/jwtlong " + !(req.user == null));
             res.setHeader("Content-Type", "application/json");
             if (req.user) {
                 const user: TokenUser = TokenUser.From(req.user);
@@ -224,7 +235,7 @@ export class LoginProvider {
             res.end();
         });
         app.post("/jwt", async (req: any, res: any, next: any): Promise<void> => {
-            // console.log("/jwt " + !(req.user == null));
+            // logger.debug("/jwt " + !(req.user == null));
             try {
                 const rawAssertion = req.body.token;
                 const user: User = await LoginProvider.validateToken(rawAssertion);
@@ -259,13 +270,13 @@ export class LoginProvider {
             res.end(JSON.stringify(res2));
         });
         app.get("/login", async (req: any, res: any, next: any): Promise<void> => {
-            // console.log("/login " + !(req.user == null));
+            // logger.debug("/login " + !(req.user == null));
             try {
                 const originalUrl: any = req.cookies.originalUrl;
                 const validateurl: any = req.cookies.validateurl;
                 if (NoderedUtil.IsNullEmpty(originalUrl)) res.cookie("originalUrl", req.originalUrl, { maxAge: 900000, httpOnly: true });
                 if (!NoderedUtil.IsNullEmpty(validateurl)) {
-                    // console.log("validateurl: " + validateurl);
+                    // logger.debug("validateurl: " + validateurl);
                     if (req.user) {
                         const user: User = await DBHelper.FindById(req.user._id);
                         const tuser: TokenUser = TokenUser.From(user);
@@ -295,7 +306,7 @@ export class LoginProvider {
             }
         });
         app.get("/validateuserform", async (req: any, res: any, next: any): Promise<void> => {
-            // console.log("/validateuserform " + !(req.user == null));
+            // logger.debug("/validateuserform " + !(req.user == null));
             res.setHeader("Content-Type", "application/json");
             if (NoderedUtil.IsNullEmpty(Config.validate_user_form)) {
                 res.end(JSON.stringify({}));
@@ -315,7 +326,7 @@ export class LoginProvider {
             return;
         });
         app.post("/validateuserform", async (req: any, res) => {
-            // console.log("/validateuserform " + !(req.user == null));
+            // logger.debug("/validateuserform " + !(req.user == null));
             res.setHeader("Content-Type", "application/json");
             try {
                 if (req.user) {