Compare commits
2 Commits
feat/seed
...
fix/sh-ema
| Author | SHA1 | Date | |
|---|---|---|---|
|
bc562e547e | ||
|
|
e9c9dc19bf |
@@ -38,7 +38,7 @@
|
||||
},
|
||||
"packageExtensions": {
|
||||
"httpsnippet@3.0.1": {
|
||||
"dependencies": {
|
||||
"peerDependencies": {
|
||||
"ajv": "6.12.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
{
|
||||
"name": "hoppscotch-backend",
|
||||
"version": "2024.3.3",
|
||||
"version": "2024.3.1",
|
||||
"description": "",
|
||||
"author": "",
|
||||
"private": true,
|
||||
"license": "UNLICENSED",
|
||||
"prisma": {
|
||||
"seed": "ts-node prisma/seed.ts"
|
||||
},
|
||||
"scripts": {
|
||||
"prebuild": "rimraf dist",
|
||||
"build": "nest build",
|
||||
@@ -69,7 +66,6 @@
|
||||
"rxjs": "7.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@faker-js/faker": "8.4.1",
|
||||
"@nestjs/cli": "10.2.1",
|
||||
"@nestjs/schematics": "10.0.3",
|
||||
"@nestjs/testing": "10.2.7",
|
||||
|
||||
@@ -1,444 +0,0 @@
|
||||
import { faker } from '@faker-js/faker';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
const prisma = new PrismaClient();
|
||||
|
||||
const createUsersAndAccounts = async (
|
||||
entries = 10,
|
||||
withDedicateUsers: { email: string; isAdmin: boolean }[] = [],
|
||||
) => {
|
||||
const createAUser = async (email?, isAdmin?) => {
|
||||
try {
|
||||
const newUser = await prisma.user.create({
|
||||
data: {
|
||||
displayName: faker.person.fullName(),
|
||||
email: email ?? faker.internet.email().toLowerCase(),
|
||||
photoURL: faker.image.avatar(),
|
||||
isAdmin: isAdmin ?? false,
|
||||
},
|
||||
});
|
||||
|
||||
await prisma.account.create({
|
||||
data: {
|
||||
userId: newUser.uid,
|
||||
provider: 'magic',
|
||||
providerAccountId: newUser.email,
|
||||
},
|
||||
});
|
||||
} catch (e) {
|
||||
console.log('Error creating user/account:', e.message);
|
||||
}
|
||||
};
|
||||
|
||||
for (let i = 0; i < withDedicateUsers.length; i++) {
|
||||
const user = withDedicateUsers[i];
|
||||
await createAUser(user.email.toLowerCase(), user.isAdmin);
|
||||
}
|
||||
for (let i = 0; i < entries - withDedicateUsers.length; i++) {
|
||||
await createAUser();
|
||||
}
|
||||
|
||||
console.log('Users created');
|
||||
};
|
||||
|
||||
const createInvitedUsers = async (entries = 10) => {
|
||||
try {
|
||||
const admin = await prisma.user.findFirst({ where: { isAdmin: true } });
|
||||
|
||||
for (let i = 0; i < entries; i++) {
|
||||
await prisma.invitedUsers.create({
|
||||
data: {
|
||||
adminUid: admin.uid,
|
||||
adminEmail: admin.email,
|
||||
inviteeEmail: faker.internet.email().toLowerCase(),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
console.log('Invited users created');
|
||||
} catch (e) {
|
||||
console.log('Error creating invited users:', e.message);
|
||||
}
|
||||
};
|
||||
|
||||
const createUserCollections = async (
|
||||
parentCollEntries = 10,
|
||||
childCollEntriesOnEachParent = 10,
|
||||
) => {
|
||||
const createACollection = async (userUid, parentID, orderIndex) => {
|
||||
return prisma.userCollection.create({
|
||||
data: {
|
||||
parentID,
|
||||
title: faker.vehicle.vehicle(),
|
||||
orderIndex,
|
||||
type: 'REST',
|
||||
userUid,
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
try {
|
||||
const users = await prisma.user.findMany();
|
||||
|
||||
for (let u = 0; u < users.length; u++) {
|
||||
const user = users[u];
|
||||
|
||||
for (let i = 0; i < parentCollEntries; i++) {
|
||||
const parentCollection = await createACollection(user.uid, null, i + 1);
|
||||
|
||||
for (let j = 0; j < childCollEntriesOnEachParent; j++) {
|
||||
await createACollection(user.uid, parentCollection.id, j + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
console.log('User collections created');
|
||||
} catch (e) {
|
||||
console.log('Error creating user collections:', e.message);
|
||||
}
|
||||
};
|
||||
|
||||
const createUserRequests = async (entriesPerCollection = 10) => {
|
||||
try {
|
||||
const collections = await prisma.userCollection.findMany();
|
||||
|
||||
for (let i = 0; i < collections.length; i++) {
|
||||
const collection = collections[i];
|
||||
|
||||
for (let j = 0; j < entriesPerCollection; j++) {
|
||||
const requestTitle = faker.git.branch();
|
||||
|
||||
await prisma.userRequest.create({
|
||||
data: {
|
||||
collectionID: collection.id,
|
||||
userUid: collection.userUid,
|
||||
title: requestTitle,
|
||||
request: {
|
||||
v: '4',
|
||||
auth: { authType: 'inherit', authActive: true },
|
||||
body: { body: null, contentType: null },
|
||||
name: requestTitle,
|
||||
method: 'GET',
|
||||
params: [],
|
||||
headers: [],
|
||||
endpoint: 'https://echo.hoppscotch.io',
|
||||
testScript: '',
|
||||
preRequestScript: '',
|
||||
requestVariables: [],
|
||||
},
|
||||
type: collection.type,
|
||||
orderIndex: j + 1,
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
console.log('User requests created');
|
||||
} catch (e) {
|
||||
console.log('Error creating user requests:', e.message);
|
||||
}
|
||||
};
|
||||
|
||||
const createUserEnvironments = async () => {
|
||||
try {
|
||||
const users = await prisma.user.findMany();
|
||||
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
const user = users[i];
|
||||
|
||||
const environments = await prisma.userEnvironment.findMany({
|
||||
where: { userUid: user.uid },
|
||||
});
|
||||
if (environments.length > 1) continue; // skip if already created. (assuming default GLOBAL environments are created by APP itself)
|
||||
|
||||
await prisma.userEnvironment.createMany({
|
||||
data: [
|
||||
{
|
||||
userUid: user.uid,
|
||||
name: 'production',
|
||||
variables: [
|
||||
{
|
||||
key: 'product_id',
|
||||
value: faker.number.int({ max: 1000 }),
|
||||
secret: false,
|
||||
},
|
||||
],
|
||||
isGlobal: false,
|
||||
},
|
||||
{
|
||||
userUid: user.uid,
|
||||
name: 'development',
|
||||
variables: [
|
||||
{
|
||||
key: 'product_id',
|
||||
value: faker.number.int({ max: 1000 }),
|
||||
secret: false,
|
||||
},
|
||||
],
|
||||
isGlobal: false,
|
||||
},
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
console.log('User environments created');
|
||||
} catch (e) {
|
||||
console.log('Error creating user environment:', e.message);
|
||||
}
|
||||
};
|
||||
|
||||
const createTeamsAndTeamMembers = async (
|
||||
entries = 10,
|
||||
memberCountInATeam = 4,
|
||||
) => {
|
||||
const createATeam = async (ownerUid) => {
|
||||
return prisma.team.create({
|
||||
data: {
|
||||
name: faker.airline.airplane().name,
|
||||
members: { create: { userUid: ownerUid, role: 'OWNER' } },
|
||||
},
|
||||
});
|
||||
};
|
||||
const createATeamMember = async (teamID, userUid) => {
|
||||
try {
|
||||
return prisma.teamMember.create({
|
||||
data: {
|
||||
teamID,
|
||||
userUid,
|
||||
role: +faker.number.binary() === 1 ? 'EDITOR' : 'VIEWER',
|
||||
},
|
||||
});
|
||||
} catch (e) {
|
||||
console.log(e.message);
|
||||
}
|
||||
};
|
||||
|
||||
try {
|
||||
const users = await prisma.user.findMany();
|
||||
|
||||
for (let i = 0; i < entries; i++) {
|
||||
const ownerIndex = faker.number.int({ min: 0, max: users.length - 1 });
|
||||
const team = await createATeam(users[ownerIndex].uid); // create a team with owner
|
||||
|
||||
for (let j = 0; j < Math.min(memberCountInATeam, users.length) - 1; ) {
|
||||
const memberIndex = faker.number.int({ min: 0, max: users.length - 1 });
|
||||
|
||||
// check if user already added
|
||||
const existingTeamMember = await prisma.teamMember.findFirst({
|
||||
where: {
|
||||
teamID: team.id,
|
||||
userUid: users[memberIndex].uid,
|
||||
},
|
||||
});
|
||||
if (existingTeamMember) continue;
|
||||
|
||||
await createATeamMember(team.id, users[memberIndex].uid);
|
||||
|
||||
j++;
|
||||
}
|
||||
}
|
||||
|
||||
console.log('Teams and TeamMembers created');
|
||||
} catch (e) {
|
||||
console.log('Error creating teams and team members:', e.message);
|
||||
}
|
||||
};
|
||||
|
||||
const createTeamEnvironments = async () => {
|
||||
try {
|
||||
const teams = await prisma.team.findMany();
|
||||
|
||||
for (let i = 0; i < teams.length; i++) {
|
||||
const team = teams[i];
|
||||
|
||||
const environments = await prisma.teamEnvironment.findMany({
|
||||
where: { teamID: team.id },
|
||||
});
|
||||
if (environments.length > 1) continue; // skip if already created. (assuming default GLOBAL environments are created by APP itself)
|
||||
|
||||
await prisma.teamEnvironment.createMany({
|
||||
data: [
|
||||
{
|
||||
teamID: team.id,
|
||||
name: 'team_env_production',
|
||||
variables: [
|
||||
{
|
||||
key: 'category_id',
|
||||
value: faker.number.int({ max: 1000 }).toString(),
|
||||
secret: false,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
teamID: team.id,
|
||||
name: 'team_env_development',
|
||||
variables: [
|
||||
{
|
||||
key: 'category_id',
|
||||
value: faker.number.int({ max: 1000 }).toString(),
|
||||
secret: false,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
}
|
||||
|
||||
console.log('Team environments created');
|
||||
} catch (e) {
|
||||
console.log('Error creating team environments: ', e.message);
|
||||
}
|
||||
};
|
||||
|
||||
const createTeamCollections = async (
|
||||
parentCollEntries = 10,
|
||||
childCollEntriesOnEachParent = 10,
|
||||
) => {
|
||||
const createACollection = async (teamID, parentID, orderIndex) => {
|
||||
return prisma.teamCollection.create({
|
||||
data: { parentID, title: faker.vehicle.vehicle(), orderIndex, teamID },
|
||||
});
|
||||
};
|
||||
|
||||
try {
|
||||
const teams = await prisma.team.findMany();
|
||||
|
||||
for (let t = 0; t < teams.length; t++) {
|
||||
const team = teams[t];
|
||||
|
||||
for (let i = 0; i < parentCollEntries; i++) {
|
||||
const parentCollection = await createACollection(team.id, null, i + 1);
|
||||
|
||||
for (let j = 0; j < childCollEntriesOnEachParent; j++) {
|
||||
await createACollection(team.id, parentCollection.id, j + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
console.log('Team collections created');
|
||||
} catch (e) {
|
||||
console.log('Error creating team collection:', e.message);
|
||||
}
|
||||
};
|
||||
|
||||
const createTeamRequests = async (entriesPerCollection = 10) => {
|
||||
try {
|
||||
const collections = await prisma.teamCollection.findMany();
|
||||
|
||||
for (let i = 0; i < collections.length; i++) {
|
||||
const collection = collections[i];
|
||||
|
||||
for (let j = 0; j < entriesPerCollection; j++) {
|
||||
const requestTitle = faker.git.branch();
|
||||
await prisma.teamRequest.create({
|
||||
data: {
|
||||
collectionID: collection.id,
|
||||
teamID: collection.teamID,
|
||||
title: requestTitle,
|
||||
request: {
|
||||
v: '4',
|
||||
auth: { authType: 'inherit', authActive: true },
|
||||
body: { body: null, contentType: null },
|
||||
name: requestTitle,
|
||||
method: 'GET',
|
||||
params: [],
|
||||
headers: [],
|
||||
endpoint: 'https://echo.hoppscotch.io',
|
||||
testScript: '',
|
||||
preRequestScript: '',
|
||||
requestVariables: [],
|
||||
},
|
||||
orderIndex: j + 1,
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
console.log('Team requests created');
|
||||
} catch (e) {
|
||||
console.log('Error creating team requests:', e.message);
|
||||
}
|
||||
};
|
||||
|
||||
async function createShortcodes(entriesPerUser = 2) {
|
||||
try {
|
||||
const users = await prisma.user.findMany();
|
||||
|
||||
for (let i = 0; i < users.length; i++) {
|
||||
const user = users[i];
|
||||
|
||||
for (let j = 0; j < entriesPerUser; j++) {
|
||||
const userRequests = await prisma.userRequest.findMany({
|
||||
where: { userUid: user.uid },
|
||||
take: entriesPerUser,
|
||||
});
|
||||
|
||||
let shortCodeRequestObj = {
|
||||
v: '4',
|
||||
id: userRequests[j].id,
|
||||
auth: { authType: 'inherit', authActive: true },
|
||||
body: { body: null, contentType: null },
|
||||
name: 'driver-hack',
|
||||
method: 'GET',
|
||||
params: [],
|
||||
headers: [],
|
||||
endpoint: 'https://echo.hoppscotch.io',
|
||||
testScript: '',
|
||||
preRequestScript: '',
|
||||
requestVariables: [],
|
||||
};
|
||||
|
||||
await prisma.shortcode.create({
|
||||
data: {
|
||||
id: faker.string.alphanumeric(12),
|
||||
creatorUid: user.uid,
|
||||
request: shortCodeRequestObj,
|
||||
embedProperties: null,
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
console.log('Shortcodes created');
|
||||
} catch (e) {
|
||||
console.log('Error creating shortcodes:', e.message);
|
||||
}
|
||||
}
|
||||
|
||||
async function clearAllData() {
|
||||
try {
|
||||
// Get all model names
|
||||
const modelNames = Object.keys(prisma).filter(
|
||||
(str) => !str.startsWith('_') && !str.startsWith('$'),
|
||||
);
|
||||
|
||||
// Iterate through each model and delete all data
|
||||
for (let i = 0; i < modelNames.length; i++) {
|
||||
await prisma[modelNames[i]].deleteMany({});
|
||||
}
|
||||
|
||||
console.log('All data cleared');
|
||||
} catch (e) {
|
||||
console.log('Error in clearing data:', e.message);
|
||||
}
|
||||
}
|
||||
|
||||
(async () => {
|
||||
await clearAllData();
|
||||
|
||||
await createUsersAndAccounts(2, [
|
||||
{ email: 'admin@gmail.com', isAdmin: true },
|
||||
{ email: 'user@gmail.com', isAdmin: false },
|
||||
]);
|
||||
await createInvitedUsers(10);
|
||||
// `userSettings` can be created by APP itself
|
||||
await createUserCollections(10, 10);
|
||||
await createUserRequests(10);
|
||||
// `userHistory` can be created by APP itself
|
||||
await createUserEnvironments();
|
||||
await createShortcodes(3);
|
||||
await createTeamsAndTeamMembers(10, 4);
|
||||
// `teamInvitation` can be created by APP itself
|
||||
await createTeamEnvironments();
|
||||
await createTeamCollections(5, 5);
|
||||
await createTeamRequests(3);
|
||||
})();
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"extends": "./tsconfig.json",
|
||||
"exclude": ["node_modules", "test", "dist", "**/*spec.ts", "prisma/seed.ts"]
|
||||
"exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
|
||||
}
|
||||
|
||||
@@ -374,8 +374,7 @@
|
||||
"mutations": "Mutations",
|
||||
"schema": "Schema",
|
||||
"subscriptions": "Subscriptions",
|
||||
"switch_connection": "Switch connection",
|
||||
"url_placeholder": "Enter a GraphQL endpoint URL"
|
||||
"switch_connection": "Switch connection"
|
||||
},
|
||||
"graphql_collections": {
|
||||
"title": "GraphQL Collections"
|
||||
@@ -599,7 +598,6 @@
|
||||
"title": "Request",
|
||||
"type": "Request type",
|
||||
"url": "URL",
|
||||
"url_placeholder": "Enter a URL or paste a cURL command",
|
||||
"variables": "Variables",
|
||||
"view_my_links": "View my links"
|
||||
},
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@hoppscotch/common",
|
||||
"private": true,
|
||||
"version": "2024.3.3",
|
||||
"version": "2024.3.1",
|
||||
"scripts": {
|
||||
"dev": "pnpm exec npm-run-all -p -l dev:*",
|
||||
"test": "vitest --run",
|
||||
@@ -50,7 +50,7 @@
|
||||
"axios": "1.6.2",
|
||||
"buffer": "6.0.3",
|
||||
"cookie-es": "1.0.0",
|
||||
"dioc": "3.0.1",
|
||||
"dioc": "1.0.1",
|
||||
"esprima": "4.0.1",
|
||||
"events": "3.3.0",
|
||||
"fp-ts": "2.16.1",
|
||||
|
||||
@@ -32,7 +32,6 @@ declare module 'vue' {
|
||||
AppSpotlightEntryRESTHistory: typeof import('./components/app/spotlight/entry/RESTHistory.vue')['default']
|
||||
AppSpotlightEntryRESTRequest: typeof import('./components/app/spotlight/entry/RESTRequest.vue')['default']
|
||||
AppSpotlightEntryRESTTeamRequestEntry: typeof import('./components/app/spotlight/entry/RESTTeamRequestEntry.vue')['default']
|
||||
AppSpotlightSearch: typeof import('./components/app/SpotlightSearch.vue')['default']
|
||||
AppSupport: typeof import('./components/app/Support.vue')['default']
|
||||
Collections: typeof import('./components/collections/index.vue')['default']
|
||||
CollectionsAdd: typeof import('./components/collections/Add.vue')['default']
|
||||
|
||||
@@ -54,7 +54,9 @@
|
||||
:key="tab.id"
|
||||
:label="tab.label"
|
||||
>
|
||||
<div class="divide-y divide-dividerLight">
|
||||
<div
|
||||
class="divide-y divide-dividerLight rounded border border-divider"
|
||||
>
|
||||
<HoppSmartPlaceholder
|
||||
v-if="tab.variables.length === 0"
|
||||
:src="`/images/states/${colorMode.value}/blockchain.svg`"
|
||||
|
||||
@@ -56,7 +56,9 @@
|
||||
:key="tab.id"
|
||||
:label="tab.label"
|
||||
>
|
||||
<div class="divide-y divide-dividerLight">
|
||||
<div
|
||||
class="divide-y divide-dividerLight rounded border border-divider"
|
||||
>
|
||||
<HoppSmartPlaceholder
|
||||
v-if="tab.variables.length === 0"
|
||||
:src="`/images/states/${colorMode.value}/blockchain.svg`"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
autocomplete="off"
|
||||
spellcheck="false"
|
||||
class="w-full rounded border border-divider bg-primaryLight px-4 py-2 text-secondaryDark"
|
||||
:placeholder="`${t('graphql.url_placeholder')}`"
|
||||
:placeholder="`${t('request.url')}`"
|
||||
:disabled="connected"
|
||||
@keyup.enter="onConnectClick"
|
||||
/>
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
>
|
||||
<SmartEnvInput
|
||||
v-model="tab.document.request.endpoint"
|
||||
:placeholder="`${t('request.url_placeholder')}`"
|
||||
:placeholder="`${t('request.url')}`"
|
||||
:auto-complete-source="userHistories"
|
||||
:auto-complete-env="true"
|
||||
:inspection-results="tabResults"
|
||||
|
||||
@@ -201,7 +201,7 @@ export class TeamSearchService extends Service {
|
||||
expandingCollections: Ref<string[]> = ref([])
|
||||
expandedCollections: Ref<string[]> = ref([])
|
||||
|
||||
// TODO: ideally this should return the search results / formatted results instead of directly manipulating the result set
|
||||
// FUTURE-TODO: ideally this should return the search results / formatted results instead of directly manipulating the result set
|
||||
// eg: do the spotlight formatting in the spotlight searcher and not here
|
||||
searchTeams = async (query: string, teamID: string) => {
|
||||
if (!query.length) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { HoppModule } from "."
|
||||
import { Container, ServiceClassInstance } from "dioc"
|
||||
import { Container, Service } from "dioc"
|
||||
import { diocPlugin } from "dioc/vue"
|
||||
import { DebugService } from "~/services/debug.service"
|
||||
import { platform } from "~/platform"
|
||||
@@ -22,7 +22,7 @@ if (import.meta.env.DEV) {
|
||||
* services. Please use `useService` if within components or try to convert your
|
||||
* legacy subsystem into a service if possible.
|
||||
*/
|
||||
export function getService<T extends ServiceClassInstance<any>>(
|
||||
export function getService<T extends typeof Service<any> & { ID: string }>(
|
||||
service: T
|
||||
): InstanceType<T> {
|
||||
return serviceContainer.bind(service)
|
||||
@@ -30,10 +30,11 @@ export function getService<T extends ServiceClassInstance<any>>(
|
||||
|
||||
export default <HoppModule>{
|
||||
onVueAppInit(app) {
|
||||
// TODO: look into this
|
||||
// @ts-expect-error Something weird with Vue versions
|
||||
app.use(diocPlugin, {
|
||||
container: serviceContainer,
|
||||
})
|
||||
|
||||
for (const service of platform.addedServices ?? []) {
|
||||
serviceContainer.bind(service)
|
||||
}
|
||||
|
||||
@@ -8,14 +8,14 @@ import { AnalyticsPlatformDef } from "./analytics"
|
||||
import { InterceptorsPlatformDef } from "./interceptors"
|
||||
import { HoppModule } from "~/modules"
|
||||
import { InspectorsPlatformDef } from "./inspectors"
|
||||
import { ServiceClassInstance } from "dioc"
|
||||
import { Service } from "dioc"
|
||||
import { IOPlatformDef } from "./io"
|
||||
import { SpotlightPlatformDef } from "./spotlight"
|
||||
|
||||
export type PlatformDef = {
|
||||
ui?: UIPlatformDef
|
||||
addedHoppModules?: HoppModule[]
|
||||
addedServices?: Array<ServiceClassInstance<unknown>>
|
||||
addedServices?: Array<typeof Service<unknown> & { ID: string }>
|
||||
auth: AuthPlatformDef
|
||||
analytics?: AnalyticsPlatformDef
|
||||
io: IOPlatformDef
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Container, ServiceClassInstance } from "dioc"
|
||||
import { Service } from "dioc"
|
||||
import { Inspector } from "~/services/inspection"
|
||||
|
||||
/**
|
||||
@@ -8,9 +8,8 @@ export type PlatformInspectorsDef = {
|
||||
// We are keeping this as the only mode for now
|
||||
// So that if we choose to add other modes, we can do without breaking
|
||||
type: "service"
|
||||
// TODO: I don't think this type is effective, we have to come up with a better impl
|
||||
service: ServiceClassInstance<unknown> & {
|
||||
new (c: Container): Inspector
|
||||
service: typeof Service<unknown> & { ID: string } & {
|
||||
new (): Service & Inspector
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import { Container, ServiceClassInstance } from "dioc"
|
||||
import { Service } from "dioc"
|
||||
import { Interceptor } from "~/services/interceptor.service"
|
||||
|
||||
export type PlatformInterceptorDef =
|
||||
| { type: "standalone"; interceptor: Interceptor }
|
||||
| {
|
||||
type: "service"
|
||||
// TODO: I don't think this type is effective, we have to come up with a better impl
|
||||
service: ServiceClassInstance<unknown> & {
|
||||
new (c: Container): Interceptor
|
||||
service: typeof Service<unknown> & { ID: string } & {
|
||||
new (): Service & Interceptor
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import { Container, ServiceClassInstance } from "dioc"
|
||||
import { Service } from "dioc"
|
||||
import { SpotlightSearcher } from "~/services/spotlight"
|
||||
|
||||
export type SpotlightPlatformDef = {
|
||||
additionalSearchers?: Array<
|
||||
ServiceClassInstance<unknown> & {
|
||||
new (c: Container): SpotlightSearcher
|
||||
typeof Service<unknown> & { ID: string } & {
|
||||
new (): Service & SpotlightSearcher
|
||||
}
|
||||
>
|
||||
}
|
||||
|
||||
@@ -31,7 +31,9 @@ export class ExtensionInspectorService extends Service implements Inspector {
|
||||
|
||||
private readonly inspection = this.bind(InspectionService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.inspection.registerInspector(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -133,7 +133,9 @@ export class ExtensionInterceptorService
|
||||
|
||||
public selectable = { type: "selectable" as const }
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.listenForExtensionStatus()
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,9 @@ export class EnvironmentMenuService extends Service implements ContextMenu {
|
||||
|
||||
private readonly contextMenu = this.bind(ContextMenuService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.contextMenu.registerMenu(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -41,7 +41,9 @@ export class ParameterMenuService extends Service implements ContextMenu {
|
||||
|
||||
private readonly contextMenu = this.bind(ContextMenuService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.contextMenu.registerMenu(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,9 @@ export class URLMenuService extends Service implements ContextMenu {
|
||||
private readonly contextMenu = this.bind(ContextMenuService)
|
||||
private readonly restTab = this.bind(RESTTabService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.contextMenu.registerMenu(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,10 @@ export class CookieJarService extends Service {
|
||||
*/
|
||||
public cookieJar = ref(new Map<string, string[]>())
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
}
|
||||
|
||||
public parseSetCookieString(setCookieString: string) {
|
||||
return setCookieParse(setCookieString)
|
||||
}
|
||||
|
||||
@@ -14,7 +14,9 @@ import { Service } from "dioc"
|
||||
export class DebugService extends Service {
|
||||
public static readonly ID = "DEBUG_SERVICE"
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
console.log("DebugService is initialized...")
|
||||
|
||||
const container = this.getContainer()
|
||||
|
||||
@@ -107,7 +107,9 @@ export class InspectionService extends Service {
|
||||
|
||||
private readonly restTab = this.bind(RESTTabService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.initializeListeners()
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,9 @@ export class EnvironmentInspectorService extends Service implements Inspector {
|
||||
}
|
||||
)[0]
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.inspection.registerInspector(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,9 @@ export class HeaderInspectorService extends Service implements Inspector {
|
||||
private readonly inspection = this.bind(InspectionService)
|
||||
private readonly interceptorService = this.bind(InterceptorService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.inspection.registerInspector(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,9 @@ export class ResponseInspectorService extends Service implements Inspector {
|
||||
|
||||
private readonly inspection = this.bind(InspectionService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.inspection.registerInspector(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -178,7 +178,9 @@ export class InterceptorService extends Service {
|
||||
return this.interceptors.get(this.currentInterceptorID.value)
|
||||
})
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
// If the current interceptor is unselectable, select the first selectable one, else null
|
||||
watch([() => this.interceptors, this.currentInterceptorID], () => {
|
||||
if (!this.currentInterceptorID.value) return
|
||||
|
||||
@@ -109,6 +109,10 @@ export class OauthAuthService extends Service {
|
||||
public static readonly ID = "OAUTH_AUTH_SERVICE"
|
||||
|
||||
static redirectURI = `${window.location.origin}/oauth`
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
}
|
||||
}
|
||||
|
||||
export const generateRandomString = () => {
|
||||
|
||||
@@ -89,6 +89,10 @@ export class PersistenceService extends Service {
|
||||
|
||||
public hoppLocalConfigStorage: StorageLike = localStorage
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
}
|
||||
|
||||
private showErrorToast(localStorageKey: string) {
|
||||
const toast = useToast()
|
||||
toast.error(
|
||||
|
||||
@@ -27,6 +27,10 @@ export class SecretEnvironmentService extends Service {
|
||||
*/
|
||||
public secretEnvironments = reactive(new Map<string, SecretVariable[]>())
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a new secret environment.
|
||||
* @param id ID of the environment
|
||||
|
||||
@@ -6,7 +6,6 @@ import {
|
||||
import { nextTick, reactive, ref } from "vue"
|
||||
import { SpotlightSearcherResult } from "../../.."
|
||||
import { TestContainer } from "dioc/testing"
|
||||
import { Container } from "dioc"
|
||||
|
||||
async function flushPromises() {
|
||||
return await new Promise((r) => setTimeout(r))
|
||||
@@ -33,15 +32,12 @@ describe("StaticSpotlightSearcherService", () => {
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text"],
|
||||
fieldWeights: {},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
}
|
||||
|
||||
@@ -98,15 +94,12 @@ describe("StaticSpotlightSearcherService", () => {
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text"],
|
||||
fieldWeights: {},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
}
|
||||
|
||||
@@ -166,15 +159,12 @@ describe("StaticSpotlightSearcherService", () => {
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text"],
|
||||
fieldWeights: {},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
}
|
||||
|
||||
@@ -234,15 +224,12 @@ describe("StaticSpotlightSearcherService", () => {
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text"],
|
||||
fieldWeights: {},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
}
|
||||
|
||||
@@ -298,15 +285,12 @@ describe("StaticSpotlightSearcherService", () => {
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text"],
|
||||
fieldWeights: {},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
}
|
||||
|
||||
@@ -370,15 +354,12 @@ describe("StaticSpotlightSearcherService", () => {
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: dioc > v3 does not recommend using constructors, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternate"],
|
||||
fieldWeights: {},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Container, Service } from "dioc"
|
||||
import { Service } from "dioc"
|
||||
import {
|
||||
type SpotlightSearcher,
|
||||
type SpotlightSearcherResult,
|
||||
@@ -67,12 +67,8 @@ export abstract class StaticSpotlightSearcherService<
|
||||
|
||||
private _documents: Record<string, Doc> = {}
|
||||
|
||||
// TODO: This pattern is no longer recommended in dioc > 3, move to something else
|
||||
constructor(
|
||||
c: Container,
|
||||
private opts: StaticSpotlightSearcherOptions<Doc>
|
||||
) {
|
||||
super(c)
|
||||
constructor(private opts: StaticSpotlightSearcherOptions<Doc>) {
|
||||
super()
|
||||
|
||||
this.minisearch = new MiniSearch({
|
||||
fields: opts.searchFields as string[],
|
||||
|
||||
@@ -50,7 +50,9 @@ export class CollectionsSpotlightSearcherService
|
||||
private readonly spotlight = this.bind(SpotlightService)
|
||||
private readonly workspaceService = this.bind(WorkspaceService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ import IconEdit from "~icons/lucide/edit"
|
||||
import IconLayers from "~icons/lucide/layers"
|
||||
import IconTrash2 from "~icons/lucide/trash-2"
|
||||
|
||||
import { Container, Service } from "dioc"
|
||||
import { Service } from "dioc"
|
||||
import * as TE from "fp-ts/TaskEither"
|
||||
import { pipe } from "fp-ts/function"
|
||||
import { cloneDeep } from "lodash-es"
|
||||
@@ -164,18 +164,15 @@ export class EnvironmentsSpotlightSearcherService extends StaticSpotlightSearche
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: This pattern is no longer recommended in dioc > 3, move to something else
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
@@ -280,7 +277,9 @@ export class SwitchEnvSpotlightSearcherService
|
||||
private readonly workspaceService = this.bind(WorkspaceService)
|
||||
private teamEnvironmentList: TeamEnvironment[] = []
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@ import IconBook from "~icons/lucide/book"
|
||||
import IconLifeBuoy from "~icons/lucide/life-buoy"
|
||||
import IconZap from "~icons/lucide/zap"
|
||||
import { platform } from "~/platform"
|
||||
import { Container } from "dioc"
|
||||
|
||||
type Doc = {
|
||||
text: string | string[]
|
||||
@@ -90,18 +89,15 @@ export class GeneralSpotlightSearcherService extends StaticSpotlightSearcherServ
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: This is not recommended as of dioc > 3. Move to onServiceInit instead
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
@@ -66,7 +66,9 @@ export class HistorySpotlightSearcherService
|
||||
}
|
||||
)[0]
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,9 @@ export class InterceptorSpotlightSearcherService
|
||||
private readonly spotlight = this.bind(SpotlightService)
|
||||
private interceptorService = this.bind(InterceptorService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@ import {
|
||||
} from "./base/static.searcher"
|
||||
|
||||
import IconShare from "~icons/lucide/share"
|
||||
import { Container } from "dioc"
|
||||
|
||||
type Doc = {
|
||||
text: string
|
||||
@@ -40,18 +39,15 @@ export class MiscellaneousSpotlightSearcherService extends StaticSpotlightSearch
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: Constructors are no longer recommended as of dioc > 3, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@ import {
|
||||
} from "./base/static.searcher"
|
||||
|
||||
import IconArrowRight from "~icons/lucide/arrow-right"
|
||||
import { Container } from "dioc"
|
||||
|
||||
type Doc = {
|
||||
text: string
|
||||
@@ -62,18 +61,15 @@ export class NavigationSpotlightSearcherService extends StaticSpotlightSearcherS
|
||||
|
||||
private docKeys = Object.keys(this.documents)
|
||||
|
||||
// TODO: Constructors are no longer recommended as of dioc > 3, use onServiceInit instead
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ import IconRotateCCW from "~icons/lucide/rotate-ccw"
|
||||
import IconSave from "~icons/lucide/save"
|
||||
import { GQLOptionTabs } from "~/components/graphql/RequestOptions.vue"
|
||||
import { RESTTabService } from "~/services/tab/rest"
|
||||
import { Container } from "dioc"
|
||||
|
||||
type Doc = {
|
||||
text: string | string[]
|
||||
@@ -225,18 +224,15 @@ export class RequestSpotlightSearcherService extends StaticSpotlightSearcherServ
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: Constructors are no longer recommended as of dioc > 3, use onServiceInit instead
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ import {
|
||||
|
||||
import IconDownload from "~icons/lucide/download"
|
||||
import IconCopy from "~icons/lucide/copy"
|
||||
import { Container } from "dioc"
|
||||
|
||||
type Doc = {
|
||||
text: string
|
||||
@@ -57,18 +56,15 @@ export class ResponseSpotlightSearcherService extends StaticSpotlightSearcherSer
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: Constructors are no longer recommended as of dioc > 3, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ import IconMonitor from "~icons/lucide/monitor"
|
||||
import IconMoon from "~icons/lucide/moon"
|
||||
import IconSun from "~icons/lucide/sun"
|
||||
import IconCheckCircle from "~icons/lucide/check-circle"
|
||||
import { Container } from "dioc"
|
||||
|
||||
type Doc = {
|
||||
text: string | string[]
|
||||
@@ -101,18 +100,15 @@ export class SettingsSpotlightSearcherService extends StaticSpotlightSearcherSer
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: Constuctors are no longer recommended as of dioc > 3, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ import IconXSquare from "~icons/lucide/x-square"
|
||||
import { invokeAction } from "~/helpers/actions"
|
||||
import { RESTTabService } from "~/services/tab/rest"
|
||||
import { GQLTabService } from "~/services/tab/graphql"
|
||||
import { Container } from "dioc"
|
||||
|
||||
type Doc = {
|
||||
text: string | string[]
|
||||
@@ -90,18 +89,15 @@ export class TabSpotlightSearcherService extends StaticSpotlightSearcherService<
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: Constructors are no longer recommended as of dioc > 3, use onServiceInit instead
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
@@ -39,7 +39,9 @@ export class TeamsSpotlightSearcherService
|
||||
|
||||
private readonly tabs = this.bind(RESTTabService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@ import { useStreamStatic } from "~/composables/stream"
|
||||
import IconLogin from "~icons/lucide/log-in"
|
||||
import IconLogOut from "~icons/lucide/log-out"
|
||||
import { activeActions$, invokeAction } from "~/helpers/actions"
|
||||
import { Container } from "dioc"
|
||||
|
||||
type Doc = {
|
||||
text: string
|
||||
@@ -60,18 +59,15 @@ export class UserSpotlightSearcherService extends StaticSpotlightSearcherService
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: Constructors are no longer recommended as of dioc > 3, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit(): void {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
StaticSpotlightSearcherService,
|
||||
} from "./base/static.searcher"
|
||||
|
||||
import { Container, Service } from "dioc"
|
||||
import { Service } from "dioc"
|
||||
import * as E from "fp-ts/Either"
|
||||
import MiniSearch from "minisearch"
|
||||
import IconCheckCircle from "~/components/app/spotlight/entry/IconSelected.vue"
|
||||
@@ -102,18 +102,15 @@ export class WorkspaceSpotlightSearcherService extends StaticSpotlightSearcherSe
|
||||
},
|
||||
})
|
||||
|
||||
// TODO: Constructors are no longer recommended as of dioc > 3, move to onServiceInit
|
||||
constructor(c: Container) {
|
||||
super(c, {
|
||||
constructor() {
|
||||
super({
|
||||
searchFields: ["text", "alternates"],
|
||||
fieldWeights: {
|
||||
text: 2,
|
||||
alternates: 1,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
override onServiceInit() {
|
||||
this.setDocuments(this.documents)
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
@@ -169,7 +166,9 @@ export class SwitchWorkspaceSpotlightSearcherService
|
||||
private readonly spotlight = this.bind(SpotlightService)
|
||||
private readonly workspaceService = this.bind(WorkspaceService)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.spotlight.registerSearcher(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,9 @@ import { reactive } from "vue"
|
||||
class MockTabService extends TabService<{ request: string }> {
|
||||
public static readonly ID = "MOCK_TAB_SERVICE"
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.tabMap = reactive(
|
||||
new Map([
|
||||
[
|
||||
|
||||
@@ -3,15 +3,12 @@ import { getDefaultGQLRequest } from "~/helpers/graphql/default"
|
||||
import { HoppGQLDocument, HoppGQLSaveContext } from "~/helpers/graphql/document"
|
||||
import { TabService } from "./tab"
|
||||
import { computed } from "vue"
|
||||
import { Container } from "dioc"
|
||||
|
||||
export class GQLTabService extends TabService<HoppGQLDocument> {
|
||||
public static readonly ID = "GQL_TAB_SERVICE"
|
||||
|
||||
// TODO: Moving this to `onServiceInit` breaks `persistableTabState`
|
||||
// Figure out how to fix this
|
||||
constructor(c: Container) {
|
||||
super(c)
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.tabMap.set("test", {
|
||||
id: "test",
|
||||
|
||||
@@ -3,15 +3,12 @@ import { computed } from "vue"
|
||||
import { getDefaultRESTRequest } from "~/helpers/rest/default"
|
||||
import { HoppRESTDocument, HoppRESTSaveContext } from "~/helpers/rest/document"
|
||||
import { TabService } from "./tab"
|
||||
import { Container } from "dioc"
|
||||
|
||||
export class RESTTabService extends TabService<HoppRESTDocument> {
|
||||
public static readonly ID = "REST_TAB_SERVICE"
|
||||
|
||||
// TODO: Moving this to `onServiceInit` breaks `persistableTabState`
|
||||
// Figure out how to fix this
|
||||
constructor(c: Container) {
|
||||
super(c)
|
||||
constructor() {
|
||||
super()
|
||||
|
||||
this.tabMap.set("test", {
|
||||
id: "test",
|
||||
|
||||
@@ -48,7 +48,8 @@ export class WorkspaceService extends Service<WorkspaceServiceEvent> {
|
||||
-1
|
||||
)
|
||||
|
||||
override onServiceInit() {
|
||||
constructor() {
|
||||
super()
|
||||
// Dispose the managed team list adapter when the user logs out
|
||||
// and initialize it when the user logs in
|
||||
watch(
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@hoppscotch/selfhost-desktop",
|
||||
"private": true,
|
||||
"version": "2024.3.3",
|
||||
"version": "2024.3.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev:vite": "vite",
|
||||
@@ -23,7 +23,7 @@
|
||||
"@vueuse/core": "10.5.0",
|
||||
"axios": "0.21.4",
|
||||
"buffer": "6.0.3",
|
||||
"dioc": "3.0.1",
|
||||
"dioc": "1.0.1",
|
||||
"environments.api": "link:@platform/environments/environments.api",
|
||||
"event": "link:@tauri-apps/api/event",
|
||||
"fp-ts": "2.16.1",
|
||||
@@ -78,4 +78,4 @@
|
||||
"vite-plugin-vue-layouts": "0.7.0",
|
||||
"vue-tsc": "1.8.8"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1260,7 +1260,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "hoppscotch-desktop"
|
||||
version = "24.3.2"
|
||||
version = "24.3.1"
|
||||
dependencies = [
|
||||
"cocoa 0.25.0",
|
||||
"hex_color",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "hoppscotch-desktop"
|
||||
version = "24.3.3"
|
||||
version = "24.3.0"
|
||||
description = "A Tauri App"
|
||||
authors = ["you"]
|
||||
license = ""
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
},
|
||||
"package": {
|
||||
"productName": "Hoppscotch",
|
||||
"version": "24.3.3"
|
||||
"version": "24.3.1"
|
||||
},
|
||||
"tauri": {
|
||||
"allowlist": {
|
||||
|
||||
@@ -138,6 +138,10 @@ export class NativeInterceptorService extends Service implements Interceptor {
|
||||
|
||||
public cookieJarService = this.bind(CookieJarService)
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
}
|
||||
|
||||
public runRequest(req: any) {
|
||||
const processedReq = preProcessRequest(req)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "@hoppscotch/selfhost-web",
|
||||
"private": true,
|
||||
"version": "2024.3.3",
|
||||
"version": "2024.3.1",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev:vite": "vite",
|
||||
|
||||
@@ -52,8 +52,7 @@
|
||||
"title": "Server is restarting"
|
||||
},
|
||||
"save_changes": "Save Changes",
|
||||
"title": "Configurations",
|
||||
"update_failure": "Failed to update server configurations"
|
||||
"title": "Configurations"
|
||||
},
|
||||
"data_sharing": {
|
||||
"description": "Share anonymous data usage to improve Hoppscotch",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "hoppscotch-sh-admin",
|
||||
"private": true,
|
||||
"version": "2024.3.3",
|
||||
"version": "2024.3.1",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "pnpm exec npm-run-all -p -l dev:*",
|
||||
|
||||
@@ -69,18 +69,18 @@
|
||||
import { useVModel } from '@vueuse/core';
|
||||
import { reactive } from 'vue';
|
||||
import { useI18n } from '~/composables/i18n';
|
||||
import { ServerConfigs, SsoAuthProviders } from '~/helpers/configs';
|
||||
import { Config, SsoAuthProviders } from '~/composables/useConfigHandler';
|
||||
import IconEye from '~icons/lucide/eye';
|
||||
import IconEyeOff from '~icons/lucide/eye-off';
|
||||
|
||||
const t = useI18n();
|
||||
|
||||
const props = defineProps<{
|
||||
config: ServerConfigs;
|
||||
config: Config;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:config', v: ServerConfigs): void;
|
||||
(e: 'update:config', v: Config): void;
|
||||
}>();
|
||||
|
||||
const workingConfigs = useVModel(props, 'config', emit);
|
||||
@@ -93,7 +93,7 @@ const capitalize = (text: string) =>
|
||||
type ProviderFieldKeys = keyof ProviderFields;
|
||||
|
||||
type ProviderFields = {
|
||||
[Field in keyof ServerConfigs['providers'][SsoAuthProviders]['fields']]: boolean;
|
||||
[Field in keyof Config['providers'][SsoAuthProviders]['fields']]: boolean;
|
||||
} & Partial<{ tenant: boolean }>;
|
||||
|
||||
type ProviderFieldMetadata = {
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { useVModel } from '@vueuse/core';
|
||||
import { ServerConfigs } from '~/helpers/configs';
|
||||
import { Config } from '~/composables/useConfigHandler';
|
||||
|
||||
const props = defineProps<{
|
||||
config: ServerConfigs;
|
||||
config: Config;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:config', v: ServerConfigs): void;
|
||||
(e: 'update:config', v: Config): void;
|
||||
}>();
|
||||
|
||||
const workingConfigs = useVModel(props, 'config', emit);
|
||||
|
||||
@@ -38,17 +38,17 @@
|
||||
import { useVModel } from '@vueuse/core';
|
||||
import { computed } from 'vue';
|
||||
import { useI18n } from '~/composables/i18n';
|
||||
import { ServerConfigs } from '~/helpers/configs';
|
||||
import { Config } from '~/composables/useConfigHandler';
|
||||
import IconShieldQuestion from '~icons/lucide/shield-question';
|
||||
|
||||
const t = useI18n();
|
||||
|
||||
const props = defineProps<{
|
||||
config: ServerConfigs;
|
||||
config: Config;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:config', v: ServerConfigs): void;
|
||||
(e: 'update:config', v: Config): void;
|
||||
}>();
|
||||
|
||||
const workingConfigs = useVModel(props, 'config', emit);
|
||||
|
||||
@@ -17,21 +17,20 @@ import { useMutation } from '@urql/vue';
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { useI18n } from '~/composables/i18n';
|
||||
import { useToast } from '~/composables/toast';
|
||||
import { useConfigHandler } from '~/composables/useConfigHandler';
|
||||
import { Config, useConfigHandler } from '~/composables/useConfigHandler';
|
||||
import {
|
||||
EnableAndDisableSsoDocument,
|
||||
ResetInfraConfigsDocument,
|
||||
ToggleAnalyticsCollectionDocument,
|
||||
UpdateInfraConfigsDocument,
|
||||
ToggleAnalyticsCollectionDocument,
|
||||
} from '~/helpers/backend/graphql';
|
||||
import { ServerConfigs } from '~/helpers/configs';
|
||||
|
||||
const t = useI18n();
|
||||
const toast = useToast();
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
workingConfigs?: ServerConfigs;
|
||||
workingConfigs?: Config;
|
||||
reset?: boolean;
|
||||
}>(),
|
||||
{
|
||||
|
||||
@@ -58,18 +58,18 @@
|
||||
import { useVModel } from '@vueuse/core';
|
||||
import { computed, reactive } from 'vue';
|
||||
import { useI18n } from '~/composables/i18n';
|
||||
import { ServerConfigs } from '~/helpers/configs';
|
||||
import { Config } from '~/composables/useConfigHandler';
|
||||
import IconEye from '~icons/lucide/eye';
|
||||
import IconEyeOff from '~icons/lucide/eye-off';
|
||||
|
||||
const t = useI18n();
|
||||
|
||||
const props = defineProps<{
|
||||
config: ServerConfigs;
|
||||
config: Config;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:config', v: ServerConfigs): void;
|
||||
(e: 'update:config', v: Config): void;
|
||||
}>();
|
||||
|
||||
const workingConfigs = useVModel(props, 'config', emit);
|
||||
@@ -87,7 +87,7 @@ const smtpConfigs = computed({
|
||||
// Mask sensitive fields
|
||||
type Field = {
|
||||
name: string;
|
||||
key: keyof ServerConfigs['mailConfigs']['fields'];
|
||||
key: keyof Config['mailConfigs']['fields'];
|
||||
};
|
||||
|
||||
const smtpConfigFields = reactive<Field[]>([
|
||||
@@ -100,10 +100,10 @@ const maskState = reactive<Record<string, boolean>>({
|
||||
mailer_from_address: true,
|
||||
});
|
||||
|
||||
const toggleMask = (fieldKey: keyof ServerConfigs['mailConfigs']['fields']) => {
|
||||
const toggleMask = (fieldKey: keyof Config['mailConfigs']['fields']) => {
|
||||
maskState[fieldKey] = !maskState[fieldKey];
|
||||
};
|
||||
|
||||
const isMasked = (fieldKey: keyof ServerConfigs['mailConfigs']['fields']) =>
|
||||
const isMasked = (fieldKey: keyof Config['mailConfigs']['fields']) =>
|
||||
maskState[fieldKey];
|
||||
</script>
|
||||
|
||||
@@ -1,39 +1,83 @@
|
||||
import { AnyVariables, UseMutationResponse } from '@urql/vue';
|
||||
import { cloneDeep } from 'lodash-es';
|
||||
import { onMounted, ref } from 'vue';
|
||||
|
||||
import { computed, onMounted, ref } from 'vue';
|
||||
import { useI18n } from '~/composables/i18n';
|
||||
import {
|
||||
AllowedAuthProvidersDocument,
|
||||
AuthProvider,
|
||||
EnableAndDisableSsoArgs,
|
||||
EnableAndDisableSsoMutation,
|
||||
InfraConfigArgs,
|
||||
InfraConfigEnum,
|
||||
InfraConfigsDocument,
|
||||
ResetInfraConfigsMutation,
|
||||
ServiceStatus,
|
||||
ToggleAnalyticsCollectionMutation,
|
||||
UpdateInfraConfigsMutation,
|
||||
} from '~/helpers/backend/graphql';
|
||||
import {
|
||||
ALL_CONFIGS,
|
||||
ConfigSection,
|
||||
ConfigTransform,
|
||||
GITHUB_CONFIGS,
|
||||
GOOGLE_CONFIGS,
|
||||
MAIL_CONFIGS,
|
||||
MICROSOFT_CONFIGS,
|
||||
ServerConfigs,
|
||||
UpdatedConfigs,
|
||||
} from '~/helpers/configs';
|
||||
import { useToast } from './toast';
|
||||
import { useClientHandler } from './useClientHandler';
|
||||
|
||||
// Types
|
||||
export type SsoAuthProviders = 'google' | 'microsoft' | 'github';
|
||||
|
||||
export type Config = {
|
||||
providers: {
|
||||
google: {
|
||||
name: SsoAuthProviders;
|
||||
enabled: boolean;
|
||||
fields: {
|
||||
client_id: string;
|
||||
client_secret: string;
|
||||
callback_url: string;
|
||||
scope: string;
|
||||
};
|
||||
};
|
||||
github: {
|
||||
name: SsoAuthProviders;
|
||||
enabled: boolean;
|
||||
fields: {
|
||||
client_id: string;
|
||||
client_secret: string;
|
||||
callback_url: string;
|
||||
scope: string;
|
||||
};
|
||||
};
|
||||
microsoft: {
|
||||
name: SsoAuthProviders;
|
||||
enabled: boolean;
|
||||
fields: {
|
||||
client_id: string;
|
||||
client_secret: string;
|
||||
callback_url: string;
|
||||
scope: string;
|
||||
tenant: string;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
mailConfigs: {
|
||||
name: string;
|
||||
enabled: boolean;
|
||||
fields: {
|
||||
mailer_smtp_url: string;
|
||||
mailer_from_address: string;
|
||||
};
|
||||
};
|
||||
|
||||
dataSharingConfigs: {
|
||||
name: string;
|
||||
enabled: boolean;
|
||||
};
|
||||
};
|
||||
|
||||
type UpdatedConfigs = {
|
||||
name: string;
|
||||
value: string;
|
||||
};
|
||||
|
||||
/** Composable that handles all operations related to server configurations
|
||||
* @param updatedConfigs A Config Object contatining the updated configs
|
||||
*/
|
||||
export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
export function useConfigHandler(updatedConfigs?: Config) {
|
||||
const t = useI18n();
|
||||
const toast = useToast();
|
||||
|
||||
@@ -46,9 +90,24 @@ export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
} = useClientHandler(
|
||||
InfraConfigsDocument,
|
||||
{
|
||||
configNames: ALL_CONFIGS.flat().map(
|
||||
({ name }) => name
|
||||
) as InfraConfigEnum[],
|
||||
configNames: [
|
||||
'GOOGLE_CLIENT_ID',
|
||||
'GOOGLE_CLIENT_SECRET',
|
||||
'GOOGLE_CALLBACK_URL',
|
||||
'GOOGLE_SCOPE',
|
||||
'MICROSOFT_CLIENT_ID',
|
||||
'MICROSOFT_CLIENT_SECRET',
|
||||
'MICROSOFT_CALLBACK_URL',
|
||||
'MICROSOFT_SCOPE',
|
||||
'MICROSOFT_TENANT',
|
||||
'GITHUB_CLIENT_ID',
|
||||
'GITHUB_CLIENT_SECRET',
|
||||
'GITHUB_CALLBACK_URL',
|
||||
'GITHUB_SCOPE',
|
||||
'MAILER_SMTP_URL',
|
||||
'MAILER_ADDRESS_FROM',
|
||||
'ALLOW_ANALYTICS_COLLECTION',
|
||||
] as InfraConfigEnum[],
|
||||
},
|
||||
(x) => x.infraConfigs
|
||||
);
|
||||
@@ -66,14 +125,14 @@ export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
);
|
||||
|
||||
// Current and working configs
|
||||
const currentConfigs = ref<ServerConfigs>();
|
||||
const workingConfigs = ref<ServerConfigs>();
|
||||
const currentConfigs = ref<Config>();
|
||||
const workingConfigs = ref<Config>();
|
||||
|
||||
onMounted(async () => {
|
||||
await fetchInfraConfigs();
|
||||
await fetchAllowedAuthProviders();
|
||||
|
||||
const getFieldValue = (name: InfraConfigEnum) =>
|
||||
const getFieldValue = (name: string) =>
|
||||
infraConfigs.value.find((x) => x.name === name)?.value ?? '';
|
||||
|
||||
// Transforming the fetched data into a Configs object
|
||||
@@ -81,42 +140,42 @@ export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
providers: {
|
||||
google: {
|
||||
name: 'google',
|
||||
enabled: allowedAuthProviders.value.includes(AuthProvider.Google),
|
||||
enabled: allowedAuthProviders.value.includes('GOOGLE'),
|
||||
fields: {
|
||||
client_id: getFieldValue(InfraConfigEnum.GoogleClientId),
|
||||
client_secret: getFieldValue(InfraConfigEnum.GoogleClientSecret),
|
||||
callback_url: getFieldValue(InfraConfigEnum.GoogleCallbackUrl),
|
||||
scope: getFieldValue(InfraConfigEnum.GoogleScope),
|
||||
client_id: getFieldValue('GOOGLE_CLIENT_ID'),
|
||||
client_secret: getFieldValue('GOOGLE_CLIENT_SECRET'),
|
||||
callback_url: getFieldValue('GOOGLE_CALLBACK_URL'),
|
||||
scope: getFieldValue('GOOGLE_SCOPE'),
|
||||
},
|
||||
},
|
||||
github: {
|
||||
name: 'github',
|
||||
enabled: allowedAuthProviders.value.includes(AuthProvider.Github),
|
||||
enabled: allowedAuthProviders.value.includes('GITHUB'),
|
||||
fields: {
|
||||
client_id: getFieldValue(InfraConfigEnum.GithubClientId),
|
||||
client_secret: getFieldValue(InfraConfigEnum.GithubClientSecret),
|
||||
callback_url: getFieldValue(InfraConfigEnum.GoogleCallbackUrl),
|
||||
scope: getFieldValue(InfraConfigEnum.GithubScope),
|
||||
client_id: getFieldValue('GITHUB_CLIENT_ID'),
|
||||
client_secret: getFieldValue('GITHUB_CLIENT_SECRET'),
|
||||
callback_url: getFieldValue('GITHUB_CALLBACK_URL'),
|
||||
scope: getFieldValue('GITHUB_SCOPE'),
|
||||
},
|
||||
},
|
||||
microsoft: {
|
||||
name: 'microsoft',
|
||||
enabled: allowedAuthProviders.value.includes(AuthProvider.Microsoft),
|
||||
enabled: allowedAuthProviders.value.includes('MICROSOFT'),
|
||||
fields: {
|
||||
client_id: getFieldValue(InfraConfigEnum.MicrosoftClientId),
|
||||
client_secret: getFieldValue(InfraConfigEnum.MicrosoftClientSecret),
|
||||
callback_url: getFieldValue(InfraConfigEnum.MicrosoftCallbackUrl),
|
||||
scope: getFieldValue(InfraConfigEnum.MicrosoftScope),
|
||||
tenant: getFieldValue(InfraConfigEnum.MicrosoftTenant),
|
||||
client_id: getFieldValue('MICROSOFT_CLIENT_ID'),
|
||||
client_secret: getFieldValue('MICROSOFT_CLIENT_SECRET'),
|
||||
callback_url: getFieldValue('MICROSOFT_CALLBACK_URL'),
|
||||
scope: getFieldValue('MICROSOFT_SCOPE'),
|
||||
tenant: getFieldValue('MICROSOFT_TENANT'),
|
||||
},
|
||||
},
|
||||
},
|
||||
mailConfigs: {
|
||||
name: 'email',
|
||||
enabled: allowedAuthProviders.value.includes(AuthProvider.Email),
|
||||
enabled: allowedAuthProviders.value.includes('EMAIL'),
|
||||
fields: {
|
||||
mailer_smtp_url: getFieldValue(InfraConfigEnum.MailerSmtpUrl),
|
||||
mailer_from_address: getFieldValue(InfraConfigEnum.MailerAddressFrom),
|
||||
mailer_smtp_url: getFieldValue('MAILER_SMTP_URL'),
|
||||
mailer_from_address: getFieldValue('MAILER_ADDRESS_FROM'),
|
||||
},
|
||||
},
|
||||
dataSharingConfigs: {
|
||||
@@ -132,13 +191,138 @@ export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
workingConfigs.value = cloneDeep(currentConfigs.value);
|
||||
});
|
||||
|
||||
/*
|
||||
Check if any of the config fields are empty
|
||||
*/
|
||||
// Transforming the working configs back into the format required by the mutations
|
||||
const updatedInfraConfigs = computed(() => {
|
||||
let config: UpdatedConfigs[] = [
|
||||
{
|
||||
name: '',
|
||||
value: '',
|
||||
},
|
||||
];
|
||||
|
||||
if (updatedConfigs?.providers.google.enabled) {
|
||||
config.push(
|
||||
{
|
||||
name: 'GOOGLE_CLIENT_ID',
|
||||
value: updatedConfigs?.providers.google.fields.client_id ?? '',
|
||||
},
|
||||
{
|
||||
name: 'GOOGLE_CLIENT_SECRET',
|
||||
value: updatedConfigs?.providers.google.fields.client_secret ?? '',
|
||||
},
|
||||
{
|
||||
name: 'GOOGLE_CALLBACK_URL',
|
||||
value: updatedConfigs?.providers.google.fields.callback_url ?? '',
|
||||
},
|
||||
{
|
||||
name: 'GOOGLE_SCOPE',
|
||||
value: updatedConfigs?.providers.google.fields.scope ?? '',
|
||||
}
|
||||
);
|
||||
} else {
|
||||
config = config.filter(
|
||||
(item) =>
|
||||
item.name !== 'GOOGLE_CLIENT_ID' &&
|
||||
item.name !== 'GOOGLE_CLIENT_SECRET' &&
|
||||
item.name !== 'GOOGLE_CALLBACK_URL' &&
|
||||
item.name !== 'GOOGLE_SCOPE'
|
||||
);
|
||||
}
|
||||
if (updatedConfigs?.providers.microsoft.enabled) {
|
||||
config.push(
|
||||
{
|
||||
name: 'MICROSOFT_CLIENT_ID',
|
||||
value: updatedConfigs?.providers.microsoft.fields.client_id ?? '',
|
||||
},
|
||||
{
|
||||
name: 'MICROSOFT_CLIENT_SECRET',
|
||||
value: updatedConfigs?.providers.microsoft.fields.client_secret ?? '',
|
||||
},
|
||||
{
|
||||
name: 'MICROSOFT_CALLBACK_URL',
|
||||
value: updatedConfigs?.providers.microsoft.fields.callback_url ?? '',
|
||||
},
|
||||
{
|
||||
name: 'MICROSOFT_SCOPE',
|
||||
value: updatedConfigs?.providers.microsoft.fields.scope ?? '',
|
||||
},
|
||||
{
|
||||
name: 'MICROSOFT_TENANT',
|
||||
value: updatedConfigs?.providers.microsoft.fields.tenant ?? '',
|
||||
}
|
||||
);
|
||||
} else {
|
||||
config = config.filter(
|
||||
(item) =>
|
||||
item.name !== 'MICROSOFT_CLIENT_ID' &&
|
||||
item.name !== 'MICROSOFT_CLIENT_SECRET' &&
|
||||
item.name !== 'MICROSOFT_CALLBACK_URL' &&
|
||||
item.name !== 'MICROSOFT_SCOPE' &&
|
||||
item.name !== 'MICROSOFT_TENANT'
|
||||
);
|
||||
}
|
||||
|
||||
if (updatedConfigs?.providers.github.enabled) {
|
||||
config.push(
|
||||
{
|
||||
name: 'GITHUB_CLIENT_ID',
|
||||
value: updatedConfigs?.providers.github.fields.client_id ?? '',
|
||||
},
|
||||
{
|
||||
name: 'GITHUB_CLIENT_SECRET',
|
||||
value: updatedConfigs?.providers.github.fields.client_secret ?? '',
|
||||
},
|
||||
{
|
||||
name: 'GITHUB_CALLBACK_URL',
|
||||
value: updatedConfigs?.providers.github.fields.callback_url ?? '',
|
||||
},
|
||||
{
|
||||
name: 'GITHUB_SCOPE',
|
||||
value: updatedConfigs?.providers.github.fields.scope ?? '',
|
||||
}
|
||||
);
|
||||
} else {
|
||||
config = config.filter(
|
||||
(item) =>
|
||||
item.name !== 'GITHUB_CLIENT_ID' &&
|
||||
item.name !== 'GITHUB_CLIENT_SECRET' &&
|
||||
item.name !== 'GITHUB_CALLBACK_URL' &&
|
||||
item.name !== 'GITHUB_SCOPE'
|
||||
);
|
||||
}
|
||||
|
||||
if (updatedConfigs?.mailConfigs.enabled) {
|
||||
config.push(
|
||||
{
|
||||
name: 'MAILER_SMTP_URL',
|
||||
value: updatedConfigs?.mailConfigs.fields.mailer_smtp_url ?? '',
|
||||
},
|
||||
{
|
||||
name: 'MAILER_ADDRESS_FROM',
|
||||
value: updatedConfigs?.mailConfigs.fields.mailer_from_address ?? '',
|
||||
}
|
||||
);
|
||||
} else {
|
||||
config = config.filter(
|
||||
(item) =>
|
||||
item.name !== 'MAILER_SMTP_URL' && item.name !== 'MAILER_ADDRESS_FROM'
|
||||
);
|
||||
}
|
||||
|
||||
config = config.filter((item) => item.name !== '');
|
||||
|
||||
return config;
|
||||
});
|
||||
|
||||
// Checking if any of the config fields are empty
|
||||
const isFieldEmpty = (field: string) => field.trim() === '';
|
||||
|
||||
const AreAnyConfigFieldsEmpty = (config: ServerConfigs): boolean => {
|
||||
type ConfigSection = {
|
||||
enabled: boolean;
|
||||
fields: Record<string, string>;
|
||||
};
|
||||
|
||||
const AreAnyConfigFieldsEmpty = (config: Config): boolean => {
|
||||
const sections: Array<ConfigSection> = [
|
||||
config.providers.github,
|
||||
config.providers.google,
|
||||
@@ -153,44 +337,28 @@ export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
};
|
||||
|
||||
// Transforming the working configs back into the format required by the mutations
|
||||
const transformInfraConfigs = () => {
|
||||
const updatedWorkingConfigs: ConfigTransform[] = [
|
||||
const updatedAllowedAuthProviders = computed(() => {
|
||||
return [
|
||||
{
|
||||
config: GOOGLE_CONFIGS,
|
||||
enabled: updatedConfigs?.providers.google.enabled,
|
||||
fields: updatedConfigs?.providers.google.fields,
|
||||
provider: 'GOOGLE',
|
||||
status: updatedConfigs?.providers.google.enabled ? 'ENABLE' : 'DISABLE',
|
||||
},
|
||||
{
|
||||
config: GITHUB_CONFIGS,
|
||||
enabled: updatedConfigs?.providers.github.enabled,
|
||||
fields: updatedConfigs?.providers.github.fields,
|
||||
provider: 'MICROSOFT',
|
||||
status: updatedConfigs?.providers.microsoft.enabled
|
||||
? 'ENABLE'
|
||||
: 'DISABLE',
|
||||
},
|
||||
{
|
||||
config: MICROSOFT_CONFIGS,
|
||||
enabled: updatedConfigs?.providers.microsoft.enabled,
|
||||
fields: updatedConfigs?.providers.microsoft.fields,
|
||||
provider: 'GITHUB',
|
||||
status: updatedConfigs?.providers.github.enabled ? 'ENABLE' : 'DISABLE',
|
||||
},
|
||||
{
|
||||
config: MAIL_CONFIGS,
|
||||
enabled: updatedConfigs?.mailConfigs.enabled,
|
||||
fields: updatedConfigs?.mailConfigs.fields,
|
||||
provider: 'EMAIL',
|
||||
status: updatedConfigs?.mailConfigs.enabled ? 'ENABLE' : 'DISABLE',
|
||||
},
|
||||
];
|
||||
|
||||
const transformedConfigs: UpdatedConfigs[] = [];
|
||||
|
||||
updatedWorkingConfigs.forEach(({ config, enabled, fields }) => {
|
||||
config.forEach(({ name, key }) => {
|
||||
if (enabled && fields) {
|
||||
const value =
|
||||
typeof fields === 'string' ? fields : String(fields[key]);
|
||||
transformedConfigs.push({ name, value });
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
return transformedConfigs;
|
||||
};
|
||||
});
|
||||
|
||||
// Generic function to handle mutation execution and error handling
|
||||
const executeMutation = async <T, V>(
|
||||
@@ -211,59 +379,27 @@ export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
// Updating the auth provider configurations
|
||||
const updateAuthProvider = (
|
||||
updateProviderStatus: UseMutationResponse<EnableAndDisableSsoMutation>
|
||||
) => {
|
||||
const updatedAllowedAuthProviders: EnableAndDisableSsoArgs[] = [
|
||||
{
|
||||
provider: AuthProvider.Google,
|
||||
status: updatedConfigs?.providers.google.enabled
|
||||
? ServiceStatus.Enable
|
||||
: ServiceStatus.Disable,
|
||||
},
|
||||
{
|
||||
provider: AuthProvider.Microsoft,
|
||||
status: updatedConfigs?.providers.microsoft.enabled
|
||||
? ServiceStatus.Enable
|
||||
: ServiceStatus.Disable,
|
||||
},
|
||||
{
|
||||
provider: AuthProvider.Github,
|
||||
status: updatedConfigs?.providers.github.enabled
|
||||
? ServiceStatus.Enable
|
||||
: ServiceStatus.Disable,
|
||||
},
|
||||
{
|
||||
provider: AuthProvider.Email,
|
||||
status: updatedConfigs?.mailConfigs.enabled
|
||||
? ServiceStatus.Enable
|
||||
: ServiceStatus.Disable,
|
||||
},
|
||||
];
|
||||
|
||||
return executeMutation(
|
||||
) =>
|
||||
executeMutation(
|
||||
updateProviderStatus,
|
||||
{
|
||||
providerInfo: updatedAllowedAuthProviders,
|
||||
providerInfo:
|
||||
updatedAllowedAuthProviders.value as EnableAndDisableSsoArgs[],
|
||||
},
|
||||
'configs.auth_providers.update_failure'
|
||||
);
|
||||
};
|
||||
|
||||
// Updating the infra configurations
|
||||
const updateInfraConfigs = (
|
||||
updateInfraConfigsMutation: UseMutationResponse<UpdateInfraConfigsMutation>
|
||||
) => {
|
||||
const infraConfigs: InfraConfigArgs[] = updatedConfigs
|
||||
? transformInfraConfigs()
|
||||
: [];
|
||||
|
||||
return executeMutation(
|
||||
) =>
|
||||
executeMutation(
|
||||
updateInfraConfigsMutation,
|
||||
{
|
||||
infraConfigs,
|
||||
infraConfigs: updatedInfraConfigs.value as InfraConfigArgs[],
|
||||
},
|
||||
'configs.update_failure'
|
||||
'configs.mail_configs.update_failure'
|
||||
);
|
||||
};
|
||||
|
||||
// Resetting the infra configurations
|
||||
const resetInfraConfigs = (
|
||||
@@ -275,6 +411,7 @@ export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
'configs.reset.failure'
|
||||
);
|
||||
|
||||
// Updating the data sharing configurations
|
||||
const updateDataSharingConfigs = (
|
||||
toggleDataSharingMutation: UseMutationResponse<ToggleAnalyticsCollectionMutation>
|
||||
) =>
|
||||
@@ -282,8 +419,8 @@ export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
toggleDataSharingMutation,
|
||||
{
|
||||
status: updatedConfigs?.dataSharingConfigs.enabled
|
||||
? ServiceStatus.Enable
|
||||
: ServiceStatus.Disable,
|
||||
? 'ENABLE'
|
||||
: 'DISABLE',
|
||||
},
|
||||
'configs.data_sharing.update_failure'
|
||||
);
|
||||
@@ -291,6 +428,8 @@ export function useConfigHandler(updatedConfigs?: ServerConfigs) {
|
||||
return {
|
||||
currentConfigs,
|
||||
workingConfigs,
|
||||
updatedInfraConfigs,
|
||||
updatedAllowedAuthProviders,
|
||||
updateAuthProvider,
|
||||
updateDataSharingConfigs,
|
||||
updateInfraConfigs,
|
||||
|
||||
@@ -1,160 +0,0 @@
|
||||
import { InfraConfigEnum } from './backend/graphql';
|
||||
|
||||
export type SsoAuthProviders = 'google' | 'microsoft' | 'github';
|
||||
|
||||
export type ServerConfigs = {
|
||||
providers: {
|
||||
google: {
|
||||
name: SsoAuthProviders;
|
||||
enabled: boolean;
|
||||
fields: {
|
||||
client_id: string;
|
||||
client_secret: string;
|
||||
callback_url: string;
|
||||
scope: string;
|
||||
};
|
||||
};
|
||||
github: {
|
||||
name: SsoAuthProviders;
|
||||
enabled: boolean;
|
||||
fields: {
|
||||
client_id: string;
|
||||
client_secret: string;
|
||||
callback_url: string;
|
||||
scope: string;
|
||||
};
|
||||
};
|
||||
microsoft: {
|
||||
name: SsoAuthProviders;
|
||||
enabled: boolean;
|
||||
fields: {
|
||||
client_id: string;
|
||||
client_secret: string;
|
||||
callback_url: string;
|
||||
scope: string;
|
||||
tenant: string;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
mailConfigs: {
|
||||
name: string;
|
||||
enabled: boolean;
|
||||
fields: {
|
||||
mailer_smtp_url: string;
|
||||
mailer_from_address: string;
|
||||
};
|
||||
};
|
||||
|
||||
dataSharingConfigs: {
|
||||
name: string;
|
||||
enabled: boolean;
|
||||
};
|
||||
};
|
||||
|
||||
export type UpdatedConfigs = {
|
||||
name: InfraConfigEnum;
|
||||
value: string;
|
||||
};
|
||||
|
||||
export type ConfigTransform = {
|
||||
config: Config[];
|
||||
enabled?: boolean;
|
||||
fields?: Record<string, string | boolean> | string;
|
||||
};
|
||||
|
||||
export type ConfigSection = {
|
||||
enabled: boolean;
|
||||
fields: Record<string, string>;
|
||||
};
|
||||
|
||||
export type Config = {
|
||||
name: InfraConfigEnum;
|
||||
key: string;
|
||||
};
|
||||
|
||||
export const GOOGLE_CONFIGS: Config[] = [
|
||||
{
|
||||
name: InfraConfigEnum.GoogleClientId,
|
||||
key: 'client_id',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.GoogleClientSecret,
|
||||
key: 'client_secret',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.GoogleCallbackUrl,
|
||||
key: 'callback_url',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.GoogleScope,
|
||||
key: 'scope',
|
||||
},
|
||||
];
|
||||
|
||||
export const MICROSOFT_CONFIGS: Config[] = [
|
||||
{
|
||||
name: InfraConfigEnum.MicrosoftClientId,
|
||||
key: 'client_id',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.MicrosoftClientSecret,
|
||||
key: 'client_secret',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.MicrosoftCallbackUrl,
|
||||
key: 'callback_url',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.MicrosoftScope,
|
||||
key: 'scope',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.MicrosoftTenant,
|
||||
key: 'tenant',
|
||||
},
|
||||
];
|
||||
|
||||
export const GITHUB_CONFIGS: Config[] = [
|
||||
{
|
||||
name: InfraConfigEnum.GithubClientId,
|
||||
key: 'client_id',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.GithubClientSecret,
|
||||
key: 'client_secret',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.GithubCallbackUrl,
|
||||
key: 'callback_url',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.GithubScope,
|
||||
key: 'scope',
|
||||
},
|
||||
];
|
||||
|
||||
export const MAIL_CONFIGS: Config[] = [
|
||||
{
|
||||
name: InfraConfigEnum.MailerSmtpUrl,
|
||||
key: 'mailer_smtp_url',
|
||||
},
|
||||
{
|
||||
name: InfraConfigEnum.MailerAddressFrom,
|
||||
key: 'mailer_from_address',
|
||||
},
|
||||
];
|
||||
|
||||
const DATA_SHARING_CONFIGS: Omit<Config, 'key'>[] = [
|
||||
{
|
||||
name: InfraConfigEnum.AllowAnalyticsCollection,
|
||||
},
|
||||
];
|
||||
|
||||
export const ALL_CONFIGS = [
|
||||
GOOGLE_CONFIGS,
|
||||
MICROSOFT_CONFIGS,
|
||||
GITHUB_CONFIGS,
|
||||
MAIL_CONFIGS,
|
||||
DATA_SHARING_CONFIGS,
|
||||
];
|
||||
@@ -208,14 +208,13 @@ const deleteUserMutation = async (id: string | null) => {
|
||||
if (result.error) {
|
||||
toast.error(t('state.delete_user_failure'));
|
||||
} else {
|
||||
const deletedUser = result.data?.removeUsersByAdmin || [];
|
||||
handleUserDeletion(deletedUser);
|
||||
const deletedUsers = result.data?.removeUsersByAdmin || [];
|
||||
|
||||
const { isDeleted } = deletedUser[0];
|
||||
if (isDeleted) router.push('/users');
|
||||
handleUserDeletion(deletedUsers);
|
||||
}
|
||||
|
||||
confirmDeletion.value = false;
|
||||
deleteUserUID.value = null;
|
||||
|
||||
!result.error && router.push('/users');
|
||||
};
|
||||
</script>
|
||||
|
||||
32670
pnpm-lock.yaml
generated
32670
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user