diff --git a/inventory-app/api.py b/inventory-app/api.py index 323be2a..c27d6cd 100644 --- a/inventory-app/api.py +++ b/inventory-app/api.py @@ -1,13 +1,12 @@ -import os import re import const import time import threading -from datetime import datetime, timedelta +from datetime import datetime from functools import wraps from pymongo import MongoClient -from flask import Blueprint, abort, g, make_response, redirect, render_template, request, jsonify -from common import CustomForm, build_query, flatten, format_name, slack_post, User +from flask import Blueprint, g, request, jsonify +from common import slack_post page_api = Blueprint("api", __name__) db = MongoClient(const.MONGO_URI).get_default_database() diff --git a/inventory-app/inventory.py b/inventory-app/inventory.py index 6268eef..9ab7c40 100644 --- a/inventory-app/inventory.py +++ b/inventory-app/inventory.py @@ -5,18 +5,18 @@ import urllib from datetime import datetime, date, timedelta from botocore.exceptions import ClientError from bson.objectid import ObjectId -from flask import Blueprint, abort, g, make_response, redirect, render_template, request, url_for +from flask import Blueprint, abort, g, redirect, render_template, request, url_for from jpegtran import JPEGImage from pymongo import MongoClient from werkzeug.utils import secure_filename -from wtforms import BooleanField, SelectField, StringField, validators -from wtforms.fields import FormField, TextAreaField +from wtforms import BooleanField, SelectField, StringField +from wtforms.fields import FormField from wtforms.form import Form from wtforms.validators import Length import const -from common import CustomForm, build_query, flatten, format_name -from oidc import page_oidc, login_required, read_user, do_login +from common import CustomForm, build_query, flatten +from oidc import login_required, read_user, do_login page_inventory = Blueprint("inventory", __name__) db = MongoClient(const.MONGO_URI).get_default_database() diff --git a/inventory-app/main.py b/inventory-app/main.py index f4211f4..d6bac6d 100755 --- a/inventory-app/main.py +++ b/inventory-app/main.py @@ -1,55 +1,29 @@ #!/usr/bin/env python3 -import hashlib -import json -import secrets import threading -import unicodedata import urllib -from collections import Counter from configparser import ConfigParser from datetime import datetime, timedelta -from email.mime.multipart import MIMEMultipart -from email.mime.text import MIMEText from functools import wraps from http.server import BaseHTTPRequestHandler, HTTPServer -from time import sleep import bleach -import flask import jinja2 -import ldap import markdown -import prometheus_client -import pymongo -import requests -import safe import segno -from flask import Flask, abort, g, make_response, redirect, render_template, request, session -from flask_wtf import FlaskForm, RecaptchaField +from flask import Flask, abort, g, redirect, request from jinja2 import Environment, FileSystemLoader -from ldap import modlist from markupsafe import Markup -from prometheus_client import start_http_server, Gauge, CollectorRegistry, generate_latest +from prometheus_client import Gauge, CollectorRegistry, generate_latest from prometheus_flask_exporter import PrometheusMetrics from pymongo import MongoClient -from werkzeug import exceptions from wtforms import ( - BooleanField, - PasswordField, - SelectField, SelectMultipleField, - StringField, ValidationError, - validators, widgets, ) -from wtforms.fields import FormField -from wtforms.fields import DateField, EmailField -from wtforms.form import Form -from wtforms.validators import DataRequired import const -from common import CustomForm, devenv, flatten, format_name, get_users, User +from common import devenv, format_name, get_users, User from inventory import page_inventory from oidc import page_oidc, login_required, read_user from doorboy import page_doorboy diff --git a/inventory-app/oidc.py b/inventory-app/oidc.py index a8eb7fa..e1142ab 100644 --- a/inventory-app/oidc.py +++ b/inventory-app/oidc.py @@ -4,8 +4,7 @@ import jwt import base64 import requests from pymongo import MongoClient -from flask import Blueprint, abort, g, make_response, redirect, render_template, request, Flask, request, url_for, session -from common import CustomForm, build_query, flatten, format_name +from flask import Blueprint, redirect, request, request, url_for, session from functools import wraps page_oidc = Blueprint("oidc", __name__)