btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore: revert back environment variable prefixes to VITE_

Browse Source
This commit is contained in:
Andrew Bastin
2023-08-18 19:14:15 +05:30
parent 1c35ea6e65
commit e1cbe6e003
20 changed files with 87 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-backend/src/admin/admin.service.ts
View File

@@ -77,7 +77,7 @@ export class AdminService {
template: 'code-your-own',
variables: {
inviteeEmail: inviteeEmail,
magicLink: `${process.env.APP_BASE_URL}`,
magicLink: `${process.env.VITE_BASE_URL}`,
},
});
} catch (e) {

14
packages/hoppscotch-backend/src/auth/auth.service.ts
View File

@@ -95,9 +95,9 @@ export class AuthService {
*/
private async generateRefreshToken(userUid: string) {
const refreshTokenPayload: RefreshTokenPayload = {
iss: process.env.APP_BASE_URL,
iss: process.env.VITE_BASE_URL,
sub: userUid,
aud: [process.env.APP_BASE_URL],
aud: [process.env.VITE_BASE_URL],
};
const refreshToken = await this.jwtService.sign(refreshTokenPayload, {
@@ -127,9 +127,9 @@ export class AuthService {
*/
async generateAuthTokens(userUid: string) {
const accessTokenPayload: AccessTokenPayload = {
iss: process.env.APP_BASE_URL,
iss: process.env.VITE_BASE_URL,
sub: userUid,
aud: [process.env.APP_BASE_URL],
aud: [process.env.VITE_BASE_URL],
};
const refreshToken = await this.generateRefreshToken(userUid);
@@ -218,14 +218,14 @@ export class AuthService {
let url: string;
switch (origin) {
case Origin.ADMIN:
url = process.env.APP_ADMIN_URL;
url = process.env.VITE_ADMIN_URL;
break;
case Origin.APP:
url = process.env.APP_BASE_URL;
url = process.env.VITE_BASE_URL;
break;
default:
// if origin is invalid by default set URL to Hoppscotch-App
url = process.env.APP_BASE_URL;
url = process.env.VITE_BASE_URL;
}
await this.mailerService.sendEmail(email, {

2
packages/hoppscotch-backend/src/team-invitation/team-invitation.service.ts
View File

@@ -150,7 +150,7 @@ export class TeamInvitationService {
template: 'team-invitation',
variables: {
invitee: creator.displayName ?? 'A Hoppscotch User',
action_url: `${process.env.APP_BASE_URL}/join-team?id=${dbInvitation.id}`,
action_url: `${process.env.VITE_BASE_URL}/join-team?id=${dbInvitation.id}`,
invite_team_name: team.name,
},
});