Merge pull request #1427 from solid/newToken

jaxoncreed · web-flow · commit 602231da8349 · 2020-06-16T13:40:11.000-04:00
Support for new token (NSS)
diff --git a/bin/lib/start.js b/bin/lib/start.js
@@ -58,6 +58,10 @@ function bin (argv, server) {
     delete argv['emailAuthPass']
   }
 
+  if (!argv.tokenTypesSupported) {
+    argv.tokenTypesSupported = ['legacyPop', 'dpop']
+  }
+
   // Set up --no-*
   argv.live = !argv.noLive
 
diff --git a/lib/api/authn/webid-oidc.js b/lib/api/authn/webid-oidc.js
@@ -33,7 +33,7 @@ function initialize (app, argv) {
 
   // Perform the actual authentication
   app.use('/', async (req, res, next) => {
-    oidc.rs.authenticate()(req, res, (err) => {
+    oidc.rs.authenticate({ tokenTypesSupported: argv.tokenTypesSupported })(req, res, (err) => {
       // Error handling should be deferred to the ldp in case a user with a bad token is trying
       // to access a public resource
       if (err) {
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ function bin (argv, server) {`
`58`	`58`	`delete argv['emailAuthPass']`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ if (!argv.tokenTypesSupported) {`
	`62`	`+ argv.tokenTypesSupported = ['legacyPop', 'dpop']`
	`63`	`+ }`
	`64`	`+`
`61`	`65`	`// Set up --no-*`
`62`	`66`	`argv.live = !argv.noLive`
`63`	`67`