ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed DISABLE_LOGIN from middleware.

pull/1219/head
Mike Cao 2022-06-22 02:28:23 -07:00
parent 0f37c17cb5
commit 5a5a278d9e
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
next.config.js
View File

@ -3,7 +3,8 @@ const pkg = require('./package.json');
module.exports = { module.exports = {
env: { env: {
VERSION: pkg.version, version: pkg.version,
loginDisabled: process.env.DISABLE_LOGIN,
}, },
basePath: process.env.BASE_PATH, basePath: process.env.BASE_PATH,
experimental: { experimental: {

9
pages/_middleware.js
View File

@ -15,13 +15,6 @@ function customScriptName(req) {
} }
} }
function disableLogin(req) {
console.log(process.env, process.env.DISABLE_LOGIN);
if (process.env.DISABLE_LOGIN && req.nextUrl.pathname.endsWith('/login')) {
return new Response('Login is disabled', { status: 403 });
}
}
function forceSSL(req, res) { function forceSSL(req, res) {
if (process.env.FORCE_SSL && req.nextUrl.protocol === 'http:') { if (process.env.FORCE_SSL && req.nextUrl.protocol === 'http:') {
res.headers.set('Strict-Transport-Security', 'max-age=31536000; includeSubDomains'); res.headers.set('Strict-Transport-Security', 'max-age=31536000; includeSubDomains');
@ -31,7 +24,7 @@ function forceSSL(req, res) {
} }
export function middleware(req) { export function middleware(req) {
const fns = [customScriptName, disableLogin]; const fns = [customScriptName];
for (const fn of fns) { for (const fn of fns) {
const res = fn(req); const res = fn(req);

2
pages/login.js
View File

@ -3,7 +3,7 @@ import Layout from 'components/layout/Layout';
import LoginForm from 'components/forms/LoginForm'; import LoginForm from 'components/forms/LoginForm';
export default function LoginPage() { export default function LoginPage() {
if (process.env.DISABLE_LOGIN) { if (process.env.loginDisabled) {
return null; return null;
} }

2
store/version.js
View File

@ -7,7 +7,7 @@ import { getItem } from 'lib/web';
const REPO_URL = 'https://api.umami.is/v1/updates'; const REPO_URL = 'https://api.umami.is/v1/updates';
const initialState = { const initialState = {
current: process.env.VERSION, current: process.env.version,
latest: null, latest: null,
hasUpdate: false, hasUpdate: false,
}; };