Merge pull request #95 from authorizerdev/smtp-improvements

Improve smtp variable names

.dockerignore

@@ -6,4 +6,6 @@ README.md
 ROADMAP.md
 build
 .env
-data.db
+data.db
+app/node_modules
+app/build

.github/workflows/release.yaml

@@ -8,26 +8,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '^1.17.3'
       - name: Install dependencies
         run: |
           sudo apt-get install build-essential wget zip gcc-mingw-w64 && \
-          sudo apt-get remove --auto-remove golang-go && \
-          sudo rm -rf /usr/bin/go &&\
-          wget --progress=dot:mega https://golang.org/dl/go1.17.1.linux-amd64.tar.gz -O go-linux.tar.gz && \
-          sudo tar -zxf go-linux.tar.gz && \
-          sudo mv go /usr/bin/ && \
-          sudo mkdir -p /go/bin /go/src /go/pkg && \
-          export GO_HOME=/usr/bin/go && \
-          export GOPATH=/go && \
-          export PATH=${GOPATH}/bin:${GO_HOME}/bin/:$PATH && \
-          echo "/usr/bin/go/bin" >> $GITHUB_PATH
-          echo "/usr/bin/x86_64-w64-mingw32-gcc" >> GITHUB_PATH
-          go version && \
+          echo "/usr/bin/x86_64-w64-mingw32-gcc" >> GITHUB_PATH && \
           wget --no-check-certificate --progress=dot:mega https://github.com/wangyoucao577/assets-uploader/releases/download/v0.3.0/github-assets-uploader-v0.3.0-linux-amd64.tar.gz -O github-assets-uploader.tar.gz && \
           tar -zxf github-assets-uploader.tar.gz && \
           sudo mv github-assets-uploader /usr/sbin/ && \
           sudo rm -f github-assets-uploader.tar.gz && \
-          github-assets-uploader -version
+          github-assets-uploader -version && \
+          make build-app
       - name: Print Go paths
         run: whereis go
       - name: Print Go Version

.gitignore

@@ -2,6 +2,7 @@ server/server
 server/.env
 data
 app/node_modules
+app/build
 build
 .env
 data.db

Dockerfile

@@ -1,5 +1,5 @@
-FROM golang:1.17-alpine as builder
-WORKDIR /app
+FROM golang:1.17-alpine as go-builder
+WORKDIR /authorizer
 COPY server server
 COPY Makefile .
 
@@ -7,15 +7,22 @@ ARG VERSION="latest"
 ENV VERSION="$VERSION"
 
 RUN echo "$VERSION"
-RUN apk add build-base nodejs &&\
+RUN apk add build-base &&\
     make clean && make && \
     chmod 777 build/server
 
-FROM alpine:latest
-RUN apk --no-cache add ca-certificates
-WORKDIR /root/
+FROM node:17-alpine3.12 as node-builder
+WORKDIR /authorizer
 COPY app app
+COPY Makefile .
+RUN apk add build-base &&\
+    make build-app
+
+FROM alpine:latest
+WORKDIR /root/
+RUN mkdir app
+COPY --from=node-builder /authorizer/app/build app/build
+COPY --from=go-builder /authorizer/build build
 COPY templates templates
-COPY --from=builder /app/build build
 EXPOSE 8080
 CMD [ "./build/server" ]

Makefile

@@ -3,6 +3,8 @@ VERSION := $(or $(VERSION),$(DEFAULT_VERSION))
 
 cmd:
 	cd server && go build -ldflags "-w -X main.VERSION=$(VERSION)" -o '../build/server'
+build-app:
+	cd app && npm i && npm run build
 clean:
 	rm -rf build
 test:

app/build/bundle.css

@@ -1,16 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  color: #374151;
-  font-size: 14px;
-}
-
-*,
-*:before,
-*:after {
-  box-sizing: inherit;
-}

app/esbuild.config.js

@@ -0,0 +1,11 @@
+const __is_prod__ = process.env.NODE_ENV === 'production';
+require('esbuild').build({
+	entryPoints: ['src/index.tsx'],
+	chunkNames: '[name]-[hash]',
+	bundle: true,
+	minify: __is_prod__,
+	outdir: 'build',
+	splitting: true,
+	format: 'esm',
+	watch: !__is_prod__,
+});

app/package.json

@@ -4,13 +4,14 @@
 	"description": "",
 	"main": "index.js",
 	"scripts": {
-		"build": "esbuild src/index.tsx --bundle --minify --sourcemap --outfile=build/bundle.js"
+		"build": "rm -rf build && NODE_ENV=production node ./esbuild.config.js",
+		"start": "NODE_ENV=development node ./esbuild.config.js"
 	},
 	"keywords": [],
 	"author": "Lakhan Samani",
 	"license": "ISC",
 	"dependencies": {
-		"@authorizerdev/authorizer-react": "^0.3.0",
+		"@authorizerdev/authorizer-react": "latest",
 		"@types/react": "^17.0.15",
 		"@types/react-dom": "^17.0.9",
 		"esbuild": "^0.12.17",

app/src/Root.tsx

@@ -1,9 +1,10 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, lazy, Suspense } from 'react';
 import { Switch, Route } from 'react-router-dom';
 import { useAuthorizer } from '@authorizerdev/authorizer-react';
-import Dashboard from './pages/dashboard';
-import Login from './pages/login';
-import ResetPassword from './pages/rest-password';
+
+const ResetPassword = lazy(() => import('./pages/rest-password'));
+const Login = lazy(() => import('./pages/login'));
+const Dashboard = lazy(() => import('./pages/dashboard'));
 
 export default function Root() {
 	const { token, loading, config } = useAuthorizer();
@@ -24,22 +25,26 @@ export default function Root() {
 
 	if (token) {
 		return (
-			<Switch>
-				<Route path="/app" exact>
-					<Dashboard />
-				</Route>
-			</Switch>
+			<Suspense fallback={<></>}>
+				<Switch>
+					<Route path="/app" exact>
+						<Dashboard />
+					</Route>
+				</Switch>
+			</Suspense>
 		);
 	}
 
 	return (
-		<Switch>
-			<Route path="/app" exact>
-				<Login />
-			</Route>
-			<Route path="/app/reset-password">
-				<ResetPassword />
-			</Route>
-		</Switch>
+		<Suspense fallback={<></>}>
+			<Switch>
+				<Route path="/app" exact>
+					<Login />
+				</Route>
+				<Route path="/app/reset-password">
+					<ResetPassword />
+				</Route>
+			</Switch>
+		</Suspense>
 	);
 }

app/src/index.css

@@ -0,0 +1,16 @@
+body {
+	margin: 0;
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+		'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+		sans-serif;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	color: #374151;
+	font-size: 14px;
+}
+
+*,
+*:before,
+*:after {
+	box-sizing: inherit;
+}

app/src/index.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';
+import './index.css';
 
 ReactDOM.render(<App />, document.getElementById('root'));

app/src/pages/rest-password.tsx

@@ -2,11 +2,11 @@ import React, { Fragment } from 'react';
 import { AuthorizerResetPassword } from '@authorizerdev/authorizer-react';
 
 export default function ResetPassword() {
-  return (
-    <Fragment>
-      <h1 style={{ textAlign: 'center' }}>Reset Password</h1>
-      <br />
-      <AuthorizerResetPassword />
-    </Fragment>
-  );
+	return (
+		<Fragment>
+			<h1 style={{ textAlign: 'center' }}>Reset Password</h1>
+			<br />
+			<AuthorizerResetPassword />
+		</Fragment>
+	);
 }

scripts/build-mac.sh

@@ -1,5 +1,5 @@
 VERSION="$1"
-make clean && CGO_ENABLED=1 VERSION=${VERSION} make
+make clean && make build-app && CGO_ENABLED=1 VERSION=${VERSION} make
 FILE_NAME=authorizer-${VERSION}-darwin-amd64.tar.gz
 tar cvfz ${FILE_NAME} .env app/build build templates
 AUTH="Authorization: token $GITHUB_TOKEN"

server/constants/constants.go

@@ -11,8 +11,9 @@ var (
 	DATABASE_NAME                = ""
 	SMTP_HOST                    = ""
 	SMTP_PORT                    = ""
+	SMTP_USERNAME                = ""
+	SMTP_PASSWORD                = ""
 	SENDER_EMAIL                 = ""
-	SENDER_PASSWORD              = ""
 	JWT_TYPE                     = ""
 	JWT_SECRET                   = ""
 	ALLOWED_ORIGINS              = []string{}
@@ -26,6 +27,7 @@ var (
 	DISABLE_EMAIL_VERIFICATION   = false
 	DISABLE_BASIC_AUTHENTICATION = false
 	DISABLE_MAGIC_LINK_LOGIN     = false
+	DISABLE_LOGIN_PAGE           = false
 
 	// ROLES
 	ROLES           = []string{}

server/email/email.go

@@ -27,11 +27,11 @@ type Sender struct {
 }
 
 func NewSender() Sender {
-	return Sender{User: constants.SENDER_EMAIL, Password: constants.SENDER_PASSWORD}
+	return Sender{User: constants.SMTP_USERNAME, Password: constants.SMTP_PASSWORD}
 }
 
 func (sender Sender) SendMail(Dest []string, Subject, bodyMessage string) error {
-	msg := "From: " + sender.User + "\n" +
+	msg := "From: " + constants.SENDER_EMAIL + "\n" +
 		"To: " + strings.Join(Dest, ",") + "\n" +
 		"Subject: " + Subject + "\n" + bodyMessage
 

server/env/env.go

@@ -94,12 +94,16 @@ func InitEnv() {
 		constants.SMTP_PORT = os.Getenv("SMTP_PORT")
 	}
 
-	if constants.SENDER_EMAIL == "" {
-		constants.SENDER_EMAIL = os.Getenv("SENDER_EMAIL")
+	if constants.SMTP_USERNAME == "" {
+		constants.SMTP_USERNAME = os.Getenv("SMTP_USERNAME")
 	}
 
-	if constants.SENDER_PASSWORD == "" {
-		constants.SENDER_PASSWORD = os.Getenv("SENDER_PASSWORD")
+	if constants.SMTP_PASSWORD == "" {
+		constants.SMTP_PASSWORD = os.Getenv("SMTP_PASSWORD")
+	}
+
+	if constants.SENDER_EMAIL == "" {
+		constants.SENDER_EMAIL = os.Getenv("SENDER_EMAIL")
 	}
 
 	if constants.JWT_SECRET == "" {
@@ -172,8 +176,9 @@ func InitEnv() {
 	constants.DISABLE_BASIC_AUTHENTICATION = os.Getenv("DISABLE_BASIC_AUTHENTICATION") == "true"
 	constants.DISABLE_EMAIL_VERIFICATION = os.Getenv("DISABLE_EMAIL_VERIFICATION") == "true"
 	constants.DISABLE_MAGIC_LINK_LOGIN = os.Getenv("DISABLE_MAGIC_LINK_LOGIN") == "true"
+	constants.DISABLE_LOGIN_PAGE = os.Getenv("DISABLE_LOGIN_PAGE") == "true"
 
-	if constants.SMTP_HOST == "" || constants.SENDER_EMAIL == "" || constants.SENDER_PASSWORD == "" {
+	if constants.SMTP_HOST == "" || constants.SMTP_USERNAME == "" || constants.SMTP_PASSWORD == "" || constants.SENDER_EMAIL == "" {
 		constants.DISABLE_EMAIL_VERIFICATION = true
 		constants.DISABLE_MAGIC_LINK_LOGIN = true
 	}

server/main.go

@@ -32,14 +32,17 @@ func main() {
 
 	router := router.InitRouter()
 
-	// login wall app related routes.
+	// login page app related routes.
 	// if we put them in router file then tests would fail as templates or build path will be different
-	router.LoadHTMLGlob("templates/*")
-	app := router.Group("/app")
-	{
-		app.Static("/build", "app/build")
-		app.GET("/", handlers.AppHandler())
-		app.GET("/reset-password", handlers.AppHandler())
+	if !constants.DISABLE_LOGIN_PAGE {
+		router.LoadHTMLGlob("templates/*")
+		app := router.Group("/app")
+		{
+			app.Static("/build", "app/build")
+			app.GET("/", handlers.AppHandler())
+			app.GET("/reset-password", handlers.AppHandler())
+		}
 	}
+
 	router.Run(":" + constants.PORT)
 }

templates/app.tmpl

@@ -5,13 +5,13 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Document</title>
-    <link rel="stylesheet" href="/app/build/bundle.css">
+    <link rel="stylesheet" href="/app/build/index.css">
     <script>
      window.__authorizer__ = {{.data}}
     </script>
   </head>
   <body>
     <div id="root"></div>
-    <script src="/app/build/bundle.js"></script>
+    <script type="module" src="/app/build/index.js"></script>
   </body>
-</html>
+</html>