Skip to content

v1.5.3 #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2024
Merged

v1.5.3 #637

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eddf70f
Update googleauth.js
prafull-opensignlabs Apr 23, 2024
2cc5517
Merge pull request #636 from OpenSignLabs/prafull-opensignlabs-patch-7
nxglabs Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions apps/OpenSignServer/cloud/customRoute/googleauth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ const serverUrl = process.env.SERVER_URL;
export default async function gooogleauth(request, response) {
const code = request.body.code;
const baseUrl = new URL(process.env.SERVER_URL);
// const sessiontoken = request.headers;
// console.log('sessiontoken', sessiontoken);
// console.log('google code', code);

try {
const userRes = await axios.get(serverUrl + '/users/me', {
headers: {
Expand All @@ -16,9 +14,10 @@ export default async function gooogleauth(request, response) {
});
const userId = userRes.data && userRes.data.objectId;
if (userId) {
const clientId = process.env.GOOGLE_CLIENT_ID; // '918704711393-thhv3re2pfqvve76tgb86ulu1tlpssrk.apps.googleusercontent.com';
const clientSecret = process.env.GOOGLE_CLIENT_SECRET; //'3NqyXVNm4jUhwNE4D8eVosII';
const redirectUri = baseUrl.origin || 'http://localhost:3000'; // Should match the redirect URI used in the authorization request
const clientId = process.env.GOOGLE_CLIENT_ID;
const clientSecret = process.env.GOOGLE_CLIENT_SECRET;
const redirectUri =
baseUrl?.hostname === 'localhost' ? 'http://localhost:3000' : baseUrl.origin; // Should match the redirect URI used in the authorization request
const tokenEndpoint = 'https://oauth2.googleapis.com/token';

const params = new URLSearchParams();
Expand All @@ -42,12 +41,16 @@ export default async function gooogleauth(request, response) {
const updateExtUser = await extUserCls.save(null, { useMasterKey: true });
// console.log('updateExtUser ', updateExtUser);
}
return response.status(200).json({ status: 'success!' });
return response.status(200).json({ status: 'success' });
} else {
return response.status(404).json({ message: 'user not found!' });
}
} catch (err) {
console.log('err in google auth', err.message);
return response.status(404).json({ message: err.message });
console.log('err in google auth', err);
if (err?.response?.data?.error) {
return response.status(404).json({ message: err.response.data.error });
} else {
return response.status(404).json({ message: err.message });
}
}
}