@dative-gpi/foundation-core-services 0.0.165 → 0.0.166

package/composables/services/index.ts

@@ -1,7 +1,6 @@
 export * from "./useActions";
 export * from "./useAlerts";
 export * from "./useArticles";
-export * from "./useServiceAccountAuthTokens";
 export * from "./useChartCategories";
 export * from "./useChartOrganisationTypes";
 export * from "./useChartOrganisations";
@@ -31,7 +30,8 @@ export * from "./useRoleOrganisations";
 export * from "./useRoleOrganisationTypes";
 export * from "./useScenarioOrganisations";
 export * from "./useScenarioOrganisationTypes";
-export * from "./useServiceAccounts";
+export * from "./useServiceAccountOrganisationAuthTokens";
+export * from "./useServiceAccountOrganisations";
 export * from "./useUserOrganisations";
 export * from "./useUserOrganisationTables";
 export * from "./useWidgetTemplates";

package/composables/services/useServiceAccountOrganisationAuthTokens.ts

@@ -0,0 +1,19 @@
+import { ServiceAccountOrganisationAuthTokenDetails, ServiceAccountOrganisationAuthTokenDetailsDTO, ServiceAccountOrganisationAuthTokenFilters, CreateServiceAccountOrganisationAuthTokenDTO } from "@dative-gpi/foundation-core-domain/models";
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
+
+import { SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKENS_URL, SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKEN_URL } from "../../config/urls";
+
+const ServiceAccountOrganisationAuthTokenServiceFactory = new ServiceFactory<ServiceAccountOrganisationAuthTokenDetailsDTO, ServiceAccountOrganisationAuthTokenDetails>("serviceAccountOrganisationAuthToken", ServiceAccountOrganisationAuthTokenDetails).create(factory => factory.build(
+    ServiceFactory.addCustom("getMany", (axios, serviceAccountOrganisationId: string, filters: ServiceAccountOrganisationAuthTokenFilters) => axios.get(SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKENS_URL(serviceAccountOrganisationId), filters), (dtos: ServiceAccountOrganisationAuthTokenDetailsDTO[]) => dtos.map((dto: ServiceAccountOrganisationAuthTokenDetailsDTO) => new ServiceAccountOrganisationAuthTokenDetails(dto))),
+    factory.addNotify(notifyService => ({
+        ...ServiceFactory.addCustom("create", (axios, serviceAccountOrganisationId: string, data: CreateServiceAccountOrganisationAuthTokenDTO) => axios.post(SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKENS_URL(serviceAccountOrganisationId), data), (dto: ServiceAccountOrganisationAuthTokenDetailsDTO) => {
+            const result = new ServiceAccountOrganisationAuthTokenDetails(dto);
+            notifyService.notify("add", result);
+        }),
+        ...ServiceFactory.addCustom("remove", (axios, serviceAccountOrganisationId: string, authTokenId: string) => axios.delete(SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKEN_URL(serviceAccountOrganisationId, authTokenId)), () => {})
+    }))
+));
+
+export const useServiceAccountOrganisationAuthTokens = ComposableFactory.custom(ServiceAccountOrganisationAuthTokenServiceFactory.getMany);
+export const useCreateServiceAccountOrganisationAuthToken = ComposableFactory.custom(ServiceAccountOrganisationAuthTokenServiceFactory.create);
+export const useRemoveServiceAccountOrganisationAuthToken = ComposableFactory.custom(ServiceAccountOrganisationAuthTokenServiceFactory.remove);

package/composables/services/useServiceAccountOrganisations.ts

@@ -0,0 +1,13 @@
+import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
+import { CreateServiceAccountOrganisationDTO, UpdateServiceAccountOrganisationDTO, ServiceAccountOrganisationDetails, ServiceAccountOrganisationDetailsDTO, ServiceAccountOrganisationFilters, ServiceAccountOrganisationInfos, ServiceAccountOrganisationInfosDTO } from "@dative-gpi/foundation-core-domain/models";
+
+import { SERVICE_ACCOUNT_ORGANISATIONS_URL, SERVICE_ACCOUNT_ORGANISATION_URL } from "../../config/urls";
+
+const ServiceAccountOrganisationServiceFactory = new ServiceFactory<ServiceAccountOrganisationDetailsDTO, ServiceAccountOrganisationDetails>("serviceAccountOrganisation", ServiceAccountOrganisationDetails)
+.createComplete<ServiceAccountOrganisationInfos, ServiceAccountOrganisationInfosDTO, CreateServiceAccountOrganisationDTO, UpdateServiceAccountOrganisationDTO, ServiceAccountOrganisationFilters>(SERVICE_ACCOUNT_ORGANISATIONS_URL, SERVICE_ACCOUNT_ORGANISATION_URL, ServiceAccountOrganisationInfos);
+
+export const useServiceAccountOrganisation = ComposableFactory.get(ServiceAccountOrganisationServiceFactory);
+export const useServiceAccountOrganisations = ComposableFactory.getMany(ServiceAccountOrganisationServiceFactory);
+export const useCreateServiceAccountOrganisation = ComposableFactory.create(ServiceAccountOrganisationServiceFactory);
+export const useUpdateServiceAccountOrganisation = ComposableFactory.update(ServiceAccountOrganisationServiceFactory);
+export const useRemoveServiceAccountOrganisation = ComposableFactory.remove(ServiceAccountOrganisationServiceFactory);

package/config/urls/index.ts

@@ -1,7 +1,6 @@
 export * from "./actions";
 export * from "./alerts";
 export * from "./articles";
-export * from "./serviceAccountAuthTokens";
 export * from "./charts";
 export * from "./chartCategories";
 export * from "./chartOrganisations";
@@ -31,7 +30,8 @@ export * from "./roleOrganisations";
 export * from "./roleOrganisationTypes";
 export * from "./scenarioOrganisations";
 export * from "./scenarioOrganisationTypes";
-export * from "./serviceAccounts";
+export * from "./serviceAccountOrganisationAuthTokens";
+export * from "./serviceAccountOrganisations";
 export * from "./userOrganisations";
 export * from "./userOrganisationTables";
 export * from "./widgetTemplates";

package/config/urls/serviceAccountOrganisationAuthTokens.ts

@@ -0,0 +1,5 @@
+import { SERVICE_ACCOUNT_ORGANISATION_URL } from "./serviceAccountOrganisations";
+
+
+export const SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKENS_URL = (serviceAccountOrganisationId: string) => `${SERVICE_ACCOUNT_ORGANISATION_URL(serviceAccountOrganisationId)}/pats`;
+export const SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKEN_URL = (serviceAccountOrganisationId: string, authTokenId: string) => `${SERVICE_ACCOUNT_ORGANISATION_AUTH_TOKENS_URL(serviceAccountOrganisationId)}/${encodeURIComponent(authTokenId)}`;

package/config/urls/serviceAccountOrganisations.ts

@@ -0,0 +1,4 @@
+import { CORE_URL } from "./base";
+
+export const SERVICE_ACCOUNT_ORGANISATIONS_URL = () => `${CORE_URL()}/service-accounts`;
+export const SERVICE_ACCOUNT_ORGANISATION_URL = (serviceAccountOrganisationId: string) => `${SERVICE_ACCOUNT_ORGANISATIONS_URL()}/${encodeURIComponent(serviceAccountOrganisationId)}`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-services",
   "sideEffects": false,
-  "version": "0.0.165",
+  "version": "0.0.166",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -11,10 +11,10 @@
   "license": "ISC",
   "dependencies": {
     "@dative-gpi/bones-ui": "0.0.74",
-    "@dative-gpi/foundation-core-domain": "0.0.165",
+    "@dative-gpi/foundation-core-domain": "0.0.166",
     "@microsoft/signalr": "8.0.0",
     "vue": "3.4.23",
     "vue-router": "4.3.0"
   },
-  "gitHead": "13beb068d8bdd9fd17bc91165916b6ed6d8c9a07"
+  "gitHead": "1ba8f680febcc23d230b890ed81dcfd451fd009b"
 }

package/composables/services/useServiceAccountAuthTokens.ts

@@ -1,19 +0,0 @@
-import { ServiceAccountAuthTokenDetails, ServiceAccountAuthTokenDetailsDTO, ServiceAccountAuthTokenFilters, ServiceAccountAuthTokenInfos, ServiceAccountAuthTokenInfosDTO, CreateServiceAccountAuthTokenDTO } from "@dative-gpi/foundation-core-domain/models";
-import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
-
-import { SERVICE_ACCOUNT_AUTH_TOKENS_URL, SERVICE_ACCOUNT_AUTH_TOKEN_URL } from "../../config/urls";
-
-const ServiceAccountAuthTokenServiceFactory = new ServiceFactory<ServiceAccountAuthTokenDetailsDTO, ServiceAccountAuthTokenDetails>("serviceAccountAuthToken", ServiceAccountAuthTokenDetails).create(factory => factory.build(
-    ServiceFactory.addCustom("getMany", (axios, serviceAccountId: string, filters: ServiceAccountAuthTokenFilters) => axios.get(SERVICE_ACCOUNT_AUTH_TOKENS_URL(serviceAccountId), filters), (dtos: ServiceAccountAuthTokenDetailsDTO[]) => dtos.map((dto: ServiceAccountAuthTokenDetailsDTO) => new ServiceAccountAuthTokenDetails(dto))),
-    factory.addNotify(notifyService => ({
-        ...ServiceFactory.addCustom("create", (axios, serviceAccountId: string, data: CreateServiceAccountAuthTokenDTO) => axios.post(SERVICE_ACCOUNT_AUTH_TOKENS_URL(serviceAccountId), data), (dto: ServiceAccountAuthTokenDetailsDTO) => {
-            const result = new ServiceAccountAuthTokenDetails(dto);
-            notifyService.notify("add", result);
-        }),
-        ...ServiceFactory.addCustom("remove", (axios, serviceAccountId: string, authTokenId: string) => axios.delete(SERVICE_ACCOUNT_AUTH_TOKEN_URL(serviceAccountId, authTokenId)), () => {})
-    }))
-));
-
-export const useServiceAccountAuthTokens = ComposableFactory.custom(ServiceAccountAuthTokenServiceFactory.getMany);
-export const useCreateServiceAccountAuthToken = ComposableFactory.custom(ServiceAccountAuthTokenServiceFactory.create);
-export const useRemoveServiceAccountAuthToken = ComposableFactory.custom(ServiceAccountAuthTokenServiceFactory.remove);

package/composables/services/useServiceAccounts.ts

@@ -1,13 +0,0 @@
-import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
-import { CreateServiceAccountDTO, UpdateServiceAccountDTO, ServiceAccountDetails, ServiceAccountDetailsDTO, ServiceAccountFilters, ServiceAccountInfos, ServiceAccountInfosDTO } from "@dative-gpi/foundation-core-domain/models";
-
-import { SERVICE_ACCOUNTS_URL, SERVICE_ACCOUNT_URL } from "../../config/urls";
-
-const ServiceAccountServiceFactory = new ServiceFactory<ServiceAccountDetailsDTO, ServiceAccountDetails>("serviceAccount", ServiceAccountDetails)
-.createComplete<ServiceAccountInfos, ServiceAccountInfosDTO, CreateServiceAccountDTO, UpdateServiceAccountDTO, ServiceAccountFilters>(SERVICE_ACCOUNTS_URL, SERVICE_ACCOUNT_URL, ServiceAccountInfos);
-
-export const useServiceAccount = ComposableFactory.get(ServiceAccountServiceFactory);
-export const useServiceAccounts = ComposableFactory.getMany(ServiceAccountServiceFactory);
-export const useCreateServiceAccount = ComposableFactory.create(ServiceAccountServiceFactory);
-export const useUpdateServiceAccount = ComposableFactory.update(ServiceAccountServiceFactory);
-export const useRemoveServiceAccount = ComposableFactory.remove(ServiceAccountServiceFactory);

package/config/urls/serviceAccountAuthTokens.ts

@@ -1,5 +0,0 @@
-import { SERVICE_ACCOUNT_URL } from "./serviceAccounts";
-
-
-export const SERVICE_ACCOUNT_AUTH_TOKENS_URL = (serviceAccountId: string) => `${SERVICE_ACCOUNT_URL(serviceAccountId)}/pats`;
-export const SERVICE_ACCOUNT_AUTH_TOKEN_URL = (serviceAccountId: string, authTokenId: string) => `${SERVICE_ACCOUNT_AUTH_TOKENS_URL(serviceAccountId)}/${encodeURIComponent(authTokenId)}`;

package/config/urls/serviceAccounts.ts

@@ -1,4 +0,0 @@
-import { CORE_URL } from "./base";
-
-export const SERVICE_ACCOUNTS_URL = () => `${CORE_URL()}/service-accounts`;
-export const SERVICE_ACCOUNT_URL = (serviceAccountId: string) => `${SERVICE_ACCOUNTS_URL()}/${encodeURIComponent(serviceAccountId)}`;