From c1e553268a422dffda0e962a01f717a47d824f3f Mon Sep 17 00:00:00 2001 From: Michael Grigoryan <56165400+michaelgrigoryan25@users.noreply.github.com> Date: Thu, 11 Nov 2021 22:59:16 +0400 Subject: [PATCH 1/7] Updated Webpack configuration formatting --- webpack.config.js | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 2224ad6eda14..7b403457902a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,20 +1,20 @@ -import fastGlob from 'fast-glob'; +import webpack from 'webpack'; import wrapAnsi from 'wrap-ansi'; +import fastGlob from 'fast-glob'; +import VueLoader from 'vue-loader'; +import { fileURLToPath } from 'url'; +import EsBuildLoader from 'esbuild-loader'; +import { resolve, parse, dirname } from 'path'; import AddAssetPlugin from 'add-asset-webpack-plugin'; -import LicenseCheckerWebpackPlugin from 'license-checker-webpack-plugin'; import MiniCssExtractPlugin from 'mini-css-extract-plugin'; import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin'; -import VueLoader from 'vue-loader'; -import EsBuildLoader from 'esbuild-loader'; -import {resolve, parse, dirname} from 'path'; -import webpack from 'webpack'; -import {fileURLToPath} from 'url'; +import LicenseCheckerWebpackPlugin from 'license-checker-webpack-plugin'; -const {VueLoaderPlugin} = VueLoader; -const {ESBuildMinifyPlugin} = EsBuildLoader; -const {SourceMapDevToolPlugin} = webpack; +const { VueLoaderPlugin } = VueLoader; +const { SourceMapDevToolPlugin } = webpack; +const { ESBuildMinifyPlugin } = EsBuildLoader; const __dirname = dirname(fileURLToPath(import.meta.url)); -const glob = (pattern) => fastGlob.sync(pattern, {cwd: __dirname, absolute: true}); +const glob = (pattern) => fastGlob.sync(pattern, { cwd: __dirname, absolute: true }); const themes = {}; for (const path of glob('web_src/less/themes/*.less')) { @@ -69,12 +69,12 @@ export default { devtool: false, output: { path: resolve(__dirname, 'public'), - filename: ({chunk}) => { + filename: ({ chunk }) => { // serviceworker can only manage assets below it's script's directory so // we have to put it in / instead of /js/ return chunk.name === 'serviceworker' ? '[name].js' : 'js/[name].js'; }, - chunkFilename: ({chunk}) => { + chunkFilename: ({ chunk }) => { const language = (/monaco.*languages?_.+?_(.+?)_/.exec(chunk.id) || [])[1]; return language ? `js/monaco-language-${language.toLowerCase()}.js` : `js/[name].js`; }, @@ -137,8 +137,8 @@ export default { loader: 'css-loader', options: { sourceMap: true, - url: {filter: filterCssImport}, - import: {filter: filterCssImport}, + url: { filter: filterCssImport }, + import: { filter: filterCssImport }, }, }, ], @@ -154,8 +154,8 @@ export default { options: { sourceMap: true, importLoaders: 1, - url: {filter: filterCssImport}, - import: {filter: filterCssImport}, + url: { filter: filterCssImport }, + import: { filter: filterCssImport }, }, }, { @@ -205,16 +205,16 @@ export default { }), isProduction ? new LicenseCheckerWebpackPlugin({ outputFilename: 'js/licenses.txt', - outputWriter: ({dependencies}) => { + outputWriter: ({ dependencies }) => { const line = '-'.repeat(80); return dependencies.map((module) => { - const {name, version, licenseName, licenseText} = module; + const { name, version, licenseName, licenseText } = module; const body = wrapAnsi(licenseText || '', 80); return `${line}\n${name}@${version} - ${licenseName}\n${line}\n${body}`; }).join('\n'); }, override: { - 'jquery.are-you-sure@*': {licenseName: 'MIT'}, + 'jquery.are-you-sure@*': { licenseName: 'MIT' }, }, ignore: [ 'font-awesome', From 5a53a304422f51e0328a53b29ef6a9c7bb5b8834 Mon Sep 17 00:00:00 2001 From: Michael Grigoryan <56165400+michaelgrigoryan25@users.noreply.github.com> Date: Fri, 12 Nov 2021 22:14:10 +0400 Subject: [PATCH 2/7] Minor readablility patch --- services/auth/basic.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/auth/basic.go b/services/auth/basic.go index 0c400b6b5329..2433c50fca09 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -50,8 +50,8 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore } auths := strings.SplitN(baHead, " ", 2) - if len(auths) != 2 || (auths[0] != "Basic" && auths[0] != "basic") { - return nil + if len(auths) != 2 || (strings.ToLower(auth[0]) != "basic") { + return nil } uname, passwd, _ := base.BasicAuthDecode(auths[1]) From da6a480c65ade93b6e6fddc9696a8a2a64902b6f Mon Sep 17 00:00:00 2001 From: Michael Grigoryan <56165400+michaelgrigoryan25@users.noreply.github.com> Date: Fri, 12 Nov 2021 22:19:35 +0400 Subject: [PATCH 3/7] Revert "Updated Webpack configuration formatting" This reverts commit c1e553268a422dffda0e962a01f717a47d824f3f. --- webpack.config.js | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 7b403457902a..2224ad6eda14 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,20 +1,20 @@ -import webpack from 'webpack'; -import wrapAnsi from 'wrap-ansi'; import fastGlob from 'fast-glob'; -import VueLoader from 'vue-loader'; -import { fileURLToPath } from 'url'; -import EsBuildLoader from 'esbuild-loader'; -import { resolve, parse, dirname } from 'path'; +import wrapAnsi from 'wrap-ansi'; import AddAssetPlugin from 'add-asset-webpack-plugin'; +import LicenseCheckerWebpackPlugin from 'license-checker-webpack-plugin'; import MiniCssExtractPlugin from 'mini-css-extract-plugin'; import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin'; -import LicenseCheckerWebpackPlugin from 'license-checker-webpack-plugin'; +import VueLoader from 'vue-loader'; +import EsBuildLoader from 'esbuild-loader'; +import {resolve, parse, dirname} from 'path'; +import webpack from 'webpack'; +import {fileURLToPath} from 'url'; -const { VueLoaderPlugin } = VueLoader; -const { SourceMapDevToolPlugin } = webpack; -const { ESBuildMinifyPlugin } = EsBuildLoader; +const {VueLoaderPlugin} = VueLoader; +const {ESBuildMinifyPlugin} = EsBuildLoader; +const {SourceMapDevToolPlugin} = webpack; const __dirname = dirname(fileURLToPath(import.meta.url)); -const glob = (pattern) => fastGlob.sync(pattern, { cwd: __dirname, absolute: true }); +const glob = (pattern) => fastGlob.sync(pattern, {cwd: __dirname, absolute: true}); const themes = {}; for (const path of glob('web_src/less/themes/*.less')) { @@ -69,12 +69,12 @@ export default { devtool: false, output: { path: resolve(__dirname, 'public'), - filename: ({ chunk }) => { + filename: ({chunk}) => { // serviceworker can only manage assets below it's script's directory so // we have to put it in / instead of /js/ return chunk.name === 'serviceworker' ? '[name].js' : 'js/[name].js'; }, - chunkFilename: ({ chunk }) => { + chunkFilename: ({chunk}) => { const language = (/monaco.*languages?_.+?_(.+?)_/.exec(chunk.id) || [])[1]; return language ? `js/monaco-language-${language.toLowerCase()}.js` : `js/[name].js`; }, @@ -137,8 +137,8 @@ export default { loader: 'css-loader', options: { sourceMap: true, - url: { filter: filterCssImport }, - import: { filter: filterCssImport }, + url: {filter: filterCssImport}, + import: {filter: filterCssImport}, }, }, ], @@ -154,8 +154,8 @@ export default { options: { sourceMap: true, importLoaders: 1, - url: { filter: filterCssImport }, - import: { filter: filterCssImport }, + url: {filter: filterCssImport}, + import: {filter: filterCssImport}, }, }, { @@ -205,16 +205,16 @@ export default { }), isProduction ? new LicenseCheckerWebpackPlugin({ outputFilename: 'js/licenses.txt', - outputWriter: ({ dependencies }) => { + outputWriter: ({dependencies}) => { const line = '-'.repeat(80); return dependencies.map((module) => { - const { name, version, licenseName, licenseText } = module; + const {name, version, licenseName, licenseText} = module; const body = wrapAnsi(licenseText || '', 80); return `${line}\n${name}@${version} - ${licenseName}\n${line}\n${body}`; }).join('\n'); }, override: { - 'jquery.are-you-sure@*': { licenseName: 'MIT' }, + 'jquery.are-you-sure@*': {licenseName: 'MIT'}, }, ignore: [ 'font-awesome', From 763664bb41ba817222e59b119df87098b68a2fc8 Mon Sep 17 00:00:00 2001 From: Michael Grigoryan <56165400+michaelgrigoryan25@users.noreply.github.com> Date: Fri, 12 Nov 2021 22:46:11 +0400 Subject: [PATCH 4/7] Fixed a typo --- services/auth/basic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/auth/basic.go b/services/auth/basic.go index 2433c50fca09..33480cb00588 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -50,7 +50,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore } auths := strings.SplitN(baHead, " ", 2) - if len(auths) != 2 || (strings.ToLower(auth[0]) != "basic") { + if len(auths) != 2 || (strings.ToLower(auths[0]) != "basic") { return nil } From ca8c703d115eb1b148ff8d3b0cfd203bfb922599 Mon Sep 17 00:00:00 2001 From: Michael Grigoryan <56165400+michaelgrigoryan25@users.noreply.github.com> Date: Fri, 12 Nov 2021 22:50:50 +0400 Subject: [PATCH 5/7] Updated formatting --- services/auth/basic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/auth/basic.go b/services/auth/basic.go index 33480cb00588..8acbb125cc78 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -51,7 +51,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore auths := strings.SplitN(baHead, " ", 2) if len(auths) != 2 || (strings.ToLower(auths[0]) != "basic") { - return nil + return nil } uname, passwd, _ := base.BasicAuthDecode(auths[1]) From dfb4c1429342fa28130d1dd85ac554c30a104c85 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 12 Nov 2021 14:48:59 -0500 Subject: [PATCH 6/7] Update services/auth/basic.go --- services/auth/basic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/auth/basic.go b/services/auth/basic.go index 8acbb125cc78..00b4bd4fbd5c 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -51,7 +51,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore auths := strings.SplitN(baHead, " ", 2) if len(auths) != 2 || (strings.ToLower(auths[0]) != "basic") { - return nil + return nil } uname, passwd, _ := base.BasicAuthDecode(auths[1]) From 4c7305bfd5488255b0ac44c4a5ae8a7cd4ef5647 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 12 Nov 2021 14:49:32 -0500 Subject: [PATCH 7/7] Update services/auth/basic.go --- services/auth/basic.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/auth/basic.go b/services/auth/basic.go index 00b4bd4fbd5c..d7f889cbdc8e 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -51,7 +51,7 @@ func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore auths := strings.SplitN(baHead, " ", 2) if len(auths) != 2 || (strings.ToLower(auths[0]) != "basic") { - return nil + return nil } uname, passwd, _ := base.BasicAuthDecode(auths[1])