VSinerva/freesewing
1
0
Fork 0
Code Activity

fix(backend): Update callback domain fallback

Browse source
This commit is contained in:
joostdecock 2023-11-04 17:48:46 +01:00
parent 0101930536
commit a9093519c1
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sites/backend/src/config.mjs
View file

@ -257,7 +257,7 @@ if (baseConfig.use.oauth?.github) {
redirectUri: `${ redirectUri: `${
process.env.BACKEND_OAUTH_GITHUB_CALLBACK_SITE process.env.BACKEND_OAUTH_GITHUB_CALLBACK_SITE
? process.env.BACKEND_OAUTH_GITHUB_CALLBACK_SITE ? process.env.BACKEND_OAUTH_GITHUB_CALLBACK_SITE
: 'https://next.freesewing.org' : 'https://freesewing.org'
}/signin/callback/github`, }/signin/callback/github`,
} }
baseConfig.oauth.github.url = (state) => baseConfig.oauth.github.url = (state) =>
@ -279,7 +279,7 @@ if (baseConfig.use.oauth?.google) {
redirectUri: `${ redirectUri: `${
process.env.BACKEND_OAUTH_GOOGLE_CALLBACK_SITE process.env.BACKEND_OAUTH_GOOGLE_CALLBACK_SITE
? process.env.BACKEND_OAUTH_GOOGLE_CALLBACK_SITE ? process.env.BACKEND_OAUTH_GOOGLE_CALLBACK_SITE
: 'https://next.freesewing.org' : 'https://freesewing.org'
}/signin/callback/google`, }/signin/callback/google`,
} }
baseConfig.oauth.google.url = (state) => baseConfig.oauth.google.url = (state) =>

2
sites/backend/src/models/user.mjs
View file

@ -919,7 +919,7 @@ UserModel.prototype.passwordSignIn = async function (req) {
if (Array.isArray(check)) [result, mfaScratchCodes] = check if (Array.isArray(check)) [result, mfaScratchCodes] = check
else result = check else result = check
if (!result) return this.setResponse(401, 'signInFailed') if (!result) return this.setResponse(401, 'signInFailed')
if (mfaScratchCodes.length !== this.clear.data.mfaScratchCodes.length) { if (mfaScratchCodes && mfaScratchCodes.length !== this.clear.data.mfaScratchCodes.length) {
// Scratch code was used, update record to remove it // Scratch code was used, update record to remove it
await this.update({ data: { ...this.clear.data, mfaScratchCodes } }) await this.update({ data: { ...this.clear.data, mfaScratchCodes } })
} }