From e0a26a3fa43bdf10564bcf830d517f307c7b3dcd Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 13 Nov 2023 11:31:22 +0000 Subject: [PATCH] fixed build issues from nextauth --- actions/index.js | 3 --- components/case/documents.js | 22 ++++++------------- next.config.js | 1 + notusedmiddleware.js | 13 +++++++++++ package.json | 2 +- pages/api/auth/[...nextauth].js | 2 +- pages/api/endpoint/createaccount_api.js | 2 +- pages/api/endpoint/createcase_api.js | 2 +- pages/api/endpoint/createwatchedcases_api.js | 2 +- .../endpoint/deleteawaitingsubmissions_api.js | 2 +- .../endpoint/deletemyrepresentations_api.js | 2 +- pages/api/endpoint/deletewatchedcases_api.js | 2 +- pages/api/endpoint/getadvancedsearch_api.js | 2 +- .../endpoint/getadvancedsearchpaged_api.js | 3 +-- pages/api/endpoint/getappealid_api.js | 2 +- pages/api/endpoint/getappealtypes_api.js | 7 +----- .../api/endpoint/getawaitingsubmission_api.js | 2 +- .../getawaitingsubmissionproxy_api.js | 2 +- pages/api/endpoint/getbasicdnssearch_api.js | 7 +----- .../endpoint/getbasicdnssearchdetails_api.js | 2 +- .../getbasicdnssearchdetailspaged_api.js | 2 +- .../endpoint/getbasicdnssearchpaged_api.js | 2 +- pages/api/file/updatecase_api.js | 2 +- pages/api/file/upload.js | 5 +---- pages/middleware.js | 3 --- 25 files changed, 41 insertions(+), 55 deletions(-) create mode 100644 notusedmiddleware.js delete mode 100644 pages/middleware.js diff --git a/actions/index.js b/actions/index.js index e538fca0..c5507837 100644 --- a/actions/index.js +++ b/actions/index.js @@ -1,8 +1,5 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import HmacSHA256 from "crypto-js/hmac-sha256"; -import { getFormCollection } from "../components/utils"; -import { downloadFile, getCaseBlob } from "./azurestorage"; let BASE_URL; const port = parseInt(process.env.PORT, 10) || 3000; diff --git a/components/case/documents.js b/components/case/documents.js index 38d72805..5ef38e8b 100644 --- a/components/case/documents.js +++ b/components/case/documents.js @@ -1,29 +1,21 @@ +import jsonpath from "jsonpath"; +import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import jsonpath from "jsonpath"; -import { useState, useEffect, useRef, useCallback } from "react"; -import { useDispatch, useSelector, shallowEqual, connect } from "react-redux"; +import { useCallback, useEffect, useRef, useState } from "react"; +import { connect } from "react-redux"; import transLookup from "../../data/lookuptranslations.json"; -import PaginationControl from "./pagination"; import { formatDates } from "../utils"; -import CryptoJS from "crypto-js"; +import PaginationControl from "./pagination"; -import { setCurrentPage } from "../../store/currentView/action"; import { - getBasicSearch, - getBasicSearchDetails, getSearchDocumentDetails, getSearchDocumentDetailsPaged, getSearchDocumentTypes, } from "../../actions"; +import { setCurrentPage } from "../../store/currentView/action"; -import { - setSearchResults, - setSearchDetails, - setDocumentDetails, - getSearchResultsObj, -} from "../../store/searchOutput/action"; +import { setDocumentDetails } from "../../store/searchOutput/action"; const DocumentDetails = (props) => { let { t } = useTranslation(); diff --git a/next.config.js b/next.config.js index 1be8d963..df13c885 100644 --- a/next.config.js +++ b/next.config.js @@ -54,6 +54,7 @@ const securityHeaders = [ ]; module.exports = { + swcMinify: false, sassOptions: { includePaths: [ "/styles/sass", diff --git a/notusedmiddleware.js b/notusedmiddleware.js new file mode 100644 index 00000000..3a6a684c --- /dev/null +++ b/notusedmiddleware.js @@ -0,0 +1,13 @@ +// export { default } from "next-auth/middleware"; + +// export const config = { +// matcher: ["/myportal/", "/myportal/:path*"], +// }; + +// import { withAuth } from 'next-auth/middleware'; + +// export default withAuth({ +// pages: { +// signIn: '/login', +// }, +// }); diff --git a/package.json b/package.json index 570ed08e..6da3a79a 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "mysql": "^2.18.1", "nanoid": "^3.2.0", "next": "^14.0.1", - "next-auth": "^4.22.1", + "next-auth": "^4.24.4", "next-connect": "^0.12.2", "next-redux-wrapper": "^7.0.5", "next-swagger-doc": "^0.3.6", diff --git a/pages/api/auth/[...nextauth].js b/pages/api/auth/[...nextauth].js index 4797e73c..6138801b 100644 --- a/pages/api/auth/[...nextauth].js +++ b/pages/api/auth/[...nextauth].js @@ -183,7 +183,7 @@ const authOptions = (locale, req) => { }), ], adapter: PrismaAdapter(prisma), - secret: process.env.SECRET, + secret: process.env.NEXTAUTH_SECRET, session: { jwt: true, pages: {}, diff --git a/pages/api/endpoint/createaccount_api.js b/pages/api/endpoint/createaccount_api.js index bf2f4d9d..506a28e4 100644 --- a/pages/api/endpoint/createaccount_api.js +++ b/pages/api/endpoint/createaccount_api.js @@ -12,7 +12,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken, azureHeadersPaged, consoleLogger } from "../../../actions"; +import { consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/createcase_api.js b/pages/api/endpoint/createcase_api.js index ae273e9b..71e36a11 100644 --- a/pages/api/endpoint/createcase_api.js +++ b/pages/api/endpoint/createcase_api.js @@ -44,7 +44,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import _ from "lodash"; -import { getToken, azureHeadersPaged, consoleLogger } from "../../../actions"; +import { getToken } from "../../../actions"; import { getCaseBlob } from "../../../actions/azurestorage"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/createwatchedcases_api.js b/pages/api/endpoint/createwatchedcases_api.js index d1439618..58e8a922 100644 --- a/pages/api/endpoint/createwatchedcases_api.js +++ b/pages/api/endpoint/createwatchedcases_api.js @@ -12,7 +12,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken, azureHeadersPaged, consoleLogger } from "../../../actions"; +import { consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/deleteawaitingsubmissions_api.js b/pages/api/endpoint/deleteawaitingsubmissions_api.js index 5861de9b..65dac350 100644 --- a/pages/api/endpoint/deleteawaitingsubmissions_api.js +++ b/pages/api/endpoint/deleteawaitingsubmissions_api.js @@ -12,7 +12,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken, azureHeadersPaged, consoleLogger } from "../../../actions"; +import { consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/deletemyrepresentations_api.js b/pages/api/endpoint/deletemyrepresentations_api.js index 5298da38..4898be01 100644 --- a/pages/api/endpoint/deletemyrepresentations_api.js +++ b/pages/api/endpoint/deletemyrepresentations_api.js @@ -12,7 +12,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken, azureHeadersPaged, consoleLogger } from "../../../actions"; +import { consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/deletewatchedcases_api.js b/pages/api/endpoint/deletewatchedcases_api.js index b1b3a714..705c1857 100644 --- a/pages/api/endpoint/deletewatchedcases_api.js +++ b/pages/api/endpoint/deletewatchedcases_api.js @@ -12,7 +12,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken, azureHeadersPaged, consoleLogger } from "../../../actions"; +import { consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getadvancedsearch_api.js b/pages/api/endpoint/getadvancedsearch_api.js index 91909b10..17e7274f 100644 --- a/pages/api/endpoint/getadvancedsearch_api.js +++ b/pages/api/endpoint/getadvancedsearch_api.js @@ -24,7 +24,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import _ from "lodash"; -import { getToken, azureHeadersPaged, consoleLogger } from "../../../actions"; +import { azureHeadersPaged, consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getadvancedsearchpaged_api.js b/pages/api/endpoint/getadvancedsearchpaged_api.js index 8e768824..d1eb4c7d 100644 --- a/pages/api/endpoint/getadvancedsearchpaged_api.js +++ b/pages/api/endpoint/getadvancedsearchpaged_api.js @@ -49,12 +49,11 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { query } from "jsonpath"; import _ from "lodash"; import { - getToken, azureHeadersPagedCustom, consoleLogger, + getToken, } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getappealid_api.js b/pages/api/endpoint/getappealid_api.js index 71838a12..f32ae070 100644 --- a/pages/api/endpoint/getappealid_api.js +++ b/pages/api/endpoint/getappealid_api.js @@ -30,7 +30,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken, azureHeaders, consoleLogger } from "../../../actions"; +import { azureHeaders, consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getappealtypes_api.js b/pages/api/endpoint/getappealtypes_api.js index 22f34f65..b962f704 100644 --- a/pages/api/endpoint/getappealtypes_api.js +++ b/pages/api/endpoint/getappealtypes_api.js @@ -11,12 +11,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { - getToken, - azureHeadersPaged, - azureHeaders, - consoleLogger, -} from "../../../actions"; +import { azureHeaders, consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getawaitingsubmission_api.js b/pages/api/endpoint/getawaitingsubmission_api.js index 4c16452c..8d4e8d32 100644 --- a/pages/api/endpoint/getawaitingsubmission_api.js +++ b/pages/api/endpoint/getawaitingsubmission_api.js @@ -12,7 +12,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken, azureHeaders, consoleLogger } from "../../../actions"; +import { azureHeaders, consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getawaitingsubmissionproxy_api.js b/pages/api/endpoint/getawaitingsubmissionproxy_api.js index b5d87ef7..c300481a 100644 --- a/pages/api/endpoint/getawaitingsubmissionproxy_api.js +++ b/pages/api/endpoint/getawaitingsubmissionproxy_api.js @@ -12,7 +12,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken, azureHeaders, consoleLogger } from "../../../actions"; +import { azureHeaders, consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getbasicdnssearch_api.js b/pages/api/endpoint/getbasicdnssearch_api.js index b844718c..9d17438c 100644 --- a/pages/api/endpoint/getbasicdnssearch_api.js +++ b/pages/api/endpoint/getbasicdnssearch_api.js @@ -19,12 +19,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import _ from "lodash"; -import { - getToken, - azureHeaders, - azureHeadersPaged, - consoleLogger, -} from "../../../actions"; +import { azureHeadersPaged, consoleLogger, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getbasicdnssearchdetails_api.js b/pages/api/endpoint/getbasicdnssearchdetails_api.js index b33737f7..a9b65b70 100644 --- a/pages/api/endpoint/getbasicdnssearchdetails_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetails_api.js @@ -13,7 +13,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import _ from "lodash"; -import { getToken, azureHeadersPaged, consoleLogger } from "../../../actions"; +import { consoleLogger, getToken } from "../../../actions"; import { getSelectQuery } from "../../../actions/selectQueryTypes"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js index 0f6c9889..e9742aca 100644 --- a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js @@ -12,7 +12,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import _ from "lodash"; -import { getToken, azureHeadersPaged, consoleLogger } from "../../../actions"; +import { azureHeadersPaged, consoleLogger, getToken } from "../../../actions"; import { getSelectQuery } from "../../../actions/selectQueryTypes"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/getbasicdnssearchpaged_api.js b/pages/api/endpoint/getbasicdnssearchpaged_api.js index 594b49af..4f197640 100644 --- a/pages/api/endpoint/getbasicdnssearchpaged_api.js +++ b/pages/api/endpoint/getbasicdnssearchpaged_api.js @@ -45,7 +45,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import _ from "lodash"; -import { getToken, azureHeadersPagedCustom } from "../../../actions"; +import { azureHeadersPagedCustom, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/file/updatecase_api.js b/pages/api/file/updatecase_api.js index babcfa88..2a07d071 100644 --- a/pages/api/file/updatecase_api.js +++ b/pages/api/file/updatecase_api.js @@ -1,6 +1,6 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken, patchCase } from "../../../actions"; +import { getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/file/upload.js b/pages/api/file/upload.js index f0607ab6..f4a1f027 100644 --- a/pages/api/file/upload.js +++ b/pages/api/file/upload.js @@ -1,14 +1,11 @@ import { - createContainer, - getContainers, - getBlobs, createBlob, createRepBlob, uploadFile, } from "../../../actions/azurestorage"; -import middleware from "../middleware/middleware"; import nextConnect from "next-connect"; +import middleware from "../middleware/middleware"; const ApiProxy = nextConnect(); ApiProxy.use(middleware); diff --git a/pages/middleware.js b/pages/middleware.js deleted file mode 100644 index 0ee82360..00000000 --- a/pages/middleware.js +++ /dev/null @@ -1,3 +0,0 @@ -export { default } from "next-auth/middleware"; - -export const config = { matcher: ["/myportal/:path*"] };