Import openflow-api using new name

Author: skadefro

OpenFlow/src/Audit.ts

@@ -1,5 +1,5 @@
 import { Config } from "./Config";
-import { TokenUser, Base, Rights, NoderedUtil } from "openflow-api";
+import { TokenUser, Base, Rights, NoderedUtil } from "@openiap/openflow-api";
 import { Crypt } from "./Crypt";
 
 export class Audit {

OpenFlow/src/Auth.ts

@@ -1,5 +1,5 @@
 import { Crypt } from "./Crypt";
-import { User } from "openflow-api";
+import { User } from "@openiap/openflow-api";
 import { DBHelper } from "./DBHelper";
 export class Auth {
     public static async ValidateByPassword(username: string, password: string): Promise<User> {

OpenFlow/src/Config.ts

@@ -4,7 +4,7 @@ import * as path from "path";
 import * as retry from "async-retry";
 import { DatabaseConnection } from "./DatabaseConnection";
 import { Logger } from "./Logger";
-import { NoderedUtil } from "openflow-api";
+import { NoderedUtil } from "@openiap/openflow-api";
 
 export class Config {
     public static getversion(): string {
@@ -110,6 +110,7 @@ export class Config {
         Config.nodered_limits_cpu = Config.getEnv("nodered_limits_cpu", ""); // 1000m = 1vCPU
         Config.prometheus_measure_nodeid = Config.parseBoolean(Config.getEnv("prometheus_measure_nodeid", "false"));
         Config.prometheus_measure_queued_messages = Config.parseBoolean(Config.getEnv("prometheus_measure_queued_messages", "false"));
+        Config.validate_user_form = Config.getEnv("validate_user_form", "");
     }
     public static db: DatabaseConnection = null;
     public static license_key: string = Config.getEnv("license_key", "");
@@ -207,6 +208,7 @@ export class Config {
     public static nodered_limits_cpu: string = Config.getEnv("nodered_limits_cpu", ""); // 1000m = 1vCPU
     public static prometheus_measure_nodeid: boolean = Config.parseBoolean(Config.getEnv("prometheus_measure_nodeid", "false"));
     public static prometheus_measure_queued_messages: boolean = Config.parseBoolean(Config.getEnv("prometheus_measure_queued_messages", "false"));
+    public static validate_user_form: string = Config.getEnv("validate_user_form", "");
 
     public static baseurl(): string {
         let result: string = "";

OpenFlow/src/Crypt.ts

@@ -2,7 +2,7 @@ import * as crypto from "crypto";
 import * as bcrypt from "bcryptjs";
 import * as jsonwebtoken from "jsonwebtoken";
 import { Config } from "./Config";
-import { NoderedUtil, TokenUser, WellknownIds, Rolemember, User } from "openflow-api";
+import { NoderedUtil, TokenUser, WellknownIds, Rolemember, User } from "@openiap/openflow-api";
 export class Crypt {
     static encryption_key: string = Config.aes_secret.substr(0, 32); // must be 256 bytes (32 characters)
     static iv_length: number = 16; // for AES, this is always 16

OpenFlow/src/DBHelper.ts

@@ -1,9 +1,8 @@
 import { Crypt } from "./Crypt";
-import { User, Role, Rolemember, WellknownIds, Rights, NoderedUtil, Base } from "openflow-api";
+import { User, Role, Rolemember, WellknownIds, Rights, NoderedUtil, Base, TokenUser } from "@openiap/openflow-api";
 import { Config } from "./Config";
 
 export class DBHelper {
-
     public static async FindByUsername(username: string, jwt: string = null): Promise<User> {
         const byuser = { username: new RegExp(["^", username, "$"].join(""), "i") };
         const byid = { federationids: new RegExp(["^", username, "$"].join(""), "i") }

OpenFlow/src/DatabaseConnection.ts

@@ -5,7 +5,7 @@ import { MongoClient } from "mongodb";
 import winston = require("winston");
 import { Crypt } from "./Crypt";
 import { Config } from "./Config";
-import { TokenUser, Base, WellknownIds, Rights, NoderedUtil, mapFunc, finalizeFunc, reduceFunc, Ace, UpdateOneMessage, UpdateManyMessage, InsertOrUpdateOneMessage, Role, Rolemember, User } from "openflow-api";
+import { TokenUser, Base, WellknownIds, Rights, NoderedUtil, mapFunc, finalizeFunc, reduceFunc, Ace, UpdateOneMessage, UpdateManyMessage, InsertOrUpdateOneMessage, Role, Rolemember, User } from "@openiap/openflow-api";
 import { DBHelper } from "./DBHelper";
 // tslint:disable-next-line: typedef
 const safeObjectID = (s: string | number | ObjectID) => ObjectID.isValid(s) ? new ObjectID(s) : null;

OpenFlow/src/LoginProvider.ts

@@ -21,7 +21,7 @@ import * as saml from "saml20";
 const multer = require('multer');
 const GridFsStorage = require('multer-gridfs-storage');
 import { GridFSBucket, ObjectID, Db, Cursor, Binary } from "mongodb";
-import { Base, User, NoderedUtil, TokenUser, WellknownIds, Rights, Role } from "openflow-api";
+import { Base, User, NoderedUtil, TokenUser, WellknownIds, Rights, Role } from "@openiap/openflow-api";
 import { DBHelper } from "./DBHelper";
 const safeObjectID = (s: string | number | ObjectID) => ObjectID.isValid(s) ? new ObjectID(s) : null;
 

OpenFlow/src/Messages/Message.ts

@@ -12,8 +12,8 @@ import { Readable, Stream } from "stream";
 import { GridFSBucket, ObjectID, Db, Cursor, MongoNetworkError } from "mongodb";
 import * as path from "path";
 import { DatabaseConnection } from "../DatabaseConnection";
-import { StripeMessage, EnsureStripeCustomerMessage, NoderedUtil, QueuedMessage, RegisterQueueMessage, QueueMessage, CloseQueueMessage, ListCollectionsMessage, DropCollectionMessage, QueryMessage, AggregateMessage, InsertOneMessage, UpdateOneMessage, Base, UpdateManyMessage, InsertOrUpdateOneMessage, DeleteOneMessage, MapReduceMessage, SigninMessage, TokenUser, User, Rights, EnsureNoderedInstanceMessage, DeleteNoderedInstanceMessage, DeleteNoderedPodMessage, RestartNoderedInstanceMessage, GetNoderedInstanceMessage, GetNoderedInstanceLogMessage, SaveFileMessage, WellknownIds, GetFileMessage, UpdateFileMessage, CreateWorkflowInstanceMessage, RegisterUserMessage, NoderedUser, WatchMessage, GetDocumentVersionMessage, DeleteManyMessage, InsertManyMessage, GetKubeNodeLabels } from "openflow-api";
-import { Billing, stripe_customer, stripe_base, stripe_list, StripeAddPlanMessage, StripeCancelPlanMessage, stripe_subscription, stripe_subscription_item, stripe_plan, stripe_coupon } from "openflow-api";
+import { StripeMessage, EnsureStripeCustomerMessage, NoderedUtil, QueuedMessage, RegisterQueueMessage, QueueMessage, CloseQueueMessage, ListCollectionsMessage, DropCollectionMessage, QueryMessage, AggregateMessage, InsertOneMessage, UpdateOneMessage, Base, UpdateManyMessage, InsertOrUpdateOneMessage, DeleteOneMessage, MapReduceMessage, SigninMessage, TokenUser, User, Rights, EnsureNoderedInstanceMessage, DeleteNoderedInstanceMessage, DeleteNoderedPodMessage, RestartNoderedInstanceMessage, GetNoderedInstanceMessage, GetNoderedInstanceLogMessage, SaveFileMessage, WellknownIds, GetFileMessage, UpdateFileMessage, CreateWorkflowInstanceMessage, RegisterUserMessage, NoderedUser, WatchMessage, GetDocumentVersionMessage, DeleteManyMessage, InsertManyMessage, GetKubeNodeLabels } from "@openiap/openflow-api";
+import { Billing, stripe_customer, stripe_base, stripe_list, StripeAddPlanMessage, StripeCancelPlanMessage, stripe_subscription, stripe_subscription_item, stripe_plan, stripe_coupon } from "@openiap/openflow-api";
 import { V1ResourceRequirements, V1Deployment } from "@kubernetes/client-node";
 import { amqpwrapper } from "../amqpwrapper";
 import { WebSocketServerClient } from "../WebSocketServerClient";

OpenFlow/src/OAuthProvider.ts

@@ -1,7 +1,7 @@
 import * as OAuthServer from "oauth2-server";
 import * as winston from "winston";
 import * as express from "express";
-import { TokenUser, Base, NoderedUtil } from "openflow-api";
+import { TokenUser, Base, NoderedUtil } from "@openiap/openflow-api";
 import { Config } from "./Config";
 import { Crypt } from "./Crypt";
 const Request = OAuthServer.Request;

OpenFlow/src/SamlProvider.ts

@@ -4,7 +4,7 @@ import * as samlp from "samlp";
 import { Config } from "./Config";
 import { Audit } from "./Audit";
 import { LoginProvider } from "./LoginProvider";
-import { NoderedUtil, TokenUser } from "openflow-api";
+import { NoderedUtil, TokenUser } from "@openiap/openflow-api";
 
 export class SamlProvider {
     private static _logger: winston.Logger;