Skip to content
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

fix: client secret for cli app #53

Merged
merged 2 commits into from
Feb 26, 2025
Merged

fix: client secret for cli app #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68880d0
fix: client secret for cli app
sagojez Feb 25, 2025
8e1a069
fix: typos
sagojez Feb 26, 2025
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
24 changes: 15 additions & 9 deletions apps/event-system/services/users/users.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,10 @@ module.exports = {
client_id: ctx.meta.isAdmin
? process.env.ADMIN_GITHUB_OAUTH_CLIENT_ID
: process.env.GITHUB_OAUTH_CLIENT_ID,
client_secret: ctx.meta.isAdmin
? process.env.ADMIN_GITHUB_OAUTH_CLIENT_SECRET
: process.env.GITHUB_OAUTH_CLIENT_SECRET,
client_secret: this.getClientSecret(
isTerminal,
ctx.meta.isAdmin
),
code,
},
decompress: false,
Expand Down Expand Up @@ -400,7 +401,7 @@ module.exports = {
console.error(error.response.headers);

throw new MoleculerError(
'Error occured trying to retrieve github user info',
'Error occurred trying to retrieve github user info',
500,
'github-user-retrieval'
);
Expand Down Expand Up @@ -435,7 +436,7 @@ module.exports = {
console.error(error.response.headers);

throw new MoleculerError(
'Error occured trying to retrieve github user emails',
'Error occurred trying to retrieve github user emails',
500,
'github-user-emails-retrieval'
);
Expand Down Expand Up @@ -506,7 +507,7 @@ module.exports = {
get(
accessTokenResult,
'error.response.data.error_description'
) || `Error occured calling https://gitlab.com/oauth/token`;
) || `Error occurred calling https://gitlab.com/oauth/token`;

throw new MoleculerError(
message,
Expand Down Expand Up @@ -542,7 +543,7 @@ module.exports = {
console.error(error.response.headers);

throw new MoleculerError(
'Error occured trying to retrieve gitlab user info',
'Error occurred trying to retrieve gitlab user info',
500,
'github-user-retrieval'
);
Expand Down Expand Up @@ -772,14 +773,14 @@ module.exports = {
async handler(ctx: Context) {
// @ts-ignore
const { provider }: { provider: string } = ctx.params;
const randomNonce = randomCode(10);
const randomNonce = randomCode(10);

switch (provider.toLowerCase()) {
case 'github':
// @ts-ignore
ctx.meta.$statusCode = 303;
// @ts-ignore
ctx.meta.$location = `https://github.com/login/oauth/authorize?client_id=${process.env.GITHUB_OAUTH_CLIENT_ID}&state=${randomNonce}&scope=read:user user:email`;
ctx.meta.$location = `https://github.com/login/oauth/authorize?client_id=${process.env.GITHUB_OAUTH_CLIENT_CLI_ID}&state=${randomNonce}&scope=read:user user:email`;
break;
default:
throw new AuthGenericError();
Expand Down Expand Up @@ -916,6 +917,11 @@ module.exports = {
},

methods: {
getClientSecret(isTerminal: boolean, isAdmin: boolean) {
if (isTerminal) return process.env.GITHUB_OAUTH_CLIENT_CLI_SECRET;
if (isAdmin) return process.env.ADMIN_GITHUB_OAUTH_CLIENT_SECRET;
return process.env.GITHUB_OAUTH_CLIENT_SECRET;
},
async createOrUpdateUser({
ctx,
provider,
Expand Down