Skip to content

feat: implementing mobile login #57

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

Closed
wants to merge 3 commits into from
Closed

feat: implementing mobile login #57

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b66142
feat: implementing mobile login
sagoez Mar 4, 2025
de70083
fix: formatting
sagoez Mar 4, 2025
b00e4a5
chore: add isMobile to token response
sagoez Mar 4, 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
30 changes: 21 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 @@ -317,9 +317,13 @@ module.exports = {
type: 'boolean',
optional: true,
},
isMobile: {
type: 'boolean',
optional: true,
}
},
async handler(ctx: any) {
const { type, code, isTerminal = false } = ctx.params;
const { type, code, isTerminal = false, isMobile = false } = ctx.params;

const map = {
github: async (code: any) => {
Expand All @@ -333,10 +337,15 @@ module.exports = {
'Accept-Encoding': 'UTF-8',
},
params: {
client_id: this.getClientId(isTerminal, ctx.meta.isAdmin),
client_id: this.getClientId(
isTerminal,
ctx.meta.isAdmin,
isMobile
),
client_secret: this.getClientSecret(
isTerminal,
ctx.meta.isAdmin
ctx.meta.isAdmin,
isMobile
),
code,
},
Expand Down Expand Up @@ -603,7 +612,7 @@ module.exports = {
lastName,
avatar,
profileLink,
} = await fn(code, isTerminal);
} = await fn(code, isTerminal, isMobile);

if (!email) {
console.debug(
Expand Down Expand Up @@ -667,7 +676,7 @@ module.exports = {
pointers,
});

if (isTerminal) {
if (isTerminal || isMobile) {
const { testKey, liveKey } = await this.createOrGetEventAccessKeys(
token,
pointers
Expand Down Expand Up @@ -770,8 +779,9 @@ module.exports = {
provider: {
async handler(ctx: Context) {
// @ts-ignore
const { provider }: { provider: string } = ctx.params;
const randomNonce = randomCode(10);
const { provider, state }: { provider: string; state: string } =
ctx.params;
const randomNonce = state ?? randomCode(10);

switch (provider.toLowerCase()) {
case 'github':
Expand Down Expand Up @@ -915,12 +925,14 @@ module.exports = {
},

methods: {
getClientSecret(isTerminal: boolean, isAdmin: boolean) {
getClientSecret(isTerminal: boolean, isAdmin: boolean, isMobile: boolean) {
if (isMobile) return process.env.GITHUB_OAUTH_CLIENT_MOBILE_SECRET;
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;
},
getClientId(isTerminal: boolean, isAdmin: boolean) {
getClientId(isTerminal: boolean, isAdmin: boolean, isMobile: boolean) {
if (isMobile) return process.env.GITHUB_OAUTH_CLIENT_MOBILE_ID;
if (isTerminal) return process.env.GITHUB_OAUTH_CLIENT_CLI_ID;
if (isAdmin) return process.env.ADMIN_GITHUB_OAUTH_CLIENT_ID;
return process.env.GITHUB_OAUTH_CLIENT_ID;
Expand Down