Merge branch 'main' of github.com:FieldDB/AuthenticationWebService into test/install

Author: cesine

.eslintrc.js

@@ -0,0 +1,36 @@
+# Basic `dependabot.yml` file with
+# minimum configuration for three package managers
+
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: "npm"
+    # Look for `package.json` and `lock` files in the `root` directory
+    directory: "/"
+    # Check the npm registry for updates every day (weekdays)
+    schedule:
+      interval: "daily"
+    groups:
+      default:
+        patterns:
+          - "*"
+
+  # Enable version updates for Docker
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `root` directory
+    directory: "/"
+    # Check for updates once a week
+    schedule:
+      interval: "weekly"
+
+  # Enable version updates for GitHub Actions
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the default location of `.github/workflows`
+    # You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      default:
+        patterns:
+          - "*"

.github/dependabot.yml

@@ -0,0 +1,23 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'FieldDB/AuthenticationWebService'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        # if: contains(steps.metadata.outputs.dependency-names, 'my-dependency') && steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/auto-merge.yml

@@ -13,6 +13,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Build the Docker image
       run: "echo 'module.exports = { usersDbConnection: { url: \"http://localhost:5984\" }};' > config/local.js && docker build . --file Dockerfile --tag fielddb-auth:$(date +%s)"

.github/workflows/docker-image.yml

@@ -10,19 +10,19 @@ on:
     branches: [ main ]
 
 jobs:
-  build:
+  ci:
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [12.x, 16.x]
+        node-version: [24.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v6
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
@@ -35,6 +35,24 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
 
-    - run: DEBUG='none' npm run docker:test
+    - name: Create local config for tests
+      run: |
+        echo 'module.exports = { usersDbConnection: { url: "http://localhost:5984" }};' > config/local.js
+
+    - name: Start docker compose services
+      run: docker compose up -d && sleep 5
+
+    - name: Show docker compose logs
+      run: docker compose logs --no-color --timestamps || true
+
+    - name: Run setup
+      run: npm run setup
+      env:
+        SOURCE_URL: ${{ secrets.SOURCE_URL }}
+        DEBUG: 'none'
+
+    - name: Run tests
+      run: npm run test:deprecated
       env:
         SOURCE_URL: ${{ secrets.SOURCE_URL }}
+        DEBUG: 'none'

.github/workflows/node.js.yml

@@ -9,6 +9,7 @@ config/production.*
 config/local.*
 etc
 Dockerfile-couchdb
+db
 
 # Ignore natural lib
 public/libs/natural/

.gitignore

@@ -1,4 +1,4 @@
-FROM node:12
+FROM node:24
 
 # Create app directory
 WORKDIR /usr/src/app

Dockerfile

@@ -0,0 +1,14 @@
+FROM couchdb:3.5.1
+
+WORKDIR /
+
+COPY etc/* /opt/couchdb/etc/
+
+RUN set +x; \
+  curl -X PUT http://admin:none@127.0.0.1:5984/_users; \
+  curl -X PUT http://admin:none@127.0.0.1:5984/_replicator; \
+  ls -alt /opt/couchdb/etc; \
+  cat /opt/couchdb/etc/local.ini; \
+  ls /opt/couchdb/etc/local.d;
+
+# COPY fielddb_debug.* /usr/local/etc/couchdb

Dockerfile-couchdb

@@ -30,18 +30,18 @@ Edit your /etc/hosts to add an entry for example.org:
 127.0.0.1       corpusdev.example.org
 ```
 
-Turn on your local couchdb and make sure it is running on http://127.0.0.1:5984/_utils Record tests by adding `.only` on the tests you wish to record:
+Turn on your local couchdb and make sure it is running on http://127.0.0.1:5984/_utils Record tests by adding `.only` on the tests which show the error "refused: not recording and no network access":
 
 ```bash
-$ DEBUG=*user*,*nock*,*replay* REPLAY=record npm test
+$ SOURCE_URL:-https://public:none@corpusdev.other.org DEBUG=*user*,*nock*,*replay* REPLAY=record npm test
 ```
 
 As a result you should see a directory corresponding to the server, and files with-in it representing the requests:
 
 ```bash
 $ tree test/fixtures/
 test/fixtures/
-└── corpusdev.example.org-5984
+└── corpusdev.other.org-5984
     └── 154417467505825257
 ```
 
@@ -53,6 +53,25 @@ To run tests against the local instance:
 $ URL=https://localhost:3183 npm test
 ```
 
+### Running tests against a local couchdb
+
+```bash
+$ npm run docker:test
+```
+
+Turn off the docker container
+```bash
+$ docker compose stop
+$ docker compose rm -f
+```
+
+Exec into the docker container
+
+```bash
+$ docker container list
+$ docker exec -it cda63fa5d348 /bin/bash
+```
+
 ## Release History
 * v1.16  mongoose auth & everyauth
 * v1.32  switched to couchdb

README.md

@@ -19,7 +19,6 @@ const favicon = require('serve-favicon');
 const path = require('path');
 
 /* Load modules provided by this codebase */
-const authenticationMiddleware = require('./middleware/authentication');
 const authWebServiceRoutes = require('./routes/routes');
 const { errorHandler } = require('./middleware/error-handler');
 const deprecatedRoutes = require('./routes/deprecated');
@@ -62,10 +61,6 @@ debug(`Accepting api version ${apiVersion}`);
 /**
  * Middleware
  */
-// The example attaches it to the express
-// https://github.com/oauthjs/express-oauth-server#quick-start
-// service.oauth = oauthMiddleware;
-authWebService.use(authenticationMiddleware.jwt);
 
 authWebService.use(favicon(path.join(__dirname, '/public/favicon.ico')));
 authWebService.use(bunyan({
@@ -105,12 +100,6 @@ authWebService.options('*', (req, res) => {
   }
 });
 
-authWebService.use('/bower_components', express.static(path.join(__dirname,
-  '/public/components/as-ui-auth/bower_components')));
-authWebService.use('/authentication', authenticationMiddleware.redirectAuthenticatedUser, express.static(path.join(__dirname, '/public/components/as-ui-auth/components')));
-authWebService.use('/authentication/register', authenticationMiddleware.redirectAuthenticatedUser,
-  express.static(path.join(__dirname, '/public/components/as-ui-auth/components/signup')));
-
 /**
  * Set up all the available URL authWebServiceRoutes see routes/routes.js for more details
  */