6 Commits

Author SHA1 Message Date
42f091489e Who knows what happens next...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-05 18:14:20 -04:00
995dd9a015 A whole new world...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-05 11:22:26 -04:00
5b0c9ba72d Escape the interpolation
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-05 11:14:31 -04:00
d745869cc0 Last bits to make it whole again...
Some checks are pending
continuous-integration/drone/push Build is running
2023-05-05 11:10:13 -04:00
e6389d8b9b More tweaks... 2023-05-05 11:05:18 -04:00
47f1bdf485 More path fixes...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-05 10:56:33 -04:00
12 changed files with 113 additions and 44 deletions

View File

@@ -87,7 +87,7 @@ steps:
from_secret: registry_username
password:
from_secret: registry_password
registry: https://git.mifi.dev
registry: https://git.mifi.dev/api/packages/mifi/npm
token:
- from_secret: gitea_token
volumes:
@@ -109,19 +109,29 @@ steps:
- success
- failure
- name: Publish Image
image: plugins/docker
settings:
auto_tag: true
squash: true
repo: git.mifi.dev/mifi/auth
context: mifi
registry: git.mifi.dev
username:
from_secret: registry_username
password:
from_secret: registry_password
ssh-agent-key:
from_secret: gitea_token
image: docker
commands:
- docker build -f docker-compose.staging.yml -t git.mifi.dev/mifi/mifi/auth:latest .
- docker push git.mifi.dev/mifi/mifi/auth:latest
volumes:
- name: dockersock
path: /var/run/docker.sock
- name: dockerconfig
path: /drone/grow/.docker/config.json
# - name: Publish Image
# image: plugins/docker
# settings:
# auto_tag: true
# squash: true
# repo: git.mifi.dev/mifi/auth
# context: mifi
# registry: git.mifi.dev
# username:
# from_secret: registry_username
# password:
# from_secret: registry_password
# ssh-agent-key:
# from_secret: gitea_token
volumes:
- name: dockersock
path: /var/run/docker.sock
@@ -152,7 +162,7 @@ volumes:
path: /var/run/docker.sock
- name: npmrc
host:
path: /volume1/docker/grow/labs-auth/.npmrc
path: /volume1/docker/beethoven/labs-auth/.npmrc
depends_on:
- Test Pipeline
@@ -177,10 +187,10 @@ steps:
image: docker
privileged: true
commands:
- docker compose pull
- docker compose build --no-cache
- docker compose rm --stop
- docker compose up --wait
- docker compose -f docker-compose.staging.yml pull
- docker compose -f docker-compose.staging.yml build --no-cache
- docker compose -f docker-compose.staging.yml rm --stop
- docker compose -f docker-compose.staging.yml up --wait
volumes:
- name: env
path: /drone/grow/.env

View File

@@ -23,4 +23,6 @@ WORKDIR /home/node/app
COPY package*.json ./
RUN yarn install --frozen-lockfile --production
COPY --from=0 /home/node/app/dist .
EXPOSE 9001
EXPOSE 27017
CMD ["node","server/index.js"]

12
dev.env
View File

@@ -1,4 +1,4 @@
HOST=grow.mifi.dev
HOST=localhost
PORT=9001
ROUTE_PREFIX=/auth
@@ -6,20 +6,26 @@ ROUTE_PREFIX=/auth
LOGIN_ROUTE=/login
RESET_ROUTE=/reset
DB_ADMIN_USERNAME=root
DB_ADMIN_PASSWORD=password
DB_USERNAME=user
DB_PASSWORD=password
DB_NAME=auth
MONGO_INITDB_ROOT_USERNAME=$DB_ADMIN_USERNAME
MONGO_INITDB_ROOT_PASSWORD=$DB_ADMIN_PASSWORD
MONGO_INITDB_DATABASE=$DB_NAME
SESSION_KEY=shjhakjfhfjdshjksdhfdshfhfduyeyb73te4
JWT_AUDIENCE=Grow.io
JWT_ISSUER=Grow Latch
JWT_SECRET='Th!sIs a d3v3lopm3nt server $#cr¢T.'
JWT_SECRET=Th!sIs a d3v3lopm3nt server SEcr¢T.
LOGIN_VALID_TIME=12H
RESET_VALID_MINUTES=15
DEFAULT_TOKEN_DAYS=1
CONTAINER_PREFIX=grow
CONTAINER_PREFIX=dev
SERVICE_NAME=auth-service
DB_TYPE=mongo

34
docker-compose.dev.yml Normal file
View File

@@ -0,0 +1,34 @@
version: '3.8'
services:
auth-service_mongo:
env_file: dev.env
container_name: ${CONTAINER_PREFIX:-dev}-auth-service_mongo
ports:
- 27017:27017
networks:
- docknet
volumes:
# - /var/tmp/labs:/data/db
- ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
restart: unless-stopped
image: mongo:latest
auth-service:
env_file: dev.env
build: .
container_name: ${CONTAINER_PREFIX:-dev}-auth-service
ports:
- 9000:9000
environment:
- DB_HOST=${CONTAINER_PREFIX:-dev}-auth-service_mongo
networks:
- docknet
restart: unless-stopped
image: node:20-alpine
links:
- auth-service_mongo:${CONTAINER_PREFIX:-dev}-auth-service_mongo
depends_on:
- auth-service_mongo
networks:
docknet:
name: docknet

View File

@@ -2,7 +2,7 @@ version: '3.8'
services:
auth-service_mongo:
container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
container_name: ${CONTAINER_PREFIX}-auth-service_mongo
env_file: .env
environment:
- ALLOW_EMPTY_PASSWORD=yes
@@ -18,15 +18,15 @@ services:
auth-service:
env_file: .env
build: .
container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}
container_name: ${CONTAINER_PREFIX}-auth-service
environment:
- PORT=${PORT}
- ROUTE_PREFIX=${ROUTE_PREFIX}
- LOGIN_ROUTE=${LOGIN_ROUTE}
- RESET_ROUTE=${RESET_ROUTE}
- DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
- DB_USER=${DB_USERNAME}
- DB_PASS=${DB_PASSWORD}
- DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
- DB_USERNAME=${DB_USERNAME}
- DB_PASSWORD=${DB_PASSWORD}
- DB_NAME=${DB_NAME}
- SESSION_KEY=${SESSION_KEY}
- JWT_AUDIENCE=${JWT_AUDIENCE}
@@ -41,14 +41,14 @@ services:
- 'traefik.http.routers.grow.entrypoints=websecure'
- 'traefik.http.routers.grow.tls=true'
- 'traefik.http.routers.grow.tls.certresolver=letsencrypt'
- 'traefik.http.routers.grow.service=gitea'
- 'traefik.http.services.gitea.loadbalancer.server.port=${PORT}'
- 'traefik.http.routers.grow.service=grow-service'
- 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}'
networks:
- docknet
restart: unless-stopped
image: node
links:
- auth-service_mongo:${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
- auth-service_mongo:${CONTAINER_PREFIX}-auth-service_mongo
depends_on:
- auth-service_mongo
networks:

View File

@@ -1,5 +1,5 @@
export const DB_HOST = process.env.DB_HOST || 'mongodb';
export const DB_HOST = process.env.DB_HOST || 'not_set';
export const DB_PORT = process.env.DB_PORT || 27017;
export const DB_USER = process.env.DB_USER || 'test';
export const DB_PASS = process.env.DB_PASSWORD || 'test';
export const DB_NAME = process.env.DB_NAME || 'auth';
export const DB_USERNAME = process.env.DB_USERNAME || 'not_set';
export const DB_PASSWORD = process.env.DB_PASSWORD || 'not_set';
export const DB_NAME = process.env.DB_NAME || 'not_set';

View File

@@ -1,4 +1,4 @@
export const PACKAGE_NAME = '@mifi/latch';
export const PACKAGE_NAME = '@mifi/auth';
export const PORT = process.env.PORT || 9000;
export const SESSION_KEY = process.env.SESSION_KEY || 'secret-key';

View File

@@ -1,5 +1,5 @@
import mongoose from 'mongoose';
import { DB_HOST, DB_NAME, DB_PASS, DB_PORT, DB_USER } from '../constants/db';
import { DB_HOST, DB_NAME, DB_PASSWORD, DB_PORT, DB_USERNAME } from '../constants/db';
export const connection = mongoose.connect(`mongodb://${DB_USER}:${DB_PASS}@${DB_HOST}:${DB_PORT}/${DB_NAME}`);
export const connection = mongoose.connect(`mongodb://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}`);

View File

@@ -11,6 +11,12 @@ import { ErrorCodes, getErrorBody } from '../../constants/errors';
const routerOpts: Router.IRouterOptions = { prefix };
const router: Router = new Router(routerOpts);
router.get('/info', (ctx) => {
ctx.body = {
service: process.env.SERVICE_NAME,
};
});
router.post('/', async (ctx) => {
const data = (await Auth.create(ctx.body)).save();
ctx.body = { success: true, data: { ...data, strategies: undefined } };

View File

@@ -1,12 +1,11 @@
import dotenv from 'dotenv';
import app from './app';
import { connection } from '../db';
import { PORT } from '../constants/env';
dotenv.config();
connection.then(
() => app.listen(PORT),
(err) => console.error('ERROR!', err),
() => {
app.listen(PORT);
console.log('LISTENING', process.env);
},
(err) => console.error('SERVER ERROR!', { err, env: process.env }),
);

12
mongo-init.js Normal file
View File

@@ -0,0 +1,12 @@
/* eslint-disable no-undef */
db = db.getSiblingDB(process.env.DB_NAME || 'not_set');
db.createUser({
user: process.env.DB_USERNAME,
pwd: process.env.DB_PASSWORD,
roles: [
{
role: 'readWrite',
db: process.env.DB_NAME,
},
],
});

View File

@@ -1,6 +1,6 @@
{
"name": "@mifi/auth",
"version": "0.0.19",
"version": "0.0.25",
"author": "mifi (Mike Fitzpatrick)",
"license": "MIT",
"scripts": {