AmineTMIRI/frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove free trial

Browse Source
This commit is contained in:
MuslemRahimi 2024-09-14 18:00:53 +02:00
parent bb434b0d1f
commit da6af0c032
1 changed files with 57 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/routes/oauth/+server.ts
View File

@ -1,60 +1,60 @@
import { redirect } from '@sveltejs/kit'; import { redirect } from "@sveltejs/kit";
export const config = { export const config = {
runtime: 'nodejs20.x', runtime: "nodejs20.x",
}; };
export const GET = async ({locals, url, cookies}) => { export const GET = async ({ locals, url, cookies }) => {
//console.log(url.searchParams); //console.log(url.searchParams);
const redirectURL = `${url.origin}/oauth`; const redirectURL = `${url.origin}/oauth`;
//const expectedState = cookies.get('state'); //const expectedState = cookies.get('state');
//const expectedVerifier = cookies.get('verifier'); //const expectedVerifier = cookies.get('verifier');
let newUser; let newUser;
let expectedState = cookies?.get('state'); let expectedState = cookies?.get("state");
let expectedVerifier = cookies?.get('verifier'); let expectedVerifier = cookies?.get("verifier");
let providerSelected = cookies?.get('provider'); let providerSelected = cookies?.get("provider");
const state = await url.searchParams.get("state");
const code = await url.searchParams.get("code");
const state = await url.searchParams.get('state'); //console.log('returned state',state)
const code = await url.searchParams.get('code'); //console.log('returned code',code)
//console.log('returned state',state) //as a side effect this will generate a new code verifier, hence why we need to pass the verifier back in through the cookie
//console.log('returned code',code) const authMethods = await locals.pb?.collection("users")?.listAuthMethods();
//as a side effect this will generate a new code verifier, hence why we need to pass the verifier back in through the cookie if (!authMethods?.authProviders) {
const authMethods = await locals.pb?.collection('users')?.listAuthMethods(); console.log("No Auth Providers");
redirect(301, "/register");
}
const targetItem = authMethods.authProviders.findIndex(
(item) => item.name === providerSelected
);
const provider = authMethods.authProviders[targetItem];
if (!authMethods?.authProviders) { if (!provider) {
console.log('No Auth Providers'); console.log("Provider Not Found");
redirect(301, '/register'); redirect(301, "/register");
} }
const targetItem = authMethods.authProviders.findIndex(item => item.name === providerSelected); if (expectedState !== state) {
const provider = authMethods.authProviders[targetItem]; console.log("Returned State Does not Match Expected", expectedState, state);
redirect(301, "/register");
}
if (!provider) { try {
console.log('Provider Not Found'); //console.log(provider)
redirect(301, '/register');
}
if (expectedState !== state) { newUser = await locals.pb
console.log('Returned State Does not Match Expected', expectedState, state); ?.collection("users")
redirect(301, '/register'); .authWithOAuth2Code(provider.name, code, expectedVerifier, redirectURL);
}
try { //oauthUsername = generateUsername(newUser['meta']['name'].split(' ').join('')).toLowerCase();
//console.log(provider)
newUser = await locals.pb?.collection('users') // Check if user was created or existed already
.authWithOAuth2Code(provider.name, code, expectedVerifier, redirectURL); /*
//oauthUsername = generateUsername(newUser['meta']['name'].split(' ').join('')).toLowerCase();
// Check if user was created or existed already
if(newUser?.meta?.isNew === true) { if(newUser?.meta?.isNew === true) {
await locals.pb?.collection('users').update( await locals.pb?.collection('users').update(
newUser['record']['id'], { newUser['record']['id'], {
@ -62,25 +62,20 @@ export const GET = async ({locals, url, cookies}) => {
'tier': 'Pro', //Give new users a free trial for the Pro Subscription 'tier': 'Pro', //Give new users a free trial for the Pro Subscription
}); });
} }
*/
} catch (err) {
console.log("Error logging in with OAuth2 user", err);
redirect(302, "/register");
}
if (cookies?.get("path")) {
redirect(301, cookies?.get("path"));
} else {
redirect(301, "/");
}
//Login user automatically
} catch (err) { //const avatarUrl = newUser['meta']['avatarUrl'];
console.log('Error logging in with OAuth2 user', err); //console.log(avatarUrl);
redirect(302, "/register");
}
if(cookies?.get('path')) {
redirect(301, cookies?.get('path'));
} else {
redirect(301,"/");
}
//Login user automatically
//const avatarUrl = newUser['meta']['avatarUrl'];
//console.log(avatarUrl);
}; };