Troubleshoot import issue

.github/workflows/ci-pr.yml

@@ -18,4 +18,5 @@ jobs:
         uses: UseKeyp/publish-pr-packages@v1.0.0
         with:
           token: ${{ secrets.PAT }}
+          registry: npm
 

.yarnrc.yml

@@ -1,17 +1,13 @@
-# Yarn's manifest file. You can configure yarn here.
-# See https://yarnpkg.com/configuration/yarnrc.
-
-# For `node_modules` (see `nodeLinker` below), this is almost always the preferred option.
 compressionLevel: 0
 
 enableGlobalCache: true
 
-# Lets yarn use hardlinks inside `node_modules` to dedupe packages.
-# For a more pnpm-like experience, consider `hardlinks-global` where hardlinks point to a global store.
 nmMode: hardlinks-local
 
-# How to install Node packages.
-# Heads up: right now, Redwood expects this to be `node-modules`.
 nodeLinker: node-modules
 
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+
 yarnPath: .yarn/releases/yarn-3.2.3.cjs

api/package.json

@@ -1,15 +1,15 @@
 {
   "name": "api",
-  "version": "0.1.1",
+  "version": "0.1.2-alpha.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "^3.7.1",
-    "@redwoodjs/graphql-server": "^3.7.1",
+    "@redwoodjs/api": "^3.8.0",
+    "@redwoodjs/graphql-server": "^3.8.0",
     "@sentry/node": "^7.24.2",
     "@sentry/tracing": "^7.24.2",
     "express": "^4.18.2",
-    "oauth2-server-redwood": "^0.1.1",
+    "oauth2-server-redwood": "^0.1.2-alpha.0",
     "pkce-challenge": "^3.0.0",
-    "serverless-http": "^3.1.0"
+    "serverless-http": "^3.1.1"
   }
 }

lerna.json

@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useWorkspaces": true,
-  "version": "0.1.1"
+  "version": "0.1.2-alpha.0"
 }

package.json

@@ -8,8 +8,8 @@
     ]
   },
   "devDependencies": {
-    "@redwoodjs/core": "^3.7.1",
-    "lerna": "^6.2.0"
+    "@redwoodjs/core": "^3.8.0",
+    "lerna": "^6.4.0"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",

packages/oauth2-server/README.md

@@ -63,7 +63,7 @@ export const handler = serverless(
 
 3. Setup an Nginx proxy. I've included `oauth2-server-redwood.conf` which removes the prefix and serves the endpoint from `localhost/oauth` instead of `localhost/api/oauth`. Oidc-provider does not always adhere to the `/api` path prefix when setting cookie path, or my implementation is incorrect. If you you can help solve this, please let me know!
 
-4. Setup dbAuth and update the graphql schema. Copy the schema here or see [`oauth2-client-redwood`][oauth2-client-redwood].
+4. Setup dbAuth and update the graphql schema. Copy the schema here, which includes the needed models for both authentication and `Client`.
 
 ```bash
 yarn rw setup auth dbAuth

packages/oauth2-server/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oauth2-server-redwood",
-  "version": "0.1.1",
+  "version": "0.1.2-alpha.0",
   "description": "",
-  "module": "dist/index.js",
-  "main": "dist/index.js",
+  "main": "src/index",
+  "type": "module",
   "include": "dist/views",
   "scripts": {
     "build": "babel src -d dist --copy-files",
@@ -12,13 +12,14 @@
   "dependencies": {
     "deepmerge": "^4.2.2",
     "express": "^4.18.2",
-    "oidc-provider": "^7.14.3"
+    "oidc-provider": "^8.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.20.5",
-    "@babel/node": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
+    "@babel/cli": "^7.20.7",
+    "@babel/core": "^7.20.12",
+    "@babel/node": "^7.20.7",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-typescript": "^7.18.6",
     "nodemon": "^2.0.20"
   },
   "author": "",

packages/oauth2-server/src/index.js

@@ -4,13 +4,11 @@ import path from 'path'
 import bodyParser from 'body-parser'
 import express from 'express'
 import fetch from 'node-fetch'
+import Provider from 'oidc-provider'
 
 import { getConfig } from './config'
 import { dbAuthSession } from './shared'
 
-// const cors = require('cors')
-const Provider = require('oidc-provider')
-
 const app = (db, settings) => {
   assert(settings.SECURE_KEY, 'settings.SECURE_KEY missing')
   assert.equal(

packages/oauth2-server/src/jwks.js

@@ -1,4 +1,4 @@
-module.exports = {
+const jwks = {
   keys: [
     {
       crv: 'P-256',
@@ -34,3 +34,4 @@ module.exports = {
     },
   ],
 }
+export default jwks

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "0.1.0",
+  "version": "0.1.2-alpha.0",
   "private": true,
   "browserslist": {
     "development": [
@@ -13,13 +13,13 @@
     ]
   },
   "dependencies": {
-    "@redwoodjs/auth": "^3.7.1",
-    "@redwoodjs/forms": "^3.7.1",
-    "@redwoodjs/router": "^3.7.1",
-    "@redwoodjs/web": "^3.7.1",
+    "@redwoodjs/auth": "^3.8.0",
+    "@redwoodjs/forms": "^3.8.0",
+    "@redwoodjs/router": "^3.8.0",
+    "@redwoodjs/web": "^3.8.0",
     "prop-types": "15.8.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-spring": "^9.5.5"
+    "react-spring": "^9.6.1"
   }
 }