Merge pull request #5 from leaonline/fix-urlsearchparams

Fix URLSearchParams (and tests)

Author: jankapunkt

.github/workflows/tests.yml

@@ -56,5 +56,6 @@ jobs:
         run: |
           cd test-proxy
           meteor npm install
+          meteor npm run setup
           meteor npm run lint
           meteor npm run test

HISTORY.md

@@ -1,5 +1,24 @@
 # History
 
+## 4.2.1
+- this is a patch release, fixing a syntax error 
+  (that never got picked up, due to wrong linter config)
+  
+### Code fixes
+
+- fix(core): standard lint fixed
+- fix(core): oauth.js fix wrong syntax error in import
+  
+### Dev fixes
+  
+- fix(ci): run npm setup before lint and test to link package
+- fix(build): remove .coverage from git 
+  (URLSearchParam missing s at the end)
+- fix(tests): test project linter settings fixed
+- fix(ci): remove dependencies from single job
+- update(ci): test workflow update to use test project
+
+
 ## 4.2.0
 - updated `@node-oauth/oauth2-server` to `4.2.0`
 - correctly setup coverage for test project and package

lib/model/meteor-model.js

@@ -8,7 +8,6 @@ export const collections = {
   AuthCodes: undefined
 }
 
-
 /**
  * @private used by OAuthMeteorModel.prototype.getAccessToken
  */

lib/oauth.js

@@ -23,7 +23,7 @@ import { OptionsSchema } from './validation/OptionsSchema'
 import { app } from './webapp'
 import { errorHandler } from './utils/error'
 import { Random } from 'meteor/random'
-import { URLSearchParam } from 'url'
+import { URLSearchParams } from 'url'
 import { secureHandler } from './middleware/secureHandler'
 
 // oauth
@@ -259,7 +259,8 @@ const initRoutes = (self, { accessTokenUrl = '/oauth/token', authorizeUrl = '/oa
       const that = this
       try {
         handler.call(that, req, res, next)
-      } catch (unknownException) {
+      }
+      catch (unknownException) {
         const state = req && req.query && req.query.state
         errorHandler(res, {
           error: 'server_error',
@@ -349,7 +350,8 @@ const initRoutes = (self, { accessTokenUrl = '/oauth/token', authorizeUrl = '/oa
 
     if (req.body.allowed === 'false') {
       Meteor.users.update(id, { $pull: { 'oauth.authorizedClients': client.clientId } })
-    } else {
+    }
+    else {
       Meteor.users.update(id, { $addToSet: { 'oauth.authorizedClients': client.clientId } })
     }
 
@@ -452,4 +454,4 @@ const initRoutes = (self, { accessTokenUrl = '/oauth/token', authorizeUrl = '/oa
       debug: self.debug
     })
   })
-}
+}

lib/utils/bind.js

@@ -1,4 +1,4 @@
-import { Meteor } from "meteor/meteor"
+import { Meteor } from 'meteor/meteor'
 
 /**
  * Binds a function to the Meteor environment and Fiber

lib/utils/console.js

@@ -1,4 +1,4 @@
-const name = `[OAuth2Server]`
+const name = '[OAuth2Server]'
 
 const getHandler = type => {
   const target = console[type]
@@ -15,4 +15,4 @@ const error = getHandler('error')
  * A wrapper for console-based logs
  * @type {{log: function, info: function, debug: function, warn: function, error: function}}
  */
-export {log, info, debug, warn, error }
+export { log, info, debug, warn, error }

lib/validation/requiredAccessTokenPostParams.js

@@ -1,4 +1,4 @@
-import { Match } from "meteor/check"
+import { Match } from 'meteor/check'
 import { nonEmptyString } from './nonEmptyString'
 
 const isNonEmptyString = Match.Where(nonEmptyString)

lib/validation/requiredAuthorizeGetParams.js

@@ -1,4 +1,4 @@
-import { Match } from "meteor/check"
+import { Match } from 'meteor/check'
 import { nonEmptyString } from './nonEmptyString'
 
 const isNonEmptyString = Match.Where(nonEmptyString)

lib/validation/requiredAuthorizePostParams.js

@@ -1,4 +1,4 @@
-import { Match } from "meteor/check"
+import { Match } from 'meteor/check'
 import { nonEmptyString } from './nonEmptyString'
 
 const isNonEmptyString = Match.Where(nonEmptyString)

lib/validation/validateParams.js

@@ -10,7 +10,8 @@ export const validateParams = (actualParams, requiredParams, debug) => {
     try {
       check(actual, expected) // use console.log(requiredParamKey, actual, expected)
       return true
-    } catch (e) {
+    }
+    catch (e) {
       if (debug) {
         console.error(`[validation error]: key <${requiredParamKey}> => expected <${expected}>, got <${actual}>`)
       }