Merge branch 'release-2.1.2' into develop

catarak · catarak · commit d8c4ca60ef77 · 2021-11-04T12:32:33.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",
diff --git a/server/config/passport.js b/server/config/passport.js
@@ -208,7 +208,7 @@ passport.use(
     {
       clientID: process.env.GOOGLE_ID,
       clientSecret: process.env.GOOGLE_SECRET,
-      callbackURL: '/auth/google/callback',
+      callbackURL: 'https://editor.p5js.org/auth/google/callback',
       passReqToCallback: true,
       scope: ['openid email']
     },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "p5.js-web-editor",`
`3`		`- "version": "2.1.0",`
	`3`	`+ "version": "2.1.2",`
`4`	`4`	`"description": "The web editor for p5.js.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"clean": "rimraf dist",`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ passport.use(`
`208`	`208`	`{`
`209`	`209`	`clientID: process.env.GOOGLE_ID,`
`210`	`210`	`clientSecret: process.env.GOOGLE_SECRET,`
`211`		`- callbackURL: '/auth/google/callback',`
	`211`	`+ callbackURL: 'https://editor.p5js.org/auth/google/callback',`
`212`	`212`	`passReqToCallback: true,`
`213`	`213`	`scope: ['openid email']`
`214`	`214`	`},`