diff --git a/.github/workflows/publish.yml b/.forgejo/workflows/publish.yml similarity index 84% rename from .github/workflows/publish.yml rename to .forgejo/workflows/publish.yml index 082ef9b..d277eb4 100644 --- a/.github/workflows/publish.yml +++ b/.forgejo/workflows/publish.yml @@ -7,17 +7,13 @@ on: jobs: publish: - runs-on: ubuntu-latest + runs-on: default steps: # Checkout the repository - name: Checkout code uses: actions/checkout@v3 - # Set up NPM Auth Token - - name: Set up NPM Auth Token - run: echo "NODE_AUTH_TOKEN=${{ secrets.NPM_TOKEN }}" >> $GITHUB_ENV - # Set up NPM Auth Token - name: Set up NPM Auth Token run: echo "NODE_AUTH_TOKEN=${{ secrets.NPM_TOKEN }}" >> $GITHUB_ENV @@ -77,10 +73,18 @@ jobs: - name: Commit Version Change (if needed) if: steps.version_check.outputs.version_changed == 'true' run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" + # Update remote URL to use the GITHUB_TOKEN for authentication + git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@git.bridgemanaccessible.ca/${{ github.repository }}.git + + # Setup git user details for committing the version change + git config user.name "Forgejo Actions" + git config user.email "actions@git.bridgemanaccessible.ca" + + # Commit the version change to the `package.json` file git add package.json - git commit -m "[Github Actions] Update version to ${{ env.new_version }}" + git commit -m "[Forgejo Actions] Update version to ${{ env.new_version }}" + + # Push the changes to the repository git push origin HEAD:main # Publish to private NPM registry diff --git a/package.json b/package.json index 6c2d082..0bd8d22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@BridgemanAccessible/ba-web-framework", - "version": "1.0.6", + "version": "1.0.10", "description": "A framework for web apps built atop Node, Express and other libraries and utilties that makes creating and maintaining Bridgeman Accessible web apps easier.", "author": "Bridgeman Accessible { + console.log(`Adding outside framework route: ${route}`); app.getInitializer().getRouter().addOutsideFrameworkRoute(route); }); } diff --git a/src/controllers/index.ts b/src/controllers/index.ts index a96f133..ee5ea83 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -1,3 +1,4 @@ import { BaseController } from './BaseController'; +import { ErrorController } from './ErrorController'; -export { BaseController }; \ No newline at end of file +export { BaseController, ErrorController }; \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index f3214ad..f3775e0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,13 +3,15 @@ import { Initializer } from './Initializer'; import { Router } from './Router'; import { Renderer } from './Renderer'; import { StaticFileResolver } from './StaticFileResolver'; +import { OAuthApp } from './OAuthApp'; export { App, Initializer, Router, Renderer, - StaticFileResolver + StaticFileResolver, + OAuthApp }; export * from './controllers'; export * from './decorators';