From e7e8cbaa822781bb70d4e3baf1741f93fd986ca6 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 13:39:17 +0400
Subject: [PATCH 01/88] fix all types

---
 admin-ui/src/views/InstanceCreate.vue | 6 ++++--
 admin-ui/src/views/Instances.vue      | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin-ui/src/views/InstanceCreate.vue b/admin-ui/src/views/InstanceCreate.vue
index 9e5be093d..932b67a9e 100644
--- a/admin-ui/src/views/InstanceCreate.vue
+++ b/admin-ui/src/views/InstanceCreate.vue
@@ -264,10 +264,12 @@ export default {
     const types = require.context(
       "@/components/modules/",
       true,
-      /serviceCreate\.vue$/
+      /instanceCreate\.vue$/
     );
     types.keys().forEach((key) => {
-      const matched = key.match(/\.\/([A-Za-z0-9-_,\s]*)\/serviceCreate\.vue/i);
+      const matched = key.match(
+        /\.\/([A-Za-z0-9-_,\s]*)\/instanceCreate\.vue/i
+      );
       if (matched && matched.length > 1) {
         const type = matched[1];
         this.typeItems.push(type);
diff --git a/admin-ui/src/views/Instances.vue b/admin-ui/src/views/Instances.vue
index e2e106ef1..b0873a15e 100644
--- a/admin-ui/src/views/Instances.vue
+++ b/admin-ui/src/views/Instances.vue
@@ -263,11 +263,13 @@ export default {
     const types = require.context(
       "@/components/modules/",
       true,
-      /serviceCreate\.vue$/
+      /instanceCreate\.vue$/
     );
 
     types.keys().forEach((key) => {
-      const matched = key.match(/\.\/([A-Za-z0-9-_,\s]*)\/serviceCreate\.vue/i);
+      const matched = key.match(
+        /\.\/([A-Za-z0-9-_,\s]*)\/instanceCreate\.vue/i
+      );
       if (matched && matched.length > 1) {
         this.allTypes.push(matched[1]);
       }

From 8f6853c084038c692ec34151fe652390e0878095 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 12 Sep 2023 13:07:30 +0300
Subject: [PATCH 02/88] Fix merge conflict

---
 go.mod                 |  2 +-
 go.sum                 |  4 ++--
 pkg/billing/records.go | 48 +++++++++++++++++++++++++++++++++++-------
 pkg/graph/records.go   | 20 ++++++++++++++++++
 4 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index b9b3fa24f..9df0a1b7a 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
 	github.com/rabbitmq/amqp091-go v1.8.1
 	github.com/rs/cors v1.10.0
-	github.com/slntopp/nocloud-proto v0.0.0-20230906151231-bea1cc083598
+	github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685
 	github.com/spf13/viper v1.16.0
 	github.com/stoewer/go-strcase v1.3.0
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
diff --git a/go.sum b/go.sum
index a5562073c..d98cd0270 100644
--- a/go.sum
+++ b/go.sum
@@ -202,8 +202,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/slntopp/nocloud-proto v0.0.0-20230906151231-bea1cc083598 h1:qsp3aJqjT0pqRXILkji6hfnXxZe0whvWHqbpJH3nIik=
-github.com/slntopp/nocloud-proto v0.0.0-20230906151231-bea1cc083598/go.mod h1:7A1kZNGXKKLhEnt2ELeb1e1XgeyAUkCpgxjyg/Vn5vg=
+github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685 h1:z55krMEmUcSgmnb3szZBhuqGdxEwcuLa0BcUotG/AO0=
+github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685/go.mod h1:HY6zAuqFtnMRWY2uSvpvyBioOOk3iGl0qUdAxOhja0k=
 github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
 github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
diff --git a/pkg/billing/records.go b/pkg/billing/records.go
index 00e377e10..38083a715 100644
--- a/pkg/billing/records.go
+++ b/pkg/billing/records.go
@@ -411,11 +411,27 @@ func (s *BillingServiceServer) GetInstancesReportsCount(ctx context.Context, req
 func (s *BillingServiceServer) GetRecordsReports(ctx context.Context, req *pb.GetRecordsReportsRequest) (*pb.GetRecordsReportsResponse, error) {
 	requestor := ctx.Value(nocloud.NoCloudAccount).(string)
 
-	ns := driver.NewDocumentID(schema.NAMESPACES_COL, schema.ROOT_NAMESPACE_KEY)
+	if req.Account != nil || req.Service != nil {
+		if req.Account != nil {
+			acc := *req.Account
+			node := driver.NewDocumentID(schema.ACCOUNTS_COL, acc)
+			if !graph.HasAccess(ctx, s.db, requestor, node, access.Level_ADMIN) {
+				return nil, status.Error(codes.PermissionDenied, "Not enough Access Rights")
+			}
+		}
 
-	ok := graph.HasAccess(ctx, s.db, requestor, ns, access.Level_ROOT)
-	if !ok {
-		return nil, status.Error(codes.PermissionDenied, "Permission denied")
+		if req.Service != nil {
+			srv := *req.Account
+			node := driver.NewDocumentID(schema.ACCOUNTS_COL, srv)
+			if !graph.HasAccess(ctx, s.db, requestor, node, access.Level_ADMIN) {
+				return nil, status.Error(codes.PermissionDenied, "Not enough Access Rights")
+			}
+		}
+	} else {
+		ns := driver.NewDocumentID(schema.NAMESPACES_COL, schema.ROOT_NAMESPACE_KEY)
+		if ok := graph.HasAccess(ctx, s.db, requestor, ns, access.Level_ROOT); !ok {
+			return nil, status.Error(codes.PermissionDenied, "Permission denied")
+		}
 	}
 
 	return s.records.GetRecordsReports(ctx, req)
@@ -424,11 +440,27 @@ func (s *BillingServiceServer) GetRecordsReports(ctx context.Context, req *pb.Ge
 func (s *BillingServiceServer) GetRecordsReportsCount(ctx context.Context, req *pb.GetRecordsReportsCountRequest) (*pb.GetReportsCountResponse, error) {
 	requestor := ctx.Value(nocloud.NoCloudAccount).(string)
 
-	ns := driver.NewDocumentID(schema.NAMESPACES_COL, schema.ROOT_NAMESPACE_KEY)
+	if req.Account != nil || req.Service != nil {
+		if req.Account != nil {
+			acc := *req.Account
+			node := driver.NewDocumentID(schema.ACCOUNTS_COL, acc)
+			if !graph.HasAccess(ctx, s.db, requestor, node, access.Level_ADMIN) {
+				return nil, status.Error(codes.PermissionDenied, "Not enough Access Rights")
+			}
+		}
 
-	ok := graph.HasAccess(ctx, s.db, requestor, ns, access.Level_ROOT)
-	if !ok {
-		return nil, status.Error(codes.PermissionDenied, "Permission denied")
+		if req.Service != nil {
+			srv := *req.Account
+			node := driver.NewDocumentID(schema.ACCOUNTS_COL, srv)
+			if !graph.HasAccess(ctx, s.db, requestor, node, access.Level_ADMIN) {
+				return nil, status.Error(codes.PermissionDenied, "Not enough Access Rights")
+			}
+		}
+	} else {
+		ns := driver.NewDocumentID(schema.NAMESPACES_COL, schema.ROOT_NAMESPACE_KEY)
+		if ok := graph.HasAccess(ctx, s.db, requestor, ns, access.Level_ROOT); !ok {
+			return nil, status.Error(codes.PermissionDenied, "Permission denied")
+		}
 	}
 
 	res, err := s.records.GetRecordsReportsCount(ctx, req)
diff --git a/pkg/graph/records.go b/pkg/graph/records.go
index 7a425e437..2b0cf5b65 100644
--- a/pkg/graph/records.go
+++ b/pkg/graph/records.go
@@ -189,6 +189,16 @@ func (ctrl *RecordsController) GetRecordsReports(ctx context.Context, req *pb.Ge
 		"@records": schema.RECORDS_COL,
 	}
 
+	if req.Account != nil {
+		query += ` FILTER t.account == @acc`
+		params["acc"] = req.GetAccount()
+	}
+
+	if req.Service != nil {
+		query += ` FILTER t.service == @srv`
+		params["srv"] = req.GetService()
+	}
+
 	if req.From != nil {
 		query += " FILTER record.exec >= @from"
 		params["from"] = req.GetFrom()
@@ -272,6 +282,16 @@ func (ctrl *RecordsController) GetRecordsReportsCount(ctx context.Context, req *
 		"@records": schema.RECORDS_COL,
 	}
 
+	if req.Account != nil {
+		query += ` FILTER t.account == @acc`
+		params["acc"] = req.GetAccount()
+	}
+
+	if req.Service != nil {
+		query += ` FILTER t.service == @srv`
+		params["srv"] = req.GetService()
+	}
+
 	if req.From != nil {
 		query += " FILTER record.exec >= @from"
 		params["from"] = req.GetFrom()

From 04aeeb7efa3dc12bbfaeb7d0321b272884b8810c Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 14:41:13 +0400
Subject: [PATCH 03/88] add accountId to instance create

---
 admin-ui/src/views/InstanceCreate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin-ui/src/views/InstanceCreate.vue b/admin-ui/src/views/InstanceCreate.vue
index 932b67a9e..85cca3db0 100644
--- a/admin-ui/src/views/InstanceCreate.vue
+++ b/admin-ui/src/views/InstanceCreate.vue
@@ -74,6 +74,7 @@
         @set-meta="meta = $event"
         :instance="instance"
         :plans="plans"
+        :account-id="accountId"
         :plan-rules="planRules"
         :sp-uuid="serviceProviderId"
         :is="templates[type] ?? templates.custom"

From d3ade890d44affd8f56e9c502710ffb10fb5d05d Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 14:41:40 +0400
Subject: [PATCH 04/88] add openai instance create,sp create, instance billing

---
 .../components/modules/openai/billingInfo.vue | 213 ++++++++++++++++++
 .../modules/openai/instanceCreate.vue         |  83 +++++++
 .../modules/openai/serviceProviders.vue       | 117 ++++++++++
 3 files changed, 413 insertions(+)
 create mode 100644 admin-ui/src/components/modules/openai/billingInfo.vue
 create mode 100644 admin-ui/src/components/modules/openai/instanceCreate.vue
 create mode 100644 admin-ui/src/components/modules/openai/serviceProviders.vue

diff --git a/admin-ui/src/components/modules/openai/billingInfo.vue b/admin-ui/src/components/modules/openai/billingInfo.vue
new file mode 100644
index 000000000..b8f29235f
--- /dev/null
+++ b/admin-ui/src/components/modules/openai/billingInfo.vue
@@ -0,0 +1,213 @@
+<template>
+  <div>
+    <v-row>
+      <v-col cols="4">
+        <v-text-field
+          readonly
+          label="price model"
+          :value="template.billingPlan.title"
+          @click:append="priceModelDialog = true"
+          append-icon="mdi-pencil"
+        />
+      </v-col>
+    </v-row>
+    <v-expansion-panels>
+      <v-expansion-panel>
+        <v-expansion-panel-header color="background-light"
+          >Prices</v-expansion-panel-header
+        >
+        <v-expansion-panel-content
+          class="openai-billing"
+          color="background-light"
+        >
+          <nocloud-table
+            class="mb-5"
+            :headers="billingHeaders"
+            :items="billingItems"
+            no-hide-uuid
+            :show-select="false"
+            hide-default-footer
+          >
+            <template v-slot:[`item.price`]="{ item }">
+              <v-text-field
+                :suffix="defaultCurrency"
+                v-model="item.price"
+                @input="updatePrice(item, false)"
+                append-icon="mdi-pencil"
+              />
+            </template>
+            <template v-slot:[`item.accountPrice`]="{ item }">
+              <v-text-field
+                :suffix="accountCurrency"
+                v-model="item.accountPrice"
+                @input="updatePrice(item, true)"
+                append-icon="mdi-pencil"
+              />
+            </template>
+          </nocloud-table>
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+    </v-expansion-panels>
+    <v-dialog persistent :value="priceModelDialog" max-width="60%">
+      <v-card class="pa-5">
+        <v-card-title class="text-center">Change price model</v-card-title>
+        <v-row align="center">
+          <v-col cols="12">
+            <v-autocomplete
+              label="price model"
+              item-text="title"
+              item-value="uuid"
+              return-object
+              v-model="newPlan"
+              :items="filteredPlans"
+            />
+          </v-col>
+        </v-row>
+
+        <v-row justify="end">
+          <v-btn class="mx-3" @click="priceModelDialog = false">Close</v-btn>
+          <v-btn
+            class="mx-3"
+            :loading="isChangePMLoading"
+            :disabled="isChangeBtnDisabled"
+            @click="changePM"
+            >Change price model</v-btn
+          >
+        </v-row>
+      </v-card>
+    </v-dialog>
+  </div>
+</template>
+
+<script setup>
+import {
+  defineProps,
+  ref,
+  defineEmits,
+  toRefs,
+  computed,
+  onMounted,
+  watch,
+} from "vue";
+import NocloudTable from "@/components/table.vue";
+import useAccountConverter from "@/hooks/useAccountConverter";
+import { useStore } from "@/store";
+import api from "@/api";
+
+const props = defineProps(["template", "plans", "service", "sp"]);
+const emit = defineEmits(["refresh", "update"]);
+
+const { template, plans, service } = toRefs(props);
+
+const store = useStore();
+const {
+  fetchAccountRate,
+  accountCurrency,
+  toAccountPrice,
+  accountRate,
+  fromAccountPrice,
+} = useAccountConverter(template.value);
+
+const priceModelDialog = ref(false);
+const newPlan = ref();
+const isChangePMLoading = ref(false);
+
+const billingItems = ref([]);
+const billingHeaders = ref([
+  { text: "Name", value: "name" },
+  { text: "Price per thousand", value: "price" },
+  { text: "Account price per thousand", value: "accountPrice" },
+]);
+
+onMounted(() => {
+  billingItems.value = getBillingItems();
+  fetchAccountRate(accountCurrency);
+});
+const filteredPlans = computed(() =>
+  plans.value.filter((p) => p.type === "openai")
+);
+const defaultCurrency = computed(() => store.getters["currencies/default"]);
+const isChangeBtnDisabled = computed(() => !newPlan.value);
+
+const changePM = () => {
+  const tempService = JSON.parse(JSON.stringify(service.value));
+
+  const igIndex = tempService.instancesGroups.findIndex((ig) =>
+    ig.instances.find((i) => i.uuid === template.value.uuid)
+  );
+  const instanceIndex = tempService.instancesGroups[
+    igIndex
+  ].instances.findIndex((i) => i.uuid === template.value.uuid);
+
+  tempService.instancesGroups[igIndex].instances[instanceIndex].billingPlan =
+    newPlan.value;
+
+  isChangePMLoading.value = true;
+  api.services
+    ._update(tempService)
+    .then(() => {
+      emit("refresh");
+    })
+    .finally(() => {
+      isChangePMLoading.value = false;
+      emit("input", false);
+    });
+};
+
+const getBillingItems = () => {
+  const items = [];
+
+  const acceptedResources = ["input_kilotoken", "output_kilotoken"];
+
+  template.value.billingPlan.resources.forEach((r, index) => {
+    if (acceptedResources.includes(r.key)) {
+      items.push({
+        name: r.key.replace("_kilotoken", ""),
+        price: r.price,
+        accountPrice: toAccountPrice(r.price),
+        path: `billingPlan.resources.${index}.price`,
+      });
+    }
+  });
+
+  return items;
+};
+
+const updatePrice = (item, isAccount) => {
+  if (isAccount) {
+    emit("update", {
+      key: item.path,
+      value: fromAccountPrice(item.accountPrice),
+    });
+    billingItems.value = billingItems.value.map((p) => {
+      if (p.path === item.path) {
+        p.price = fromAccountPrice(item.accountPrice);
+      }
+      return p;
+    });
+  } else {
+    emit("update", { key: item.path, value: item.price });
+    billingItems.value = billingItems.value.map((p) => {
+      if (p.path === item.path) {
+        p.accountPrice = toAccountPrice(item.price);
+      }
+      return p;
+    });
+  }
+};
+
+watch(accountRate, () => {
+  billingItems.value = billingItems.value.map((i) => {
+    i.accountPrice = toAccountPrice(i.price);
+    return i;
+  });
+});
+</script>
+
+<style lang="scss">
+.openai-billing {
+  .v-expansion-panel-content__wrap {
+    padding: 0px !important;
+  }
+}
+</style>
diff --git a/admin-ui/src/components/modules/openai/instanceCreate.vue b/admin-ui/src/components/modules/openai/instanceCreate.vue
new file mode 100644
index 000000000..e115e7701
--- /dev/null
+++ b/admin-ui/src/components/modules/openai/instanceCreate.vue
@@ -0,0 +1,83 @@
+<template>
+  <div class="module">
+    <v-card
+      v-if="Object.keys(instance).length > 1"
+      class="mb-4 pa-2"
+      elevation="0"
+      color="background"
+    >
+      <v-row>
+        <v-col cols="6">
+          <v-text-field
+            @change="(newVal) => setValue('title', newVal)"
+            label="title"
+            :value="instance.title"
+          >
+          </v-text-field>
+        </v-col>
+      </v-row>
+      <v-row>
+        <v-col cols="6">
+          <v-autocomplete
+            label="price model"
+            item-text="title"
+            item-value="uuid"
+            :value="instance.billing_plan"
+            :items="plans.list"
+            :rules="planRules"
+            @change="changeBilling"
+          />
+        </v-col>
+      </v-row>
+    </v-card>
+  </div>
+</template>
+
+<script>
+const getDefaultInstance = () => ({
+  title: "instance",
+  data: {},
+  billing_plan: {},
+  config: {
+    user: null,
+  },
+});
+export default {
+  name: "instance-openai-create",
+  props: ["plans", "instance", "planRules", "sp-uuid", "is-edit", "accountId"],
+  data: () => ({ bilingPlan: null, products: [] }),
+  mounted() {
+    if (!this.isEdit) {
+      this.$emit("set-instance", getDefaultInstance());
+    } else {
+      this.changeBilling(this.instance.billing_plan);
+    }
+    this.setValue("config.user", this.accountId);
+  },
+  methods: {
+    changeBilling(val) {
+      this.bilingPlan = this.plans.list.find((p) => p.uuid === val);
+      if (this.bilingPlan) {
+        this.products = Object.keys(this.bilingPlan.products).map((key) => ({
+          key,
+          title: this.bilingPlan.products[key].title,
+        }));
+      }
+      this.setValue("billing_plan", this.bilingPlan);
+    },
+    setValue(key, value) {
+      this.$emit("set-value", { key, value });
+    },
+  },
+  watch: {
+    "plans.list"() {
+      this.changeBilling(this.instance.billing_plan);
+    },
+    accountId() {
+      this.setValue("config.user", this.accountId);
+    },
+  },
+};
+</script>
+
+<style scoped></style>
diff --git a/admin-ui/src/components/modules/openai/serviceProviders.vue b/admin-ui/src/components/modules/openai/serviceProviders.vue
new file mode 100644
index 000000000..bcc437f7e
--- /dev/null
+++ b/admin-ui/src/components/modules/openai/serviceProviders.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="sp-ovh">
+    <v-row align="center" v-for="field in Object.keys(fields)" :key="field">
+      <v-col cols="4">
+        <v-subheader>
+          {{ fields[field].subheader || field }}
+        </v-subheader>
+      </v-col>
+
+      <v-col cols="8">
+        <v-text-field
+          :value="getValue(field)"
+          :label="fields[field].label"
+          :rules="fields[field].rules"
+          :error-messages="errors[field]"
+          @change="(data) => changeHandler(field, data)"
+        />
+      </v-col>
+    </v-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "servicesProviders-create-openai",
+  props: {
+    secrets: {
+      type: Object,
+      default: () => ({}),
+    },
+    vars: {
+      type: Object,
+      default: () => ({}),
+    },
+    passed: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data: () => ({
+    errors: {
+      domain: [],
+      token: [],
+    },
+    fields: {
+      secret_key: {
+        label: "Secret key",
+        subheader: "Secret key",
+        rules: [(value) => !!value || "Field is required"],
+        type: "secrets",
+      },
+      org_key: {
+        label: "Organization key",
+        subheader: "Organization key",
+        rules: [],
+        type: "secrets",
+      },
+      bot_account_uuid: {
+        label: "Bot account uuid",
+        subheader: "Bot account uuid",
+        rules: [(value) => !!value || "Field is required"],
+        type: "vars",
+      },
+      openai_namespace: {
+        label: "Openai namespace",
+        subheader: "Openai namespace",
+        rules: [(value) => !!value || "Field is required"],
+        type: "vars",
+      },
+    },
+  }),
+  methods: {
+    changeHandler(input, data) {
+      const errors = {};
+      const newSecrets = {};
+      const newVars = {};
+
+      for (const key of Object.keys(this.secrets)) {
+        newSecrets[key] = this.secrets[key];
+      }
+      for (const key of Object.keys(this.vars)) {
+        newVars[key] = this.vars[key];
+      }
+
+      if (this.fields[input].type === "secrets") {
+        newSecrets[input] = data;
+      } else {
+        newVars[input] = { default: data };
+      }
+
+      this.$emit(`change:secrets`, newSecrets);
+      this.$emit(`change:vars`, newVars);
+      this.$emit(`passed`, Object.keys(errors).length === 0);
+
+      this.fields[input].rules.forEach((rule) => {
+        const result = rule(data);
+        if (typeof result == "string") {
+          this.errors[input] = [result];
+          errors[input] = result;
+        } else {
+          this.errors[input] = [];
+        }
+      });
+    },
+    setVarsValueDefault(vars, fieldName, isChange, data) {
+      vars[fieldName] = {
+        value: {
+          default: isChange ? JSON.parse(data) : this.getValue(fieldName),
+        },
+      };
+    },
+    getValue(fieldName) {
+      return this.secrets[fieldName];
+    },
+  },
+};
+</script>

From 9de7683591b3d74bd6f327cb638c4fe55aa7c26d Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 14:41:53 +0400
Subject: [PATCH 05/88] add openai to change prices

---
 admin-ui/src/components/instance/controls.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/instance/controls.vue b/admin-ui/src/components/instance/controls.vue
index 355f51bdc..393889af0 100644
--- a/admin-ui/src/components/instance/controls.vue
+++ b/admin-ui/src/components/instance/controls.vue
@@ -114,8 +114,9 @@ export default {
           ...this.copyTemplate.billingPlan,
           title,
           products: {
-            [this.product]:
-              this.copyTemplate.billingPlan.products[this.product],
+            [this.product]: this.product
+              ? this.copyTemplate.billingPlan.products[this.product]
+              : undefined,
           },
           public: false,
         };
@@ -308,6 +309,7 @@ export default {
 
       switch (type) {
         case "virtual":
+        case "openai":
         case "ione": {
           return (item) => {
             let planTitle = `IND_${this.sp.title}_${

From c25b30565c4db7834fbc3108a849858978483d12 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 15:42:57 +0400
Subject: [PATCH 06/88] make menu open on hover

---
 admin-ui/src/App.vue | 408 +++++++++++++++++++++++--------------------
 1 file changed, 223 insertions(+), 185 deletions(-)

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index 60c6c70ad..87e91051f 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -43,7 +43,7 @@
         </div>
       </router-link>
 
-      <v-list v-if="isLoggedIn" dense :dark="asideDark">
+      <v-list style="height: 100%" v-if="isLoggedIn" dense :dark="asideDark">
         <div
           :class="{
             'd-flex': true,
@@ -59,190 +59,201 @@
           </v-btn>
         </div>
 
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Dashboard' }">
-          <v-list-item-icon>
-            <v-icon>mdi-view-dashboard-variant</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Dashboard") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Accounts' }">
-          <v-list-item-icon>
-            <v-icon>mdi-account-multiple</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Accounts") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Namespaces' }">
-          <v-list-item-icon>
-            <v-icon>mdi-form-textbox</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{
-              navTitle("Groups (NameSpaces)")
-            }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item
-          v-bind="listItemBind"
-          :to="{ name: 'Services' }"
-          @click.ctrl="() => (easterEgg = true)"
-        >
-          <v-list-item-icon>
-            <v-icon :color="easterEgg ? 'green darker-2' : undefined"
-              >mdi-alien</v-icon
-            >
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Services") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Instances' }">
-          <v-list-item-icon>
-            <v-icon>mdi-server</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Instances") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'ServicesProviders' }">
-          <v-list-item-icon>
-            <v-icon>mdi-database-marker</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{
-              navTitle("Services Providers")
-            }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Showcases' }">
-          <v-list-item-icon>
-            <v-icon>mdi-store-search</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Showcases") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-subheader>BILLING</v-subheader>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Plans' }">
-          <v-list-item-icon>
-            <v-icon>mdi-script-text</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{
-              navTitle("Price Models")
-            }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Transactions' }">
-          <v-list-item-icon>
-            <v-icon>mdi-abacus</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{
-              navTitle("Transactions")
-            }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Currencies' }">
-          <v-list-item-icon>
-            <v-icon>mdi-cash</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Currencies") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Reports' }">
-          <v-list-item-icon>
-            <v-icon>mdi-chart-gantt</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Reports") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-subheader v-if="plugins?.length > 0">PLUGINS</v-subheader>
-
-        <v-list-item
-          v-bind="listItemBind"
-          v-for="plugin of plugins"
-          :key="plugin.url"
-          :to="{ name: 'Plugin', params: plugin, query: { url: plugin.url } }"
-        >
-          <v-list-item-icon>
-            <v-icon>mdi-{{ plugin.icon }}</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle(plugin.title) }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-subheader>SYSTEM</v-subheader>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Chats' }">
-          <v-list-item-icon>
-            <v-icon>mdi-chat</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Chats") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'History' }">
-          <v-list-item-icon>
-            <v-icon>mdi-history</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Event log") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'DNS manager' }">
-          <v-list-item-icon>
-            <v-icon>mdi-dns</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("DNS manager") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
-
-        <v-list-item v-bind="listItemBind" :to="{ name: 'Settings' }">
-          <v-list-item-icon>
-            <v-icon>mdi-cogs</v-icon>
-          </v-list-item-icon>
-
-          <v-list-item-content>
-            <v-list-item-title>{{ navTitle("Settings") }}</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
+        <div style="height: 100%" id="drawer-menu-hover">
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Dashboard' }">
+            <v-list-item-icon>
+              <v-icon>mdi-view-dashboard-variant</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Dashboard") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Accounts' }">
+            <v-list-item-icon>
+              <v-icon>mdi-account-multiple</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Accounts") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Namespaces' }">
+            <v-list-item-icon>
+              <v-icon>mdi-form-textbox</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{
+                navTitle("Groups (NameSpaces)")
+              }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item
+            v-bind="listItemBind"
+            :to="{ name: 'Services' }"
+            @click.ctrl="() => (easterEgg = true)"
+          >
+            <v-list-item-icon>
+              <v-icon :color="easterEgg ? 'green darker-2' : undefined"
+                >mdi-alien</v-icon
+              >
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Services") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Instances' }">
+            <v-list-item-icon>
+              <v-icon>mdi-server</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Instances") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item
+            v-bind="listItemBind"
+            :to="{ name: 'ServicesProviders' }"
+          >
+            <v-list-item-icon>
+              <v-icon>mdi-database-marker</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{
+                navTitle("Services Providers")
+              }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Showcases' }">
+            <v-list-item-icon>
+              <v-icon>mdi-store-search</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Showcases") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-subheader>BILLING</v-subheader>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Plans' }">
+            <v-list-item-icon>
+              <v-icon>mdi-script-text</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{
+                navTitle("Price Models")
+              }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Transactions' }">
+            <v-list-item-icon>
+              <v-icon>mdi-abacus</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{
+                navTitle("Transactions")
+              }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Currencies' }">
+            <v-list-item-icon>
+              <v-icon>mdi-cash</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{
+                navTitle("Currencies")
+              }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Reports' }">
+            <v-list-item-icon>
+              <v-icon>mdi-chart-gantt</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Reports") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-subheader v-if="plugins?.length > 0">PLUGINS</v-subheader>
+
+          <v-list-item
+            v-bind="listItemBind"
+            v-for="plugin of plugins"
+            :key="plugin.url"
+            :to="{ name: 'Plugin', params: plugin, query: { url: plugin.url } }"
+          >
+            <v-list-item-icon>
+              <v-icon>mdi-{{ plugin.icon }}</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{
+                navTitle(plugin.title)
+              }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-subheader>SYSTEM</v-subheader>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Chats' }">
+            <v-list-item-icon>
+              <v-icon>mdi-chat</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Chats") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'History' }">
+            <v-list-item-icon>
+              <v-icon>mdi-history</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Event log") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'DNS manager' }">
+            <v-list-item-icon>
+              <v-icon>mdi-dns</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{
+                navTitle("DNS manager")
+              }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
+          <v-list-item v-bind="listItemBind" :to="{ name: 'Settings' }">
+            <v-list-item-icon>
+              <v-icon>mdi-cogs</v-icon>
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Settings") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+        </div>
       </v-list>
     </v-navigation-drawer>
 
@@ -321,6 +332,7 @@ export default {
   components: { AppSnackbar, balance, appSearch, languages },
   data: () => ({
     isMenuMinimize: true,
+    isMouseOnMenu: false,
     easterEgg: false,
     config,
     navTitles: config.navTitles ?? {},
@@ -344,6 +356,30 @@ export default {
 
       return title;
     },
+    configureHoverOnMenu() {
+      document
+        .getElementById("drawer-menu-hover")
+        .addEventListener("mouseenter", () => {
+          if (this.isMenuMinimize) {
+            this.isMouseOnMenu = true;
+            setTimeout(() => {
+              if (this.isMouseOnMenu) {
+                this.isMenuMinimize = false;
+              }
+            }, 500);
+          }
+        });
+      document
+        .getElementById("drawer-menu-hover")
+        .addEventListener("mouseleave", () => {
+          if (this.isMouseOnMenu) {
+            this.isMouseOnMenu = false;
+            setTimeout(() => {
+              this.isMenuMinimize = true;
+            }, 500);
+          }
+        });
+    },
   },
   computed: {
     isLoggedIn() {
@@ -437,6 +473,8 @@ export default {
   mounted() {
     this.onResize();
     window.addEventListener("resize", this.onResize, { passive: true });
+
+    this.configureHoverOnMenu();
   },
   watch: {
     isLoggedIn(newVal) {

From 6cb2a6a8473fa346ba2cbfe0c5255b22f659446a Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 15:45:57 +0400
Subject: [PATCH 07/88] move servecis down showcases

---
 admin-ui/src/App.vue | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index 87e91051f..c59698b5e 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -92,22 +92,6 @@
             </v-list-item-content>
           </v-list-item>
 
-          <v-list-item
-            v-bind="listItemBind"
-            :to="{ name: 'Services' }"
-            @click.ctrl="() => (easterEgg = true)"
-          >
-            <v-list-item-icon>
-              <v-icon :color="easterEgg ? 'green darker-2' : undefined"
-                >mdi-alien</v-icon
-              >
-            </v-list-item-icon>
-
-            <v-list-item-content>
-              <v-list-item-title>{{ navTitle("Services") }}</v-list-item-title>
-            </v-list-item-content>
-          </v-list-item>
-
           <v-list-item v-bind="listItemBind" :to="{ name: 'Instances' }">
             <v-list-item-icon>
               <v-icon>mdi-server</v-icon>
@@ -143,6 +127,22 @@
             </v-list-item-content>
           </v-list-item>
 
+          <v-list-item
+            v-bind="listItemBind"
+            :to="{ name: 'Services' }"
+            @click.ctrl="() => (easterEgg = true)"
+          >
+            <v-list-item-icon>
+              <v-icon :color="easterEgg ? 'green darker-2' : undefined"
+                >mdi-alien</v-icon
+              >
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Services") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
           <v-subheader>BILLING</v-subheader>
 
           <v-list-item v-bind="listItemBind" :to="{ name: 'Plans' }">

From 6cfe6e0f64a1af64a756a80051fbd3c45e7d905f Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 12 Sep 2023 15:21:53 +0300
Subject: [PATCH 08/88] Add login event

---
 pkg/registry/accounts.go | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkg/registry/accounts.go b/pkg/registry/accounts.go
index 7f0df6ca2..9a152d10e 100644
--- a/pkg/registry/accounts.go
+++ b/pkg/registry/accounts.go
@@ -17,6 +17,7 @@ package registry
 
 import (
 	"context"
+	elpb "github.com/slntopp/nocloud-proto/events_logging"
 	"github.com/slntopp/nocloud/pkg/nocloud/sessions"
 	"time"
 
@@ -366,6 +367,21 @@ func (s *AccountsServiceServer) Token(ctx context.Context, request *accountspb.T
 		return nil, status.Error(codes.Internal, "Failed to issue token")
 	}
 
+	var event = &elpb.Event{
+		Entity:    schema.ACCOUNTS_COL,
+		Uuid:      requestor.(string),
+		Scope:     "database",
+		Action:    "login",
+		Rc:        0,
+		Requestor: requestor.(string),
+		Ts:        time.Now().Unix(),
+		Snapshot: &elpb.Snapshot{
+			Diff: "",
+		},
+	}
+
+	nocloud.Log(log, event)
+
 	return &accountspb.TokenResponse{Token: token_string}, nil
 }
 

From d558327945e61583e079d1027d7c04a28269e4d6 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 17:08:50 +0400
Subject: [PATCH 09/88] add multilanguage title

---
 admin-ui/src/components/showcase/promo.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin-ui/src/components/showcase/promo.vue b/admin-ui/src/components/showcase/promo.vue
index c50a2f967..1ca6efaf3 100644
--- a/admin-ui/src/components/showcase/promo.vue
+++ b/admin-ui/src/components/showcase/promo.vue
@@ -26,6 +26,11 @@
       </v-col>
     </v-row>
     <template v-if="language && Object.keys(currentLocation).length">
+      <v-text-field
+        v-model.trim="currentLocation.title"
+        outlined
+        label="Title"
+      />
       <v-card-title class="text-center">Service settings</v-card-title>
       <v-text-field
         v-model.trim="currentLocation.service.title"

From 73ad7076cfb1747556b0db3da1e69fd54388e79a Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 17:30:11 +0400
Subject: [PATCH 10/88] add sort tags by alphabet

---
 admin-ui/src/components/search/search.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index 157b092d8..4cc4d6b67 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -249,6 +249,8 @@ export default {
         }
       });
 
+      values.sort((a, b) => a.title.localeCompare(b.title));
+
       return values;
     },
     routeCustomParams() {

From 80c5a1a9bd9103e8ea91fb083bdf6d77ca937f24 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 12 Sep 2023 16:33:16 +0300
Subject: [PATCH 11/88] Fix

---
 pkg/graph/instances.go           | 4 +++-
 pkg/instances/server.go          | 4 ++--
 pkg/services_providers/server.go | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/graph/instances.go b/pkg/graph/instances.go
index 35110df7e..30e27694c 100644
--- a/pkg/graph/instances.go
+++ b/pkg/graph/instances.go
@@ -143,6 +143,8 @@ func (ctrl *InstancesController) Update(ctx context.Context, sp string, inst, ol
 	log := ctrl.log.Named("Update")
 	log.Debug("Updating Instance", zap.Any("instance", inst))
 
+	uuid := inst.GetUuid()
+
 	if oldInst.GetStatus() == spb.NoCloudStatus_DEL {
 		log.Info("Inst cannot be updated. Status DEL", zap.String("uuid", oldInst.GetUuid()))
 		return nil
@@ -235,7 +237,7 @@ func (ctrl *InstancesController) Update(ctx context.Context, sp string, inst, ol
 
 	var event = &elpb.Event{
 		Entity:    INSTANCES_COL,
-		Uuid:      inst.GetUuid(),
+		Uuid:      uuid,
 		Scope:     "database",
 		Action:    "update",
 		Rc:        0,
diff --git a/pkg/instances/server.go b/pkg/instances/server.go
index 99671e20c..300846c0a 100644
--- a/pkg/instances/server.go
+++ b/pkg/instances/server.go
@@ -138,7 +138,7 @@ func (s *InstancesServer) Invoke(ctx context.Context, req *pb.InvokeRequest) (*p
 
 	var event = &elpb.Event{
 		Entity:    schema.INSTANCES_COL,
-		Uuid:      instance.GetUuid(),
+		Uuid:      req.GetUuid(),
 		Scope:     "driver",
 		Action:    req.Method,
 		Rc:        0,
@@ -188,7 +188,7 @@ func (s *InstancesServer) Delete(ctx context.Context, req *pb.DeleteRequest) (*p
 
 	var event = &elpb.Event{
 		Entity:    schema.INSTANCES_COL,
-		Uuid:      instance.GetUuid(),
+		Uuid:      req.GetUuid(),
 		Scope:     "database",
 		Action:    "delete",
 		Rc:        0,
diff --git a/pkg/services_providers/server.go b/pkg/services_providers/server.go
index 46c92e0c6..94e8c35cf 100644
--- a/pkg/services_providers/server.go
+++ b/pkg/services_providers/server.go
@@ -552,7 +552,7 @@ func (s *ServicesProviderServer) Invoke(ctx context.Context, req *sppb.InvokeReq
 
 	var event = &elpb.Event{
 		Entity:    schema.SERVICES_PROVIDERS_COL,
-		Uuid:      sp.GetUuid(),
+		Uuid:      req.GetUuid(),
 		Scope:     "driver",
 		Action:    req.Method,
 		Rc:        0,

From f4d0f0dc2c22eb3e51a5f73a4fa34690d6628925 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 18:24:27 +0400
Subject: [PATCH 12/88] add search tags

---
 admin-ui/src/components/search/search.vue | 28 +++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index 4cc4d6b67..30dfea9a1 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -37,7 +37,15 @@
               :param="customParamsValues[0]"
               :variants="variants"
             />
-            <v-menu v-if="customParamsValues.length > 1" offset-y>
+            <v-menu
+              :close-on-content-click="false"
+              v-if="customParamsValues.length > 1"
+              offset-y
+              min-height="300px"
+              max-height="300px"
+              max-width="600px"
+              min-width="600px"
+            >
               <template v-slot:activator="{ on, attrs }">
                 <v-chip
                   class="ma-auto pa-auto"
@@ -49,9 +57,13 @@
                   +{{ customParamsValues.length - 1 }}
                 </v-chip>
               </template>
-              <v-card color="background-light" max-width="600px">
+              <v-card class="px-3" color="background-light">
+                <v-text-field
+                  v-model="tagsSearchParam"
+                  prepend-inner-icon="mdi-magnify"
+                />
                 <search-tag
-                  v-for="param in customParamsValues.slice(1)"
+                  v-for="param in filteredCustomParamsValues"
                   :key="param.key + param.title"
                   :param="param"
                   :variants="variants"
@@ -123,7 +135,7 @@ import SearchTag from "@/components/search/searchTag.vue";
 export default {
   name: "app-search",
   components: { SearchTag },
-  data: () => ({ selectedGroupKey: "", isOpen: false }),
+  data: () => ({ selectedGroupKey: "", isOpen: false, tagsSearchParam: "" }),
   methods: {
     setParam(index) {
       const item = this.searchItems[index];
@@ -253,6 +265,14 @@ export default {
 
       return values;
     },
+    filteredCustomParamsValues() {
+      if (!this.tagsSearchParam) {
+        return this.customParamsValues;
+      }
+      return this.customParamsValues.filter((c) =>
+        c.title.toLowerCase().includes(this.tagsSearchParam.toLowerCase())
+      );
+    },
     routeCustomParams() {
       return this.$route.params.search;
     },

From b2b8ca7925d359592f066240548162cfcfa9ec5a Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 18:34:25 +0400
Subject: [PATCH 13/88] fix rewrite, search variants

---
 admin-ui/src/components/historyTable.vue | 12 ++++++++++--
 admin-ui/src/views/History.vue           |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/historyTable.vue b/admin-ui/src/components/historyTable.vue
index 6181eaf90..7438b8239 100644
--- a/admin-ui/src/components/historyTable.vue
+++ b/admin-ui/src/components/historyTable.vue
@@ -63,8 +63,9 @@ const props = defineProps({
   path: {},
   hideRequestor: { type: Boolean, default: false },
   hideUuid: { type: Boolean, default: false },
+  loading: { type: Boolean, default: false },
 });
-const { tableName, accountId, uuid, hideRequestor, hideUuid, path } =
+const { tableName, accountId, uuid, hideRequestor, hideUuid, path, loading } =
   toRefs(props);
 
 const count = ref(10);
@@ -266,10 +267,17 @@ const instances = computed(() => store.getters["services/getInstances"]);
 const searchParams = computed(() => store.getters["appSearch/customParams"]);
 
 onMounted(() => {
-  getFilterItems();
+  if (!loading.value) {
+    getFilterItems();
+  }
 });
 
 watch(accountId, () => updateProps());
+watch(loading, () => {
+  if (!loading.value) {
+    getFilterItems();
+  }
+});
 watch(uuid, () => updateProps());
 watch(searchParams, () => updateProps(), { deep: true });
 watch(path, () => updateProps());
diff --git a/admin-ui/src/views/History.vue b/admin-ui/src/views/History.vue
index fa0b00aca..e76d93a09 100644
--- a/admin-ui/src/views/History.vue
+++ b/admin-ui/src/views/History.vue
@@ -4,6 +4,7 @@
       :path="path"
       :account-id="account"
       :uuid="uuid"
+      :loading="isVariantsLoading"
       table-name="all-logs"
     />
   </div>
@@ -22,15 +23,18 @@ export default {
     account: null,
     uuid: null,
     path: null,
+    isVariantsLoading: false,
   }),
   async mounted() {
     this.$store.commit("appSearch/setSearchName", "app-logs");
 
+    this.isVariantsLoading = true;
     await Promise.all([
       this.$store.dispatch("accounts/fetch"),
       this.$store.dispatch("services/fetch"),
       this.$store.dispatch("servicesProviders/fetch"),
     ]);
+    this.isVariantsLoading = false;
 
     this.$store.commit("appSearch/setVariants", {
       service: { items: this.services, title: "Service", key: "entity" },

From 12a0e3cd001ac7b0437d32b931b207af00a8027c Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 12 Sep 2023 18:13:43 +0300
Subject: [PATCH 14/88] Fix

---
 pkg/registry/accounts.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/registry/accounts.go b/pkg/registry/accounts.go
index 9a152d10e..8a7c07c05 100644
--- a/pkg/registry/accounts.go
+++ b/pkg/registry/accounts.go
@@ -369,11 +369,11 @@ func (s *AccountsServiceServer) Token(ctx context.Context, request *accountspb.T
 
 	var event = &elpb.Event{
 		Entity:    schema.ACCOUNTS_COL,
-		Uuid:      requestor.(string),
+		Uuid:      acc.Key,
 		Scope:     "database",
 		Action:    "login",
 		Rc:        0,
-		Requestor: requestor.(string),
+		Requestor: acc.Key,
 		Ts:        time.Now().Unix(),
 		Snapshot: &elpb.Snapshot{
 			Diff: "",

From e6d43ed07e8ac67166043029cfe42ea1a7a26d72 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 12 Sep 2023 19:53:07 +0400
Subject: [PATCH 15/88] add not select selected options & show selected

---
 admin-ui/src/components/search/search.vue | 50 ++++++++++++++++-------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index 30dfea9a1..2ae791783 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -112,8 +112,15 @@
                       </v-btn>
                     </div>
                   </div>
-                  <div style="width: 100%" class="d-flex" v-else>
+                  <div
+                    style="width: 100%"
+                    class="d-flex justify-space-between"
+                    v-else
+                  >
                     <span>{{ item.title }}</span>
+                    <v-icon v-if="item.isSelect" color="green"
+                      >mdi-check</v-icon
+                    >
                   </div>
                 </v-list-item>
               </template>
@@ -151,7 +158,7 @@ export default {
             value: this.searchParam,
             title: this.searchParam,
             isArray,
-            full: false,
+            temporary: true,
           },
         });
       }
@@ -165,13 +172,17 @@ export default {
     },
     setEntity(index) {
       const item = this.searchItems[index];
+      if (item.isSelect) {
+        return;
+      }
+
       const variant =
         this.variants[this.selectedGroupKey] || this.variants[item?.key];
       const key = variant?.key || this.selectedGroupKey;
 
       if (variant?.isArray) {
         this.customParams[key]?.forEach((i) => {
-          if (!i.full) {
+          if (i.temporary) {
             this.$store.commit("appSearch/deleteCustomParam", { ...i, key });
           }
         });
@@ -183,7 +194,6 @@ export default {
           value: item[variant.itemKey || "uuid"],
           title: item[variant.itemTitle || "title"],
           isArray: variant.isArray,
-          full: true,
         },
       });
 
@@ -233,17 +243,27 @@ export default {
       return "group";
     },
     searchItems() {
-      return (
-        this.variants[this.selectedGroupKey]?.items.filter(
-          (i) =>
-            !this.searchParam ||
-            i.title.toLowerCase().includes(this.searchParam.toLowerCase())
-        ) ||
-        Object.keys(this.variants).map((key) => ({
-          key,
-          title: this.variants[key]?.title || key,
-        }))
-      );
+      if (this.variants[this.selectedGroupKey]?.items) {
+        return this.variants[this.selectedGroupKey]?.items
+          .filter(
+            (i) =>
+              !this.searchParam ||
+              i.title.toLowerCase().includes(this.searchParam.toLowerCase())
+          )
+          .map((p) => ({
+            ...p,
+            isSelect: !!this.customParamsValues.find(
+              (cp) => cp.value === p.uuid
+            ),
+          }))
+          .sort((x, y) =>
+            x.isSelect === y.isSelect ? 0 : x.isSelect ? 1 : -1
+          );
+      }
+      return Object.keys(this.variants).map((key) => ({
+        key,
+        title: this.variants[key]?.title || key,
+      }));
     },
     customParamsValues() {
       const values = [];

From 3693b18580abe5d1a638e6c159f371e74d5da409 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 13 Sep 2023 13:23:19 +0400
Subject: [PATCH 16/88] fix api

---
 admin-ui/src/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/api.js b/admin-ui/src/api.js
index 621b3185b..41233c8e5 100644
--- a/admin-ui/src/api.js
+++ b/admin-ui/src/api.js
@@ -1,6 +1,6 @@
 import Api from "nocloudjsrest";
 import vuex from "@/store/index.js";
-const api = new Api("http://localhost/http://api.nocloud.ione-cloud.net", 8624);
+const api = new Api();
 
 api.axios.interceptors.response.use(
   (response) => response,

From 02a290d783a938846753674753395f9d871b51ae Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 13 Sep 2023 13:35:02 +0300
Subject: [PATCH 17/88] Fix

---
 pkg/registry/namespaces.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/registry/namespaces.go b/pkg/registry/namespaces.go
index b637da768..2d51f6729 100644
--- a/pkg/registry/namespaces.go
+++ b/pkg/registry/namespaces.go
@@ -17,6 +17,7 @@ package registry
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/arangodb/go-driver"
 	pb "github.com/slntopp/nocloud-proto/registry"
@@ -129,7 +130,7 @@ func (s *NamespacesServiceServer) Join(ctx context.Context, request *namespacesp
 	err = s.ctrl.Join(ctx, acc, ns, level, roles.DEFAULT)
 	if err != nil {
 		s.log.Debug("Error while joining account", zap.Error(err))
-		return nil, status.Error(codes.Internal, "Error while joining account")
+		return nil, status.Error(codes.Internal, fmt.Sprintf("Error while joining account. %s", err.Error()))
 	}
 	return &namespacespb.JoinResponse{Result: true}, nil
 }

From f0e3800777063e94ae6172715dee35a5eb63c75a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 13:15:17 +0200
Subject: [PATCH 18/88] Bump docker/login-action from 2.2.0 to 3.0.0 (#1107)

Bumps [docker/login-action](https://github.com/docker/login-action) from 2.2.0 to 3.0.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2.2.0...v3.0.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c80238446..0e7b2f99d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
           images: ${{ env.REGISTRY }}/slntopp/nocloud/base
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -113,7 +113,7 @@ jobs:
           images: ${{ env.REGISTRY }}/slntopp/nocloud/${{matrix.tag}}
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

From 3f7d29d69980330118ef8e25fa1750d26af62aa0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 13:15:31 +0200
Subject: [PATCH 19/88] Bump docker/build-push-action from 4.2.1 to 5.0.0
 (#1108)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.2.1 to 5.0.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v4.2.1...v5.0.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e7b2f99d..4c6d2f41f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,7 +83,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4.2.1
+        uses: docker/build-push-action@v5.0.0
         with:
           context: .
           file: Dockerfile
@@ -120,7 +120,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4.2.1
+        uses: docker/build-push-action@v5.0.0
         id: build
         with:
           context: .

From 96cad4912f63cbacc01d5b75726f2a75b54a0551 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 13:15:44 +0200
Subject: [PATCH 20/88] Bump docker/metadata-action from 4.6.0 to 5.0.0 (#1109)

Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4.6.0 to 5.0.0.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](https://github.com/docker/metadata-action/compare/v4.6.0...v5.0.0)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c6d2f41f..afb17d49f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,7 +70,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4.6.0
+        uses: docker/metadata-action@v5.0.0
         with:
           tags: type=raw,value=${{env.IMAGE_TAG}}
           images: ${{ env.REGISTRY }}/slntopp/nocloud/base
@@ -107,7 +107,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4.6.0
+        uses: docker/metadata-action@v5.0.0
         with:
           tags: type=raw,value=${{env.IMAGE_TAG}}
           images: ${{ env.REGISTRY }}/slntopp/nocloud/${{matrix.tag}}

From 048cf88babbcd14588dbe9d230dd7662e65edfc4 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 13 Sep 2023 19:03:26 +0400
Subject: [PATCH 21/88] add plan shortcat

---
 admin-ui/src/components/instance/info.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/admin-ui/src/components/instance/info.vue b/admin-ui/src/components/instance/info.vue
index f5a819f18..77f57c838 100644
--- a/admin-ui/src/components/instance/info.vue
+++ b/admin-ui/src/components/instance/info.vue
@@ -97,6 +97,13 @@
             label="Service provider"
           />
         </v-col>
+        <v-col>
+          <route-text-field
+            :to="{ name: 'Plan', params: { planId: plan?.uuid } }"
+            :value="plan?.title"
+            label="Billing plan"
+          />
+        </v-col>
         <v-col>
           <v-text-field readonly :value="type" label="Type" />
         </v-col>
@@ -224,6 +231,9 @@ export default {
     sp() {
       return this.servicesProviders?.find((sp) => sp?.uuid == this.template.sp);
     },
+    plan() {
+      return this.template.billingPlan;
+    },
     additionalInstanceInfoComponent() {
       return () =>
         import(`@/components/modules/${this.type}/additionalInstanceInfo.vue`);

From 09ac1bab8a5ca3e2cab5df2358f5d5123305322e Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 13 Sep 2023 19:12:57 +0400
Subject: [PATCH 22/88] fix no plans

---
 admin-ui/src/views/PlansCreate.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/admin-ui/src/views/PlansCreate.vue b/admin-ui/src/views/PlansCreate.vue
index 971a974fc..679c61f11 100644
--- a/admin-ui/src/views/PlansCreate.vue
+++ b/admin-ui/src/views/PlansCreate.vue
@@ -466,9 +466,7 @@ export default {
   },
   computed: {
     searchParam() {
-      return this.$store.getters[
-        "appSearch/customParams"
-      ]?.searchParam?.value.toLowerCase();
+      return this.$store.getters["appSearch/customSearchParam"]?.toLowerCase();
     },
     template() {
       const type = this.plan.kind === "DYNAMIC" ? "resources" : "products";
@@ -489,7 +487,7 @@ export default {
       return document.documentElement.clientWidth;
     },
     productsHide() {
-      const hidden = ["ovh", "goget", "acronis",'cpanel'];
+      const hidden = ["ovh", "goget", "acronis", "cpanel"];
       return hidden.some((h) => this.plan.type.includes(h));
     },
     filteredProducts() {
@@ -501,7 +499,7 @@ export default {
       Object.keys(this.plan.products).forEach((key) => {
         if (key === this.searchParam) {
           filtered[key] = this.plan.products[key];
-          return
+          return;
         }
 
         if (

From 92fab22fe4e34536f7b6ac5985dd889abd7a9079 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 13 Sep 2023 19:27:30 +0400
Subject: [PATCH 23/88] fix cpanel plans & add custom sorter nad name

---
 admin-ui/src/components/plan/cpanelPrices.vue | 54 ++++++++++++-------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/admin-ui/src/components/plan/cpanelPrices.vue b/admin-ui/src/components/plan/cpanelPrices.vue
index 49b4320ba..ac7c73e4a 100644
--- a/admin-ui/src/components/plan/cpanelPrices.vue
+++ b/admin-ui/src/components/plan/cpanelPrices.vue
@@ -3,7 +3,7 @@
     <nocloud-table
       table-name="cpanel-prices"
       class="pa-4"
-      item-key="text"
+      item-key="key"
       :show-select="false"
       :items="prices"
       :headers="headers"
@@ -16,9 +16,15 @@
           :value="item.enabled"
         />
       </template>
+      <template v-slot:[`item.name`]="{ item }">
+        <v-text-field v-model="item.name" />
+      </template>
       <template v-slot:[`item.price`]="{ item }">
         <v-text-field type="number" v-model.number="item.price" />
       </template>
+      <template v-slot:[`item.sorter`]="{ item }">
+        <v-text-field type="number" v-model.number="item.sorter" />
+      </template>
       <template v-slot:[`item.period`]="{ item }">
         <date-field :period="item.period" @changeDate="item.period = $event" />
       </template>
@@ -49,7 +55,7 @@ export default {
     isPricesLoading: false,
     isSaveLoading: false,
     headers: [
-      { text: "name", value: "name" },
+      { text: "name", value: "name", width: "220px" },
       { text: "BWLIMIT", value: "BWLIMIT" },
       { text: "CGI", value: "CGI" },
       { text: "CPMOD", value: "CPMOD" },
@@ -77,6 +83,7 @@ export default {
       { text: "lve_nproc", value: "lve_nproc" },
       { text: "lve_cpu", value: "lve_cpu" },
       { text: "lve_pmem", value: "lve_pmem" },
+      { text: "Sorter", value: "sorter" },
       { text: "Period", value: "period", width: 220 },
       { text: "Price", value: "price", width: 150 },
       { text: "Enabled", value: "enabled" },
@@ -103,8 +110,10 @@ export default {
       this.prices = res.meta.pkg.map((el) => {
         const price = { ...el };
         const product = this.template.products[el.name];
+        price.key = el.name;
         price.price = product?.price || 0;
         price.period = product?.period || 0;
+        price.sorter = product?.sorter || 0;
         price.enabled = !!product;
         const date = new Date(price.period * 1000);
         const time = date.toUTCString().split(" ");
@@ -131,30 +140,39 @@ export default {
           });
         }
 
-        return (this.products[item.name] = {
-          title: item.name,
-          kind: "PREPAID",
-          price: item.price,
-          period: getTimestamp(item.period),
-          resources: {
-            model: item.name,
-            bandwidth: item.BWLIMIT || undefined,
-            ssd: item.QUOTA || undefined,
-            email: item.MAX_EMAILACCT_QUOTA || undefined,
-            mysql: item.MAXSQL || undefined,
-            websites: 1 + +item.MAXADDON || undefined,
-          },
-        });
+        return;
       }
 
-      this.products[item.name] = undefined;
+      this.products[item.key] = undefined;
     },
     async savePrices() {
+      const products = {};
+
+      this.prices
+        .filter((p) => p.enabled)
+        .forEach((item) => {
+          products[item.key] = {
+            title: item.name,
+            kind: "PREPAID",
+            price: item.price,
+            period: getTimestamp(item.period),
+            sorter: item.sorter,
+            resources: {
+              model: item.name,
+              bandwidth: item.BWLIMIT || undefined,
+              ssd: item.QUOTA || undefined,
+              email: item.MAX_EMAILACCT_QUOTA || undefined,
+              mysql: item.MAXSQL || undefined,
+              websites: 1 + +item.MAXADDON || undefined,
+            },
+          };
+        });
+
       this.isSaveLoading = true;
       try {
         await api.plans.update(this.template.uuid, {
           ...this.template,
-          products: this.products,
+          products,
         });
         this.showSnackbarSuccess({ message: "Plan save successfully" });
       } catch (e) {

From fb5580bf1400bc73ccb42cae6683160b3519018c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Sep 2023 12:46:44 +0200
Subject: [PATCH 24/88] Bump WillAbides/setup-go-faster from 1.10.1 to 1.11.0
 (#1112)

Bumps [WillAbides/setup-go-faster](https://github.com/willabides/setup-go-faster) from 1.10.1 to 1.11.0.
- [Release notes](https://github.com/willabides/setup-go-faster/releases)
- [Commits](https://github.com/willabides/setup-go-faster/compare/v1.10.1...v1.11.0)

---
updated-dependencies:
- dependency-name: WillAbides/setup-go-faster
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 0bd7b4c97..3dd1f66f9 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Setup Go
-        uses: WillAbides/setup-go-faster@v1.10.1
+        uses: WillAbides/setup-go-faster@v1.11.0
         with:
           go-version: 1.19
       - name: Static Check

From 504891e7966002dc85725bd85acdb2646e0ffcca Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 14 Sep 2023 16:35:34 +0400
Subject: [PATCH 25/88] fix openai vars

---
 .../components/modules/openai/serviceProviders.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/admin-ui/src/components/modules/openai/serviceProviders.vue b/admin-ui/src/components/modules/openai/serviceProviders.vue
index bcc437f7e..444d1168e 100644
--- a/admin-ui/src/components/modules/openai/serviceProviders.vue
+++ b/admin-ui/src/components/modules/openai/serviceProviders.vue
@@ -85,7 +85,7 @@ export default {
       if (this.fields[input].type === "secrets") {
         newSecrets[input] = data;
       } else {
-        newVars[input] = { default: data };
+        newVars[input] = { value: { default: data } };
       }
 
       this.$emit(`change:secrets`, newSecrets);
@@ -102,15 +102,11 @@ export default {
         }
       });
     },
-    setVarsValueDefault(vars, fieldName, isChange, data) {
-      vars[fieldName] = {
-        value: {
-          default: isChange ? JSON.parse(data) : this.getValue(fieldName),
-        },
-      };
-    },
     getValue(fieldName) {
-      return this.secrets[fieldName];
+      if (this.fields[fieldName].type === "secrets") {
+        return this.secrets[fieldName];
+      }
+      return this.vars[fieldName]?.value?.default;
     },
   },
 };

From bed36dad08d033b040c9beb737610c4f5fbb1de1 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 14 Sep 2023 18:30:33 +0400
Subject: [PATCH 26/88] fix no menu events

---
 admin-ui/src/App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index c59698b5e..eae0e2804 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -359,7 +359,7 @@ export default {
     configureHoverOnMenu() {
       document
         .getElementById("drawer-menu-hover")
-        .addEventListener("mouseenter", () => {
+        ?.addEventListener("mouseenter", () => {
           if (this.isMenuMinimize) {
             this.isMouseOnMenu = true;
             setTimeout(() => {
@@ -371,7 +371,7 @@ export default {
         });
       document
         .getElementById("drawer-menu-hover")
-        .addEventListener("mouseleave", () => {
+        ?.addEventListener("mouseleave", () => {
           if (this.isMouseOnMenu) {
             this.isMouseOnMenu = false;
             setTimeout(() => {

From 1ed745df2f69fd8125f13b563f5b85d57b264e10 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 14 Sep 2023 18:35:38 +0400
Subject: [PATCH 27/88] add prices to ovh billingInfo

---
 .../src/components/modules/ovh/billingInfo.vue   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index 61ad91802..f3e4a0f60 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -22,6 +22,7 @@
       <v-col>
         <v-text-field
           readonly
+          :suffix="defaultCurrency"
           label="Price instance total"
           :value="type === 'dedicated' ? +totalNewPrice?.toFixed(2) : getPrice"
         />
@@ -57,6 +58,7 @@
         <v-text-field
           v-model="item.price"
           @change="onUpdatePrice(item, false)"
+          :suffix="defaultCurrency"
           type="number"
           append-icon="mdi-pencil"
         ></v-text-field>
@@ -65,6 +67,7 @@
         <v-text-field
           v-model="item.accountPrice"
           @change="onUpdatePrice(item, true)"
+          :suffix="accountCurrency"
           type="number"
           append-icon="mdi-pencil"
         ></v-text-field>
@@ -73,6 +76,7 @@
         <v-text-field
           :loading="isBasePricesLoading"
           readonly
+          suffix="PLN"
           :value="convertedBasePrices[item.key]"
         ></v-text-field>
       </template>
@@ -80,10 +84,16 @@
         <tr>
           <td>Total instance price</td>
           <td></td>
-          <td>{{ isBasePricesLoading ? "Loading..." : totalBasePrice }}</td>
+          <td>
+            {{
+              isBasePricesLoading
+                ? "Loading..."
+                : [totalBasePrice, "PLN"].join(" ")
+            }}
+          </td>
           <td>
             <div class="d-flex justify-space-between align-center">
-              {{ totalNewPrice?.toFixed(2) }}
+              {{ [totalNewPrice?.toFixed(2), defaultCurrency].join(" ") }}
             </div>
           </td>
           <td>{{ [accountTotalNewPrice, accountCurrency].join(" ") }}</td>
@@ -149,6 +159,8 @@ const accountTotalNewPrice = computed(() =>
   toAccountPrice(totalNewPrice.value)
 );
 
+const defaultCurrency = computed(() => store.getters["currencies/default"]);
+
 const setTotalNewPrice = () => {
   totalNewPrice.value = +pricesItems.value
     .reduce((acc, i) => +i.price + acc, 0)

From cd646f820c18685785c6cd6dd3bbc11541cc2f02 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 14 Sep 2023 18:37:15 +0400
Subject: [PATCH 28/88] add hideble prices in ovh billing info

---
 .../components/modules/ovh/billingInfo.vue    | 121 ++++++++++--------
 1 file changed, 67 insertions(+), 54 deletions(-)

diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index f3e4a0f60..ee2f5946f 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -46,60 +46,73 @@
         <v-text-field readonly label="Due to date/next payment" :value="date" />
       </v-col>
     </v-row>
-    <nocloud-table
-      hide-default-footer
-      sort-by="index"
-      item-key="key"
-      :show-select="false"
-      :headers="pricesHeaders"
-      :items="pricesItems"
-    >
-      <template v-slot:[`item.price`]="{ item }">
-        <v-text-field
-          v-model="item.price"
-          @change="onUpdatePrice(item, false)"
-          :suffix="defaultCurrency"
-          type="number"
-          append-icon="mdi-pencil"
-        ></v-text-field>
-      </template>
-      <template v-slot:[`item.accountPrice`]="{ item }">
-        <v-text-field
-          v-model="item.accountPrice"
-          @change="onUpdatePrice(item, true)"
-          :suffix="accountCurrency"
-          type="number"
-          append-icon="mdi-pencil"
-        ></v-text-field>
-      </template>
-      <template v-slot:[`item.basePrice`]="{ item }">
-        <v-text-field
-          :loading="isBasePricesLoading"
-          readonly
-          suffix="PLN"
-          :value="convertedBasePrices[item.key]"
-        ></v-text-field>
-      </template>
-      <template v-slot:body.append>
-        <tr>
-          <td>Total instance price</td>
-          <td></td>
-          <td>
-            {{
-              isBasePricesLoading
-                ? "Loading..."
-                : [totalBasePrice, "PLN"].join(" ")
-            }}
-          </td>
-          <td>
-            <div class="d-flex justify-space-between align-center">
-              {{ [totalNewPrice?.toFixed(2), defaultCurrency].join(" ") }}
-            </div>
-          </td>
-          <td>{{ [accountTotalNewPrice, accountCurrency].join(" ") }}</td>
-        </tr>
-      </template>
-    </nocloud-table>
+    <v-expansion-panels>
+      <v-expansion-panel>
+        <v-expansion-panel-header color="background-light"
+          >Prices</v-expansion-panel-header
+        >
+        <v-expansion-panel-content
+          class="ione-billing"
+          color="background-light"
+        >
+          <nocloud-table
+            hide-default-footer
+            sort-by="index"
+            item-key="key"
+            :show-select="false"
+            :headers="pricesHeaders"
+            :items="pricesItems"
+          >
+            <template v-slot:[`item.price`]="{ item }">
+              <v-text-field
+                v-model="item.price"
+                @change="onUpdatePrice(item, false)"
+                :suffix="defaultCurrency"
+                type="number"
+                append-icon="mdi-pencil"
+              ></v-text-field>
+            </template>
+            <template v-slot:[`item.accountPrice`]="{ item }">
+              <v-text-field
+                v-model="item.accountPrice"
+                @change="onUpdatePrice(item, true)"
+                :suffix="accountCurrency"
+                type="number"
+                append-icon="mdi-pencil"
+              ></v-text-field>
+            </template>
+            <template v-slot:[`item.basePrice`]="{ item }">
+              <v-text-field
+                :loading="isBasePricesLoading"
+                readonly
+                suffix="PLN"
+                :value="convertedBasePrices[item.key]"
+              ></v-text-field>
+            </template>
+            <template v-slot:body.append>
+              <tr>
+                <td>Total instance price</td>
+                <td></td>
+                <td>
+                  {{
+                    isBasePricesLoading
+                      ? "Loading..."
+                      : [totalBasePrice, "PLN"].join(" ")
+                  }}
+                </td>
+                <td>
+                  <div class="d-flex justify-space-between align-center">
+                    {{ [totalNewPrice?.toFixed(2), defaultCurrency].join(" ") }}
+                  </div>
+                </td>
+                <td>{{ [accountTotalNewPrice, accountCurrency].join(" ") }}</td>
+              </tr>
+            </template>
+          </nocloud-table>
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+    </v-expansion-panels>
+
     <edit-price-model
       @refresh="emit('refresh')"
       :template="template"

From 3242dc82f222d0dec982f659fc8695c91b3338a9 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 14 Sep 2023 18:47:50 +0400
Subject: [PATCH 29/88] merge price & account price in ovh billing info

---
 .../components/modules/ovh/billingInfo.vue    | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index ee2f5946f..aa3d2dbfd 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -63,23 +63,25 @@
             :headers="pricesHeaders"
             :items="pricesItems"
           >
-            <template v-slot:[`item.price`]="{ item }">
-              <v-text-field
-                v-model="item.price"
-                @change="onUpdatePrice(item, false)"
-                :suffix="defaultCurrency"
-                type="number"
-                append-icon="mdi-pencil"
-              ></v-text-field>
-            </template>
-            <template v-slot:[`item.accountPrice`]="{ item }">
-              <v-text-field
-                v-model="item.accountPrice"
-                @change="onUpdatePrice(item, true)"
-                :suffix="accountCurrency"
-                type="number"
-                append-icon="mdi-pencil"
-              ></v-text-field>
+            <template v-slot:[`item.prices`]="{ item }">
+              <div class="d-flex">
+                <v-text-field
+                  class="mr-1"
+                  v-model="item.accountPrice"
+                  @change="onUpdatePrice(item, true)"
+                  :suffix="accountCurrency"
+                  type="number"
+                  append-icon="mdi-pencil"
+                ></v-text-field>
+                <v-text-field
+                  class="ml-1"
+                  v-model="item.price"
+                  @change="onUpdatePrice(item, false)"
+                  :suffix="defaultCurrency"
+                  type="number"
+                  append-icon="mdi-pencil"
+                ></v-text-field>
+              </div>
             </template>
             <template v-slot:[`item.basePrice`]="{ item }">
               <v-text-field
@@ -101,11 +103,17 @@
                   }}
                 </td>
                 <td>
-                  <div class="d-flex justify-space-between align-center">
-                    {{ [totalNewPrice?.toFixed(2), defaultCurrency].join(" ") }}
+                  <div class="d-flex align-center">
+                    <span style="width: 50%">
+                      {{ [accountTotalNewPrice, accountCurrency].join(" ") }}
+                    </span>
+                    <span style="width: 50%">
+                      {{
+                        [totalNewPrice?.toFixed(2), defaultCurrency].join(" ")
+                      }}
+                    </span>
                   </div>
                 </td>
-                <td>{{ [accountTotalNewPrice, accountCurrency].join(" ") }}</td>
               </tr>
             </template>
           </nocloud-table>
@@ -161,8 +169,7 @@ const pricesHeaders = ref([
   { text: "Name", value: "title" },
   { text: "Billing period", value: "period" },
   { text: "Base price", value: "basePrice" },
-  { text: "Account price", value: "accountPrice" },
-  { text: "Price", value: "price" },
+  { text: "Price", value: "prices" },
 ]);
 const totalNewPrice = ref(0);
 const isBasePricesLoading = ref(false);

From 2532d07c9e4dd71e11494155fddaf2c4cff61851 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 14 Sep 2023 19:28:49 +0400
Subject: [PATCH 30/88] merge price & account price in ione billing info

---
 .../components/modules/ione/billingInfo.vue   | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index 446f00f03..14c53f954 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -77,30 +77,30 @@
             hide-default-footer
           >
             <template v-slot:[`item.price`]="{ item }">
-              <v-text-field
-                :suffix="defaultCurrency"
-                v-model="item.price"
-                @input="updatePrice(item, false)"
-                append-icon="mdi-pencil"
-              />
-            </template>
-            <template v-slot:[`item.accountPrice`]="{ item }">
-              <v-text-field
-                :suffix="accountCurrency"
-                v-model="item.accountPrice"
-                @input="updatePrice(item, true)"
-                append-icon="mdi-pencil"
-              />
+              <div class="d-flex">
+                <v-text-field
+                  class="mr-1"
+                  :suffix="accountCurrency"
+                  v-model="item.accountPrice"
+                  @input="updatePrice(item, true)"
+                  append-icon="mdi-pencil"
+                />
+                <v-text-field
+                  class="ml-1"
+                  :suffix="defaultCurrency"
+                  v-model="item.price"
+                  @input="updatePrice(item, false)"
+                  append-icon="mdi-pencil"
+                />
+              </div>
             </template>
             <template v-slot:[`item.quantity`]="{ item }">
               {{ item.quantity?.toFixed(2) }}
             </template>
             <template v-slot:[`item.total`]="{ item }">
-              {{ totalPrices[item.name]?.toFixed(2) }} {{ defaultCurrency }}
-            </template>
-            <template v-slot:[`item.totalAccount`]="{ item }">
               {{ totalAccountPrices[item.name]?.toFixed(2) }}
-              {{ accountCurrency }}
+              {{ accountCurrency }} / {{ totalPrices[item.name]?.toFixed(2) }}
+              {{ defaultCurrency }}
             </template>
             <template v-slot:body.append>
               <tr>
@@ -109,15 +109,17 @@
                 <td></td>
                 <td></td>
                 <td></td>
-                <td></td>
                 <td>
                   {{
                     billingItems.find((i) => i.name === template.product)
                       ?.period
                   }}
                 </td>
-                <td>{{ totalAccountPrice }} {{ accountCurrency }}</td>
-                <td>{{ totalPrice }} {{ defaultCurrency }}</td>
+                <td>
+                  {{ totalAccountPrice }} {{ accountCurrency }} /
+                  {{ totalPrice }}
+                  {{ defaultCurrency }}
+                </td>
               </tr>
             </template>
           </nocloud-table>
@@ -195,11 +197,9 @@ const billingHeaders = ref([
   { text: "Name", value: "name" },
   { text: "Unit name", value: "unit" },
   { text: "Price per unit", value: "price" },
-  { text: "Account price per unit", value: "accountPrice" },
   { text: "Unit quantity", value: "quantity" },
   { text: "Payment term", value: "kind" },
   { text: "Billing period", value: "period" },
-  { text: "Total account price", value: "totalAccount" },
   { text: "Total price", value: "total" },
 ]);
 

From f7ed6e81efcb083ce08605297a6f99d6a4c4926b Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 14 Sep 2023 22:55:48 +0300
Subject: [PATCH 31/88] Basic setup

---
 go.mod                          |  7 ++++
 go.sum                          | 10 +++++-
 pkg/oauth2/config/config.go     | 40 +++++++++++++++++++++++
 pkg/oauth2/handlers/github.go   | 32 ++++++++++++++++++
 pkg/oauth2/handlers/google.go   | 34 ++++++++++++++++++++
 pkg/oauth2/handlers/handlers.go | 19 +++++++++++
 pkg/oauth2/main.go              | 57 +++++++++++++++++++++++++++++++++
 7 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 pkg/oauth2/config/config.go
 create mode 100644 pkg/oauth2/handlers/github.go
 create mode 100644 pkg/oauth2/handlers/google.go
 create mode 100644 pkg/oauth2/handlers/handlers.go
 create mode 100644 pkg/oauth2/main.go

diff --git a/go.mod b/go.mod
index 9df0a1b7a..57527b328 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ go 1.20
 require (
 	github.com/Pallinder/go-randomdata v1.2.0
 	github.com/arangodb/go-driver v1.6.0
+	github.com/dghubble/gologin/v2 v2.4.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/google/uuid v1.3.1
@@ -21,13 +22,19 @@ require (
 	github.com/wI2L/jsondiff v0.4.0
 	go.uber.org/zap v1.25.0
 	golang.org/x/crypto v0.13.0
+	golang.org/x/oauth2 v0.12.0
 	google.golang.org/grpc v1.58.0
 	google.golang.org/protobuf v1.31.0
 )
 
 require (
+	cloud.google.com/go/compute v1.23.0 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	github.com/google/go-github/v48 v48.2.0 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	golang.org/x/net v0.15.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
diff --git a/go.sum b/go.sum
index d98cd0270..ff6a478aa 100644
--- a/go.sum
+++ b/go.sum
@@ -17,7 +17,6 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
 cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -25,7 +24,9 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=
+cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM=
 cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
+cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
@@ -64,6 +65,8 @@ github.com/cskr/pubsub v1.0.2/go.mod h1:/8MzYXk/NJAz782G8RPkFzXTZVu63VotefPnR9TI
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dghubble/gologin/v2 v2.4.0 h1:Ga0dxZ2C/8MrMtC0qFLIg1K7cVjZQWSbTj/MIgFqMAg=
+github.com/dghubble/gologin/v2 v2.4.0/go.mod h1:85FO9Je/O6n9/KdHTUtVDSaXQjR6Ducx7blL/3CUfnw=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -129,6 +132,10 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-github/v48 v48.2.0 h1:68puzySE6WqUY9KWmpOsDEQfDZsso98rT6pZcz9HqcE=
+github.com/google/go-github/v48 v48.2.0/go.mod h1:dDlehKBDo850ZPvCTK0sEqTCVWcrGl2LcDiajkYi89Y=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -343,6 +350,7 @@ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
+golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff --git a/pkg/oauth2/config/config.go b/pkg/oauth2/config/config.go
new file mode 100644
index 000000000..6d134d878
--- /dev/null
+++ b/pkg/oauth2/config/config.go
@@ -0,0 +1,40 @@
+package config
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/spf13/viper"
+	"os"
+)
+
+var CONFIG_LOCATION string
+
+func init() {
+	viper.AutomaticEnv()
+	viper.SetDefault("CONFIG_LOCATION", "oauth2_config.json")
+
+	CONFIG_LOCATION = viper.GetString("CONFIG_LOCATION")
+
+	_, err := os.ReadFile(CONFIG_LOCATION)
+	if err != nil {
+		panic(fmt.Errorf("couldn't read config. Location: %s. Error: %v", CONFIG_LOCATION, err))
+	}
+}
+
+type OAuth2Config struct {
+	ClientID     string `json:"client_id"`
+	ClientSecret string `json:"client_secret"`
+	RedirectURL  string `json:"redirect_url"`
+}
+
+func Config() (map[string]OAuth2Config, error) {
+	var config map[string]OAuth2Config
+
+	conf, err := os.ReadFile(CONFIG_LOCATION)
+	if err != nil {
+		return config, err
+	}
+
+	err = json.Unmarshal(conf, &config)
+	return config, err
+}
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
new file mode 100644
index 000000000..620bbb0ff
--- /dev/null
+++ b/pkg/oauth2/handlers/github.go
@@ -0,0 +1,32 @@
+package handlers
+
+import (
+	"github.com/dghubble/gologin/v2"
+	github_gologin "github.com/dghubble/gologin/v2/github"
+	"github.com/gorilla/mux"
+	"github.com/slntopp/nocloud/pkg/oauth2/config"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/github"
+	"net/http"
+)
+
+type GithubOauthHandler struct{}
+
+func (g *GithubOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config) {
+	oauth2Config := &oauth2.Config{
+		ClientID:     cfg.ClientID,
+		ClientSecret: cfg.ClientSecret,
+		RedirectURL:  cfg.RedirectURL,
+		Endpoint:     github.Endpoint,
+	}
+	stateConfig := gologin.DefaultCookieConfig
+
+	router.Handle("/oauth/github/login", github_gologin.StateHandler(stateConfig, github_gologin.LoginHandler(oauth2Config, nil)))
+	router.Handle("/oauth/github/checkout", github_gologin.StateHandler(stateConfig, github_gologin.CallbackHandler(oauth2Config, g.successHandler(), nil)))
+}
+
+func (g *GithubOauthHandler) successHandler() http.Handler {
+	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+
+	})
+}
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
new file mode 100644
index 000000000..ff48d54ae
--- /dev/null
+++ b/pkg/oauth2/handlers/google.go
@@ -0,0 +1,34 @@
+package handlers
+
+import (
+	"github.com/slntopp/nocloud/pkg/oauth2/config"
+	"net/http"
+
+	"github.com/dghubble/gologin/v2"
+	"github.com/gorilla/mux"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
+
+	google_gologin "github.com/dghubble/gologin/v2/google"
+)
+
+type GoogleOauthHandler struct{}
+
+func (g *GoogleOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config) {
+	oauth2Config := &oauth2.Config{
+		ClientID:     cfg.ClientID,
+		ClientSecret: cfg.ClientSecret,
+		RedirectURL:  cfg.RedirectURL,
+		Endpoint:     google.Endpoint,
+	}
+	stateConfig := gologin.DefaultCookieConfig
+
+	router.Handle("/oauth/google/login", google_gologin.StateHandler(stateConfig, google_gologin.LoginHandler(oauth2Config, nil)))
+	router.Handle("/oauth/google/checkout", google_gologin.StateHandler(stateConfig, google_gologin.CallbackHandler(oauth2Config, g.successHandler(), nil)))
+}
+
+func (g *GoogleOauthHandler) successHandler() http.Handler {
+	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+
+	})
+}
diff --git a/pkg/oauth2/handlers/handlers.go b/pkg/oauth2/handlers/handlers.go
new file mode 100644
index 000000000..a25298f24
--- /dev/null
+++ b/pkg/oauth2/handlers/handlers.go
@@ -0,0 +1,19 @@
+package handlers
+
+import (
+	"github.com/gorilla/mux"
+	"github.com/slntopp/nocloud/pkg/oauth2/config"
+)
+
+type OAuthHandler interface {
+	Setup(*mux.Router, config.OAuth2Config)
+}
+
+func GetOAuthHandler(handlerType string) OAuthHandler {
+	switch handlerType {
+	case "google":
+		return &GoogleOauthHandler{}
+	default:
+		return nil
+	}
+}
diff --git a/pkg/oauth2/main.go b/pkg/oauth2/main.go
new file mode 100644
index 000000000..78fc753b6
--- /dev/null
+++ b/pkg/oauth2/main.go
@@ -0,0 +1,57 @@
+package oauth2
+
+import (
+	"fmt"
+	"github.com/gorilla/mux"
+	"github.com/rs/cors"
+	config2 "github.com/slntopp/nocloud/pkg/oauth2/config"
+	"github.com/slntopp/nocloud/pkg/oauth2/handlers"
+	"go.uber.org/zap"
+	"net/http"
+)
+
+type OAuth2Server struct {
+	router *mux.Router
+
+	log *zap.Logger
+}
+
+func NewOAuth2Server(log *zap.Logger) *OAuth2Server {
+	return &OAuth2Server{
+		log:    log,
+		router: mux.NewRouter(),
+	}
+}
+
+func (s *OAuth2Server) registerOAuthHandlers() {
+	config, err := config2.Config()
+	if err != nil {
+		s.log.Fatal("Failed to read config", zap.Error(err))
+	}
+
+	for key, conf := range config {
+		handler := handlers.GetOAuthHandler(key)
+		if handler == nil {
+			continue
+		}
+
+		handler.Setup(s.router, conf)
+	}
+
+}
+
+func (s *OAuth2Server) Start(port string, corsAllowed []string) {
+	s.registerOAuthHandlers()
+
+	handler := cors.New(cors.Options{
+		AllowedOrigins:   corsAllowed,
+		AllowedHeaders:   []string{"Content-Type", "Authorization"},
+		AllowedMethods:   []string{"GET", "POST", "DELETE", "PUT", "PATCH", "OPTIONS", "HEAD"},
+		AllowCredentials: true,
+	}).Handler(s.router)
+
+	err := http.ListenAndServe(fmt.Sprintf("localhost:%s", port), handler)
+	if err != nil {
+		s.log.Fatal("Failed to start server", zap.Error(err))
+	}
+}

From 8f1d6d641bb40658f9f7c129148890951aeada22 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 14 Sep 2023 23:41:29 +0300
Subject: [PATCH 32/88] Add server's start

---
 cmd/oauth2/main.go              | 68 +++++++++++++++++++++++++++++++++
 pkg/oauth2/handlers/handlers.go |  2 +
 pkg/oauth2/main.go              | 10 ++++-
 3 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 cmd/oauth2/main.go

diff --git a/cmd/oauth2/main.go b/cmd/oauth2/main.go
new file mode 100644
index 000000000..3ae1d4bab
--- /dev/null
+++ b/cmd/oauth2/main.go
@@ -0,0 +1,68 @@
+package oauth2
+
+import (
+	"github.com/go-redis/redis/v8"
+	"github.com/slntopp/nocloud-proto/registry"
+	"github.com/slntopp/nocloud/pkg/nocloud"
+	"github.com/slntopp/nocloud/pkg/nocloud/auth"
+	"github.com/slntopp/nocloud/pkg/oauth2"
+	"github.com/spf13/viper"
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+	"strings"
+)
+
+var (
+	port string
+	log  *zap.Logger
+
+	corsAllowed  []string
+	registryHost string
+	redisHost    string
+	SIGNING_KEY  []byte
+)
+
+func init() {
+	viper.AutomaticEnv()
+	log = nocloud.NewLogger()
+
+	viper.SetDefault("PORT", "8000")
+
+	viper.SetDefault("REGISTRY_HOST", "registry:8000")
+	viper.SetDefault("REDIS_HOST", "redis:6379")
+
+	viper.SetDefault("CORS_ALLOWED", []string{"*"})
+
+	viper.SetDefault("SIGNING_KEY", "seeeecreet")
+
+	port = viper.GetString("PORT")
+
+	registryHost = viper.GetString("REGISTRY_HOST")
+	redisHost = viper.GetString("REDIS_HOST")
+
+	corsAllowed = strings.Split(viper.GetString("CORS_ALLOWED"), ",")
+
+	SIGNING_KEY = []byte(viper.GetString("SIGNING_KEY"))
+}
+
+func main() {
+	rdb := redis.NewClient(&redis.Options{
+		Addr: redisHost,
+		DB:   0,
+	})
+
+	auth.SetContext(log, rdb, SIGNING_KEY)
+
+	registryConn, err := grpc.Dial(registryHost, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if err != nil {
+		panic(err)
+	}
+	defer registryConn.Close()
+
+	registryClient := registry.NewAccountsServiceClient(registryConn)
+
+	server := oauth2.NewOAuth2Server(log, registryHost)
+	server.SetupRegistryClient(registryClient)
+	server.Start(port, []string{})
+}
diff --git a/pkg/oauth2/handlers/handlers.go b/pkg/oauth2/handlers/handlers.go
index a25298f24..ae9edaeec 100644
--- a/pkg/oauth2/handlers/handlers.go
+++ b/pkg/oauth2/handlers/handlers.go
@@ -13,6 +13,8 @@ func GetOAuthHandler(handlerType string) OAuthHandler {
 	switch handlerType {
 	case "google":
 		return &GoogleOauthHandler{}
+	case "github":
+		return &GithubOauthHandler{}
 	default:
 		return nil
 	}
diff --git a/pkg/oauth2/main.go b/pkg/oauth2/main.go
index 78fc753b6..d60ed4b2e 100644
--- a/pkg/oauth2/main.go
+++ b/pkg/oauth2/main.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/gorilla/mux"
 	"github.com/rs/cors"
+	"github.com/slntopp/nocloud-proto/registry"
 	config2 "github.com/slntopp/nocloud/pkg/oauth2/config"
 	"github.com/slntopp/nocloud/pkg/oauth2/handlers"
 	"go.uber.org/zap"
@@ -11,18 +12,23 @@ import (
 )
 
 type OAuth2Server struct {
-	router *mux.Router
+	router         *mux.Router
+	registryClient registry.AccountsServiceClient
 
 	log *zap.Logger
 }
 
-func NewOAuth2Server(log *zap.Logger) *OAuth2Server {
+func NewOAuth2Server(log *zap.Logger, host string) *OAuth2Server {
 	return &OAuth2Server{
 		log:    log,
 		router: mux.NewRouter(),
 	}
 }
 
+func (s *OAuth2Server) SetupRegistryClient(registryClient registry.AccountsServiceClient) {
+	s.registryClient = registryClient
+}
+
 func (s *OAuth2Server) registerOAuthHandlers() {
 	config, err := config2.Config()
 	if err != nil {

From 1cc2f42620d95920a786a9963350625e71a8f5fb Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 15 Sep 2023 00:25:38 +0300
Subject: [PATCH 33/88] Complete basic google auth

---
 go.mod                           |  6 ++++
 go.sum                           | 43 +++++++++++++++++++++++
 pkg/credentials/credentials.go   |  4 +++
 pkg/credentials/oauth2_google.go | 58 ++++++++++++++++++++++++++++++++
 pkg/oauth2/handlers/github.go    |  2 +-
 pkg/oauth2/handlers/google.go    | 39 ++++++++++++++++++---
 pkg/registry/accounts.go         |  9 -----
 7 files changed, 147 insertions(+), 14 deletions(-)
 create mode 100644 pkg/credentials/oauth2_google.go

diff --git a/go.mod b/go.mod
index 57527b328..5274ba01b 100644
--- a/go.mod
+++ b/go.mod
@@ -30,10 +30,16 @@ require (
 require (
 	cloud.google.com/go/compute v1.23.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/go-github/v48 v48.2.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/s2a-go v0.1.4 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
+	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
+	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
+	google.golang.org/api v0.126.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
diff --git a/go.sum b/go.sum
index ff6a478aa..f3fb78b95 100644
--- a/go.sum
+++ b/go.sum
@@ -44,6 +44,7 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00lCDlaYPg=
 github.com/Pallinder/go-randomdata v1.2.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/arangodb/go-driver v1.6.0 h1:NFWj/idqXZxhFVueihMSI2R9NotNIsgvNfM/xmpekb4=
 github.com/arangodb/go-driver v1.6.0/go.mod h1:HQmdGkvNMVBTE3SIPSQ8T/ZddC6iwNsfMR+dDJQxIsI=
 github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e h1:Xg+hGrY2LcQBbxd0ZFdbGSyRKTYMZCfBbw/pMJFOk1g=
@@ -51,6 +52,7 @@ github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e/go.mod h1:m
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -60,6 +62,10 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cskr/pubsub v1.0.2 h1:vlOzMhl6PFn60gRlTQQsIfVwaPB/B/8MziK8FhEPt/0=
 github.com/cskr/pubsub v1.0.2/go.mod h1:/8MzYXk/NJAz782G8RPkFzXTZVu63VotefPnR9TIRis=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -74,10 +80,12 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -95,6 +103,8 @@ github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -117,6 +127,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -129,6 +140,7 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
@@ -150,11 +162,17 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
+github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
 github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
+github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
+github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
@@ -163,6 +181,7 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -201,6 +220,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rabbitmq/amqp091-go v1.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0h1hA=
 github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8=
@@ -247,12 +267,16 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
+go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
@@ -269,6 +293,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
@@ -305,6 +331,7 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -333,11 +360,13 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -361,6 +390,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -400,11 +431,14 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -413,6 +447,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -468,6 +503,7 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -491,6 +527,8 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
+google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o=
+google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -523,6 +561,7 @@ google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
@@ -555,9 +594,12 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
 google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o=
 google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -582,6 +624,7 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/pkg/credentials/credentials.go b/pkg/credentials/credentials.go
index 74ac4fd3b..36c6b8768 100644
--- a/pkg/credentials/credentials.go
+++ b/pkg/credentials/credentials.go
@@ -70,6 +70,8 @@ func Determine(auth_type string) (cred Credentials, ok bool) {
 		return &StandardCredentials{}, true
 	case "whmcs":
 		return &WHMCSCredentials{}, true
+	case "oauth2-google":
+		return &OAuth2GoogleCredentials{}, true
 	default:
 		return nil, false
 	}
@@ -82,6 +84,8 @@ func Find(ctx context.Context, db driver.Database, log *zap.Logger, auth_type st
 		cred = &StandardCredentials{Username: args[0]}
 	case "whmcs":
 		cred = &WHMCSCredentials{Email: args[0]}
+	case "oauth2-google":
+		cred = &OAuth2GoogleCredentials{Email: args[0]}
 	default:
 		return nil, errors.New("unknown auth type")
 	}
diff --git a/pkg/credentials/oauth2_google.go b/pkg/credentials/oauth2_google.go
new file mode 100644
index 000000000..da65a8bd5
--- /dev/null
+++ b/pkg/credentials/oauth2_google.go
@@ -0,0 +1,58 @@
+package credentials
+
+import (
+	"context"
+	"errors"
+	"github.com/arangodb/go-driver"
+	"github.com/slntopp/nocloud/pkg/nocloud/schema"
+	"go.uber.org/zap"
+)
+
+type OAuth2GoogleCredentials struct {
+	Email string `json:"email"`
+
+	log *zap.Logger
+	driver.DocumentMeta
+}
+
+func NewOAuth2GoogleCredentials(data []string) (Credentials, error) {
+	if len(data) < 1 {
+		return nil, errors.New("empty Credentials")
+	}
+	email := data[0]
+	return &OAuth2GoogleCredentials{Email: email}, nil
+}
+
+func (*OAuth2GoogleCredentials) Type() string {
+	return "oauth2-google"
+}
+
+// Authorize method for StandardCredentials assumes that args consist of username and password stored at 0 and 1 accordingly
+func (cred *OAuth2GoogleCredentials) Authorize(args ...string) bool {
+	return cred.Email == args[0]
+}
+
+func (cred *OAuth2GoogleCredentials) SetLogger(log *zap.Logger) {
+	cred.log = log.Named("OAuth2Google")
+	cred.log.Debug("Logger is now set")
+}
+
+func (cred *OAuth2GoogleCredentials) Find(ctx context.Context, db driver.Database) bool {
+	query := `FOR cred IN @@credentials FILTER cred.email == @email RETURN cred`
+	c, err := db.Query(ctx, query, map[string]interface{}{
+		"username":     cred.Email,
+		"@credentials": schema.CREDENTIALS_COL,
+	})
+	if err != nil {
+		return false
+	}
+	defer c.Close()
+
+	_, err = c.ReadDocument(ctx, &cred)
+	return err == nil
+}
+
+func (cred *OAuth2GoogleCredentials) FindByKey(ctx context.Context, col driver.Collection, key string) error {
+	_, err := col.ReadDocument(ctx, key, cred)
+	return err
+}
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index 620bbb0ff..8312c5140 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -27,6 +27,6 @@ func (g *GithubOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config)
 
 func (g *GithubOauthHandler) successHandler() http.Handler {
 	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-
+		github_gologin.UserFromContext(request.Context())
 	})
 }
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index ff48d54ae..d3ccf497d 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -1,9 +1,16 @@
 package handlers
 
 import (
-	"github.com/slntopp/nocloud/pkg/oauth2/config"
+	"context"
+	"github.com/slntopp/nocloud-proto/registry/accounts"
+	"github.com/slntopp/nocloud/pkg/nocloud/auth"
+	"github.com/slntopp/nocloud/pkg/nocloud/schema"
+	"google.golang.org/grpc/metadata"
 	"net/http"
 
+	"github.com/slntopp/nocloud-proto/registry"
+	"github.com/slntopp/nocloud/pkg/oauth2/config"
+
 	"github.com/dghubble/gologin/v2"
 	"github.com/gorilla/mux"
 	"golang.org/x/oauth2"
@@ -14,7 +21,7 @@ import (
 
 type GoogleOauthHandler struct{}
 
-func (g *GoogleOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config) {
+func (g *GoogleOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
 	oauth2Config := &oauth2.Config{
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
@@ -24,11 +31,35 @@ func (g *GoogleOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config)
 	stateConfig := gologin.DefaultCookieConfig
 
 	router.Handle("/oauth/google/login", google_gologin.StateHandler(stateConfig, google_gologin.LoginHandler(oauth2Config, nil)))
-	router.Handle("/oauth/google/checkout", google_gologin.StateHandler(stateConfig, google_gologin.CallbackHandler(oauth2Config, g.successHandler(), nil)))
+	router.Handle("/oauth/google/checkout", google_gologin.StateHandler(stateConfig, google_gologin.CallbackHandler(oauth2Config, g.successHandler(regClient), nil)))
 }
 
-func (g *GoogleOauthHandler) successHandler() http.Handler {
+func (g *GoogleOauthHandler) successHandler(regClient registry.AccountsServiceClient) http.Handler {
 	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
+		user, err := google_gologin.UserFromContext(request.Context())
+		if err != nil {
+			return
+		}
+
+		token, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
+		if err != nil {
+			return
+		}
+
+		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+token)
 
+		_, err = regClient.Create(ctx, &accounts.CreateRequest{
+			Title:     user.Name,
+			Namespace: schema.ROOT_NAMESPACE_KEY,
+			Auth: &accounts.Credentials{
+				Type: "oauth2-google",
+				Data: []string{
+					user.Email,
+				},
+			},
+		})
+		if err != nil {
+			return
+		}
 	})
 }
diff --git a/pkg/registry/accounts.go b/pkg/registry/accounts.go
index 8a7c07c05..a4e7367bc 100644
--- a/pkg/registry/accounts.go
+++ b/pkg/registry/accounts.go
@@ -45,7 +45,6 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/structpb"
 )
 
 var (
@@ -411,14 +410,6 @@ func (s *AccountsServiceServer) Create(ctx context.Context, request *accountspb.
 		Data:     request.GetData(),
 	}
 
-	if request.Auth.Type == "whmcs" {
-		creationAccount.Data = &structpb.Struct{
-			Fields: map[string]*structpb.Value{
-				"email": structpb.NewStringValue(request.Auth.Data[0]),
-			},
-		}
-	}
-
 	acc, err := s.ctrl.Create(ctx, creationAccount)
 	if err != nil {
 		log.Debug("Error creating account", zap.Error(err))

From 29b854262ca5b73a755c95bf297d22b9f2198190 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 15 Sep 2023 00:32:56 +0300
Subject: [PATCH 34/88] Complete basic github auth

---
 pkg/credentials/credentials.go   |  8 +++++
 pkg/credentials/oauth2_github.go | 58 ++++++++++++++++++++++++++++++++
 pkg/credentials/oauth2_google.go |  2 +-
 pkg/oauth2/handlers/github.go    | 38 ++++++++++++++++++---
 pkg/oauth2/handlers/handlers.go  |  3 +-
 5 files changed, 103 insertions(+), 6 deletions(-)
 create mode 100644 pkg/credentials/oauth2_github.go

diff --git a/pkg/credentials/credentials.go b/pkg/credentials/credentials.go
index 36c6b8768..f8faea686 100644
--- a/pkg/credentials/credentials.go
+++ b/pkg/credentials/credentials.go
@@ -72,6 +72,8 @@ func Determine(auth_type string) (cred Credentials, ok bool) {
 		return &WHMCSCredentials{}, true
 	case "oauth2-google":
 		return &OAuth2GoogleCredentials{}, true
+	case "oauth2-github":
+		return &OAuth2GithubCredentials{}, true
 	default:
 		return nil, false
 	}
@@ -86,6 +88,8 @@ func Find(ctx context.Context, db driver.Database, log *zap.Logger, auth_type st
 		cred = &WHMCSCredentials{Email: args[0]}
 	case "oauth2-google":
 		cred = &OAuth2GoogleCredentials{Email: args[0]}
+	case "oauth2-github":
+		cred = &OAuth2GithubCredentials{Login: args[0]}
 	default:
 		return nil, errors.New("unknown auth type")
 	}
@@ -112,6 +116,10 @@ func MakeCredentials(credentials *accountspb.Credentials, log *zap.Logger) (Cred
 		cred, err = NewStandardCredentials(credentials.Data)
 	case "whmcs":
 		cred, err = NewWHMCSCredentials(credentials.Data)
+	case "oauth2-google":
+		cred, err = NewOAuth2GoogleCredentials(credentials.Data)
+	case "oauth2-github":
+		cred, err = NewOAuth2GithubCredentials(credentials.Data)
 	default:
 		return nil, errors.New("auth type is wrong")
 	}
diff --git a/pkg/credentials/oauth2_github.go b/pkg/credentials/oauth2_github.go
new file mode 100644
index 000000000..3adbcf588
--- /dev/null
+++ b/pkg/credentials/oauth2_github.go
@@ -0,0 +1,58 @@
+package credentials
+
+import (
+	"context"
+	"errors"
+	"github.com/arangodb/go-driver"
+	"github.com/slntopp/nocloud/pkg/nocloud/schema"
+	"go.uber.org/zap"
+)
+
+type OAuth2GithubCredentials struct {
+	Login string `json:"login"`
+
+	log *zap.Logger
+	driver.DocumentMeta
+}
+
+func NewOAuth2GithubCredentials(data []string) (Credentials, error) {
+	if len(data) < 1 {
+		return nil, errors.New("empty Credentials")
+	}
+	login := data[0]
+	return &OAuth2GithubCredentials{Login: login}, nil
+}
+
+func (*OAuth2GithubCredentials) Type() string {
+	return "oauth2-github"
+}
+
+// Authorize method for StandardCredentials assumes that args consist of username and password stored at 0 and 1 accordingly
+func (cred *OAuth2GithubCredentials) Authorize(args ...string) bool {
+	return cred.Login == args[0]
+}
+
+func (cred *OAuth2GithubCredentials) SetLogger(log *zap.Logger) {
+	cred.log = log.Named("OAuth2Github")
+	cred.log.Debug("Logger is now set")
+}
+
+func (cred *OAuth2GithubCredentials) Find(ctx context.Context, db driver.Database) bool {
+	query := `FOR cred IN @@credentials FILTER cred.login == @login RETURN cred`
+	c, err := db.Query(ctx, query, map[string]interface{}{
+		"login":        cred.Login,
+		"@credentials": schema.CREDENTIALS_COL,
+	})
+	if err != nil {
+		return false
+	}
+	defer c.Close()
+
+	_, err = c.ReadDocument(ctx, &cred)
+	return err == nil
+}
+
+func (cred *OAuth2GithubCredentials) FindByKey(ctx context.Context, col driver.Collection, key string) error {
+	_, err := col.ReadDocument(ctx, key, cred)
+	return err
+}
diff --git a/pkg/credentials/oauth2_google.go b/pkg/credentials/oauth2_google.go
index da65a8bd5..286eb6680 100644
--- a/pkg/credentials/oauth2_google.go
+++ b/pkg/credentials/oauth2_google.go
@@ -40,7 +40,7 @@ func (cred *OAuth2GoogleCredentials) SetLogger(log *zap.Logger) {
 func (cred *OAuth2GoogleCredentials) Find(ctx context.Context, db driver.Database) bool {
 	query := `FOR cred IN @@credentials FILTER cred.email == @email RETURN cred`
 	c, err := db.Query(ctx, query, map[string]interface{}{
-		"username":     cred.Email,
+		"email":        cred.Email,
 		"@credentials": schema.CREDENTIALS_COL,
 	})
 	if err != nil {
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index 8312c5140..2b531fd7d 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -1,18 +1,24 @@
 package handlers
 
 import (
+	"context"
 	"github.com/dghubble/gologin/v2"
 	github_gologin "github.com/dghubble/gologin/v2/github"
 	"github.com/gorilla/mux"
+	"github.com/slntopp/nocloud-proto/registry"
+	"github.com/slntopp/nocloud-proto/registry/accounts"
+	"github.com/slntopp/nocloud/pkg/nocloud/auth"
+	"github.com/slntopp/nocloud/pkg/nocloud/schema"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"
+	"google.golang.org/grpc/metadata"
 	"net/http"
 )
 
 type GithubOauthHandler struct{}
 
-func (g *GithubOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config) {
+func (g *GithubOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
 	oauth2Config := &oauth2.Config{
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
@@ -22,11 +28,35 @@ func (g *GithubOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config)
 	stateConfig := gologin.DefaultCookieConfig
 
 	router.Handle("/oauth/github/login", github_gologin.StateHandler(stateConfig, github_gologin.LoginHandler(oauth2Config, nil)))
-	router.Handle("/oauth/github/checkout", github_gologin.StateHandler(stateConfig, github_gologin.CallbackHandler(oauth2Config, g.successHandler(), nil)))
+	router.Handle("/oauth/github/checkout", github_gologin.StateHandler(stateConfig, github_gologin.CallbackHandler(oauth2Config, g.successHandler(regClient), nil)))
 }
 
-func (g *GithubOauthHandler) successHandler() http.Handler {
+func (g *GithubOauthHandler) successHandler(regClient registry.AccountsServiceClient) http.Handler {
 	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-		github_gologin.UserFromContext(request.Context())
+		user, err := github_gologin.UserFromContext(request.Context())
+		if err != nil {
+			return
+		}
+
+		token, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
+		if err != nil {
+			return
+		}
+
+		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+token)
+
+		_, err = regClient.Create(ctx, &accounts.CreateRequest{
+			Title:     *user.Name,
+			Namespace: schema.ROOT_NAMESPACE_KEY,
+			Auth: &accounts.Credentials{
+				Type: "oauth2-google",
+				Data: []string{
+					*user.Login,
+				},
+			},
+		})
+		if err != nil {
+			return
+		}
 	})
 }
diff --git a/pkg/oauth2/handlers/handlers.go b/pkg/oauth2/handlers/handlers.go
index ae9edaeec..6b9d8fdf9 100644
--- a/pkg/oauth2/handlers/handlers.go
+++ b/pkg/oauth2/handlers/handlers.go
@@ -2,11 +2,12 @@ package handlers
 
 import (
 	"github.com/gorilla/mux"
+	"github.com/slntopp/nocloud-proto/registry"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
 )
 
 type OAuthHandler interface {
-	Setup(*mux.Router, config.OAuth2Config)
+	Setup(*mux.Router, config.OAuth2Config, registry.AccountsServiceClient)
 }
 
 func GetOAuthHandler(handlerType string) OAuthHandler {

From eaabbb9a67ef2bbb14998029b2f96187665f5f03 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 15 Sep 2023 00:40:48 +0300
Subject: [PATCH 35/88] Fix credentials

---
 pkg/oauth2/handlers/github.go | 38 ++++++++++++++++++++++++++++++-----
 pkg/oauth2/handlers/google.go | 36 +++++++++++++++++++++++++++++----
 2 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index 2b531fd7d..848dd10c1 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"context"
+	"encoding/json"
 	"github.com/dghubble/gologin/v2"
 	github_gologin "github.com/dghubble/gologin/v2/github"
 	"github.com/gorilla/mux"
@@ -14,6 +15,7 @@ import (
 	"golang.org/x/oauth2/github"
 	"google.golang.org/grpc/metadata"
 	"net/http"
+	"time"
 )
 
 type GithubOauthHandler struct{}
@@ -45,18 +47,44 @@ func (g *GithubOauthHandler) successHandler(regClient registry.AccountsServiceCl
 
 		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+token)
 
-		_, err = regClient.Create(ctx, &accounts.CreateRequest{
-			Title:     *user.Name,
-			Namespace: schema.ROOT_NAMESPACE_KEY,
+		response, err := regClient.Token(ctx, &accounts.TokenRequest{
 			Auth: &accounts.Credentials{
-				Type: "oauth2-google",
+				Type: "oauth2-github",
 				Data: []string{
 					*user.Login,
 				},
 			},
+			Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 		})
 		if err != nil {
-			return
+			_, err = regClient.Create(ctx, &accounts.CreateRequest{
+				Title:     *user.Name,
+				Namespace: schema.ROOT_NAMESPACE_KEY,
+				Auth: &accounts.Credentials{
+					Type: "oauth2-github",
+					Data: []string{
+						*user.Login,
+					},
+				},
+			})
+			if err != nil {
+				return
+			}
+			response, err = regClient.Token(ctx, &accounts.TokenRequest{
+				Auth: &accounts.Credentials{
+					Type: "oauth2-github",
+					Data: []string{
+						*user.Login,
+					},
+				},
+				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
+			})
+		}
+
+		res := map[string]string{
+			"token": response.GetToken(),
 		}
+		marshal, _ := json.Marshal(res)
+		writer.Write(marshal)
 	})
 }
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index d3ccf497d..c1b10efed 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -2,11 +2,13 @@ package handlers
 
 import (
 	"context"
+	"encoding/json"
 	"github.com/slntopp/nocloud-proto/registry/accounts"
 	"github.com/slntopp/nocloud/pkg/nocloud/auth"
 	"github.com/slntopp/nocloud/pkg/nocloud/schema"
 	"google.golang.org/grpc/metadata"
 	"net/http"
+	"time"
 
 	"github.com/slntopp/nocloud-proto/registry"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
@@ -48,18 +50,44 @@ func (g *GoogleOauthHandler) successHandler(regClient registry.AccountsServiceCl
 
 		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+token)
 
-		_, err = regClient.Create(ctx, &accounts.CreateRequest{
-			Title:     user.Name,
-			Namespace: schema.ROOT_NAMESPACE_KEY,
+		response, err := regClient.Token(ctx, &accounts.TokenRequest{
 			Auth: &accounts.Credentials{
 				Type: "oauth2-google",
 				Data: []string{
 					user.Email,
 				},
 			},
+			Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 		})
 		if err != nil {
-			return
+			_, err = regClient.Create(ctx, &accounts.CreateRequest{
+				Title:     user.Name,
+				Namespace: schema.ROOT_NAMESPACE_KEY,
+				Auth: &accounts.Credentials{
+					Type: "oauth2-google",
+					Data: []string{
+						user.Email,
+					},
+				},
+			})
+			if err != nil {
+				return
+			}
+			response, err = regClient.Token(ctx, &accounts.TokenRequest{
+				Auth: &accounts.Credentials{
+					Type: "oauth2-google",
+					Data: []string{
+						user.Email,
+					},
+				},
+				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
+			})
+		}
+
+		res := map[string]string{
+			"token": response.GetToken(),
 		}
+		marshal, _ := json.Marshal(res)
+		writer.Write(marshal)
 	})
 }

From 5ededb70c60586222f4c3195fbd34f0bdd3821a4 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 15 Sep 2023 01:31:33 +0300
Subject: [PATCH 36/88] Fix static check

---
 pkg/oauth2/handlers/github.go |  3 +++
 pkg/oauth2/handlers/google.go | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index 848dd10c1..90f029ca4 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -79,6 +79,9 @@ func (g *GithubOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				},
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
+			if err != nil {
+				return
+			}
 		}
 
 		res := map[string]string{
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index c1b10efed..da609d611 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -3,22 +3,19 @@ package handlers
 import (
 	"context"
 	"encoding/json"
+	"github.com/dghubble/gologin/v2"
+	google_gologin "github.com/dghubble/gologin/v2/google"
+	"github.com/gorilla/mux"
+	"github.com/slntopp/nocloud-proto/registry"
 	"github.com/slntopp/nocloud-proto/registry/accounts"
 	"github.com/slntopp/nocloud/pkg/nocloud/auth"
 	"github.com/slntopp/nocloud/pkg/nocloud/schema"
-	"google.golang.org/grpc/metadata"
-	"net/http"
-	"time"
-
-	"github.com/slntopp/nocloud-proto/registry"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
-
-	"github.com/dghubble/gologin/v2"
-	"github.com/gorilla/mux"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
-
-	google_gologin "github.com/dghubble/gologin/v2/google"
+	"google.golang.org/grpc/metadata"
+	"net/http"
+	"time"
 )
 
 type GoogleOauthHandler struct{}
@@ -82,6 +79,9 @@ func (g *GoogleOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				},
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
+			if err != nil {
+				return
+			}
 		}
 
 		res := map[string]string{

From a6dbc9a9c8dd1524b3d79ee5b60f89029e3d28cf Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 15 Sep 2023 01:33:11 +0300
Subject: [PATCH 37/88] Fix setup

---
 pkg/oauth2/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/oauth2/main.go b/pkg/oauth2/main.go
index d60ed4b2e..74ffd8793 100644
--- a/pkg/oauth2/main.go
+++ b/pkg/oauth2/main.go
@@ -41,7 +41,7 @@ func (s *OAuth2Server) registerOAuthHandlers() {
 			continue
 		}
 
-		handler.Setup(s.router, conf)
+		handler.Setup(s.router, conf, s.registryClient)
 	}
 
 }

From 49c20fd509b398582c80dd104fdf3b1dfebf42d5 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 15 Sep 2023 01:35:52 +0300
Subject: [PATCH 38/88] Fix main file

---
 cmd/oauth2/main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/oauth2/main.go b/cmd/oauth2/main.go
index 3ae1d4bab..66e8bf41a 100644
--- a/cmd/oauth2/main.go
+++ b/cmd/oauth2/main.go
@@ -1,4 +1,4 @@
-package oauth2
+package main
 
 import (
 	"github.com/go-redis/redis/v8"
@@ -64,5 +64,5 @@ func main() {
 
 	server := oauth2.NewOAuth2Server(log, registryHost)
 	server.SetupRegistryClient(registryClient)
-	server.Start(port, []string{})
+	server.Start(port, corsAllowed)
 }

From 7f164ef8f9bc9f1644f7a84d03254ad84a333134 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 15 Sep 2023 01:39:21 +0300
Subject: [PATCH 39/88] Add dockerfile

---
 Dockerfiles/oauth2/Dockerfile | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 Dockerfiles/oauth2/Dockerfile

diff --git a/Dockerfiles/oauth2/Dockerfile b/Dockerfiles/oauth2/Dockerfile
new file mode 100644
index 000000000..c1ee4caa5
--- /dev/null
+++ b/Dockerfiles/oauth2/Dockerfile
@@ -0,0 +1,23 @@
+ARG IMAGE_TAG=latest
+ARG ARCH=amd64
+FROM ghcr.io/slntopp/nocloud/base:${IMAGE_TAG} as builder
+
+RUN CGO_ENABLED=0 GOARCH=${ARCH} go build -ldflags="-s -w" -buildvcs=false ./cmd/oauth2
+RUN upx ./oauth2
+
+RUN adduser -SD nocloud
+
+FROM scratch
+WORKDIR /
+COPY --from=builder  /go/src/github.com/slntopp/nocloud/oauth2 /oauth2
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /etc/passwd /etc/passwd
+
+HEALTHCHECK NONE
+
+USER nocloud
+EXPOSE 8000
+LABEL org.opencontainers.image.source https://github.com/slntopp/nocloud
+LABEL nocloud.update "true"
+
+ENTRYPOINT ["/oauth2"]

From 3cee9aeb7b0f50d82c2204139ac204891a5b7e7c Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 15 Sep 2023 11:06:54 +0400
Subject: [PATCH 40/88] fix no plan bug

---
 .../src/components/dialogs/editPriceModel.vue  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
index 75cd4b71c..661f1031f 100644
--- a/admin-ui/src/components/dialogs/editPriceModel.vue
+++ b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script setup>
-import { toRefs, ref, computed, onMounted } from "vue";
+import { toRefs, ref, computed, onMounted, watch } from "vue";
 import api from "@/api";
 import { getBillingPeriod } from "@/functions";
 
@@ -70,9 +70,7 @@ const plan = ref({});
 const product = ref({});
 
 onMounted(() => {
-  plan.value = plans.value.find(
-    ({ uuid }) => uuid === template.value.billingPlan.uuid
-  );
+  setPlan();
   setProduct();
 });
 
@@ -134,9 +132,7 @@ const isChangeBtnDisabled = computed(() => {
   );
 });
 
-const fullProduct = computed(() => {
-  return plan.value.products?.[product.value];
-});
+const fullProduct = computed(() => plan.value?.products?.[product.value]);
 
 const productBillingPeriod = computed(() => {
   return getBillingPeriod(fullProduct.value?.period);
@@ -181,6 +177,12 @@ const changePM = () => {
     });
 };
 
+const setPlan = () => {
+  plan.value =
+    plans.value.find(({ uuid }) => uuid === template.value.billingPlan.uuid) ||
+    template.value.billingPlan;
+};
+
 const setProduct = () => {
   if (template.value.type === "ovh") {
     product.value =
@@ -192,6 +194,8 @@ const setProduct = () => {
     product.value = template.value.product;
   }
 };
+
+watch(plans, setPlan);
 </script>
 
 <style scoped></style>

From 3eb398393ec87bae5d72fd5201ac85e3bfad0599 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 15 Sep 2023 11:23:48 +0400
Subject: [PATCH 41/88] add account price

---
 .../src/components/dialogs/editPriceModel.vue | 53 +++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
index 661f1031f..6b3d80cea 100644
--- a/admin-ui/src/components/dialogs/editPriceModel.vue
+++ b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -3,7 +3,7 @@
     persistent
     :value="value"
     @input="emit('input', value)"
-    max-width="60%"
+    max-width="80%"
   >
     <v-card class="pa-5">
       <v-card-title class="text-center">Change price model</v-card-title>
@@ -20,7 +20,7 @@
         </v-col>
       </v-row>
       <v-row align="center">
-        <v-col cols="6">
+        <v-col cols="4">
           <v-select
             v-model="product"
             label="tariff"
@@ -29,15 +29,28 @@
             :items="tariffs"
           />
         </v-col>
-        <v-col cols="3">
+        <v-col cols="2">
           <v-text-field
             readonly
             v-model="productBillingPeriod"
             label="billing period"
           />
         </v-col>
-        <v-col cols="3">
-          <v-text-field readonly :value="fullProduct?.price" label="price" />
+        <v-col v-if="accountRate">
+          <v-text-field
+            :suffix="accountCurrency"
+            readonly
+            :value="accountPrice"
+            label="account price"
+          />
+        </v-col>
+        <v-col>
+          <v-text-field
+            :suffix="defaultCurrency"
+            readonly
+            :value="fullProduct?.price"
+            label="price"
+          />
         </v-col>
       </v-row>
 
@@ -59,11 +72,25 @@
 import { toRefs, ref, computed, onMounted, watch } from "vue";
 import api from "@/api";
 import { getBillingPeriod } from "@/functions";
-
-const props = defineProps(["template", "service", "value", "plans"]);
+import useRate from "@/hooks/useRate";
+import { useStore } from "@/store";
+
+const props = defineProps([
+  "template",
+  "service",
+  "value",
+  "plans",
+  "accountRate",
+  "accountCurrency",
+]);
 const emit = defineEmits(["refresh", "input"]);
 
-const { template, plans, service } = toRefs(props);
+const { convertFrom } = useRate();
+
+const { template, plans, service, accountRate, accountCurrency } =
+  toRefs(props);
+
+const store = useStore();
 
 const isChangePMLoading = ref(false);
 const plan = ref({});
@@ -134,6 +161,14 @@ const isChangeBtnDisabled = computed(() => {
 
 const fullProduct = computed(() => plan.value?.products?.[product.value]);
 
+const accountPrice = computed(() =>
+  accountRate.value
+    ? convertFrom(fullProduct.value.price, accountRate.value)
+    : 0
+);
+
+const defaultCurrency = computed(() => store.getters["currencies/default"]);
+
 const productBillingPeriod = computed(() => {
   return getBillingPeriod(fullProduct.value?.period);
 });
@@ -198,4 +233,4 @@ const setProduct = () => {
 watch(plans, setPlan);
 </script>
 
-<style scoped></style>
+<style scoped></style>
\ No newline at end of file

From 9bfdd683cef1e558449ba82bd4a47f495cfeba2f Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 15 Sep 2023 11:24:06 +0400
Subject: [PATCH 42/88] add account price to change plan dialog

---
 admin-ui/src/components/modules/ione/billingInfo.vue    | 2 ++
 admin-ui/src/components/modules/ovh/billingInfo.vue     | 2 ++
 admin-ui/src/components/modules/virtual/billingInfo.vue | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index 14c53f954..5179cf814 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -146,6 +146,8 @@
       :billing-plan="billingPlan"
     />
     <edit-price-model
+      :account-rate="accountRate"
+      :account-currency="accountCurrency"
       v-model="priceModelDialog"
       :template="template"
       :plans="filteredPlans"
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index aa3d2dbfd..d78d972eb 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -125,6 +125,8 @@
       @refresh="emit('refresh')"
       :template="template"
       :plans="plans"
+      :account-currency="accountCurrency"
+      :account-rate="accountRate"
       :service="service"
       v-model="priceModelDialog"
     />
diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/virtual/billingInfo.vue
index 25792b159..d876d5931 100644
--- a/admin-ui/src/components/modules/virtual/billingInfo.vue
+++ b/admin-ui/src/components/modules/virtual/billingInfo.vue
@@ -94,6 +94,8 @@
       @refresh="emit('refresh')"
     />
     <edit-price-model
+      :account-rate="accountRate"
+      :account-currency="accountCurrency"
       v-model="priceModelDialog"
       :template="template"
       :plans="filtredPlans"

From 96374683019acb3d0d9471e6853c553dc2d403e2 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 15 Sep 2023 11:41:03 +0400
Subject: [PATCH 43/88] fix original product

---
 .../src/components/dialogs/editPriceModel.vue | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
index 6b3d80cea..7bb7cd47d 100644
--- a/admin-ui/src/components/dialogs/editPriceModel.vue
+++ b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -104,16 +104,35 @@ onMounted(() => {
 const tariffs = computed(() => {
   const tariffs = [];
   Object.keys(plan.value?.products || {}).forEach((key) => {
-    if (
-      plan.value.products[key]?.price > instanceTariffPrice.value ||
-      (plan.value.uuid === template.value.billingPlan.uuid &&
-        instanceTariffPrice.value === plan.value.products[key]?.price)
-    )
+    if (plan.value.products[key]?.price > instanceTariffPrice.value)
       tariffs.push({ ...plan.value.products[key], key });
   });
+
+  if (plan.value?.uuid === template.value.billingPlan.uuid) {
+    tariffs.push({
+      ...plan.value.products[originalProduct.value],
+      key: originalProduct.value,
+    });
+  }
   return tariffs;
 });
 
+const originalProduct = computed(() => {
+  switch (template.value.type) {
+    case "ovh": {
+      return (
+        template.value.config.duration + " " + template.value.config.planCode
+      );
+    }
+    case "ione":
+    case "virtual": {
+      return template.value.product;
+    }
+  }
+
+  return null;
+});
+
 const availablePlans = computed(() => {
   const availablePlans = [];
 
@@ -162,7 +181,7 @@ const isChangeBtnDisabled = computed(() => {
 const fullProduct = computed(() => plan.value?.products?.[product.value]);
 
 const accountPrice = computed(() =>
-  accountRate.value
+  accountRate.value && fullProduct.value?.price
     ? convertFrom(fullProduct.value.price, accountRate.value)
     : 0
 );
@@ -233,4 +252,4 @@ const setProduct = () => {
 watch(plans, setPlan);
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped></style>

From 46170de89219d1383ffb0b5ef423df609845c346 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 15 Sep 2023 13:27:20 +0400
Subject: [PATCH 44/88] add select by billing period

---
 .../src/components/dialogs/editPriceModel.vue | 57 ++++++++++++++-----
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
index 7bb7cd47d..089b2d668 100644
--- a/admin-ui/src/components/dialogs/editPriceModel.vue
+++ b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -20,27 +20,27 @@
         </v-col>
       </v-row>
       <v-row align="center">
+        <v-col cols="2">
+          <v-select
+            v-model="selectedPeriod"
+            :items="uniqueBillingPeriods"
+            label="billing period"
+          />
+        </v-col>
         <v-col cols="4">
           <v-select
             v-model="product"
             label="tariff"
             item-text="title"
             item-value="key"
-            :items="tariffs"
-          />
-        </v-col>
-        <v-col cols="2">
-          <v-text-field
-            readonly
-            v-model="productBillingPeriod"
-            label="billing period"
+            :items="filteredTariffs"
           />
         </v-col>
         <v-col v-if="accountRate">
           <v-text-field
             :suffix="accountCurrency"
             readonly
-            :value="accountPrice"
+            :value="isSelectedPlanAvailable ? accountPrice : null"
             label="account price"
           />
         </v-col>
@@ -48,7 +48,7 @@
           <v-text-field
             :suffix="defaultCurrency"
             readonly
-            :value="fullProduct?.price"
+            :value="isSelectedPlanAvailable ? fullProduct?.price : null"
             label="price"
           />
         </v-col>
@@ -95,10 +95,12 @@ const store = useStore();
 const isChangePMLoading = ref(false);
 const plan = ref({});
 const product = ref({});
+const selectedPeriod = ref("");
 
 onMounted(() => {
   setPlan();
   setProduct();
+  selectedPeriod.value = billingPeriods.value[originalProduct.value];
 });
 
 const tariffs = computed(() => {
@@ -117,6 +119,34 @@ const tariffs = computed(() => {
   return tariffs;
 });
 
+const filteredTariffs = computed(() => {
+  return tariffs.value.filter(
+    (t) => billingPeriods.value[t.key] === selectedPeriod.value
+  );
+});
+
+const billingPeriods = computed(() => {
+  const billingPeriods = {};
+
+  tariffs.value.forEach((t) => {
+    billingPeriods[t.key] = getBillingPeriod(t?.period);
+  });
+
+  return billingPeriods;
+});
+
+const uniqueBillingPeriods = computed(() => {
+  const unique = new Map();
+  Object.keys(billingPeriods.value).forEach((k) => {
+    unique.set(billingPeriods.value[k], billingPeriods.value[k]);
+  });
+  return [...unique.values()];
+});
+
+const isSelectedPlanAvailable = computed(() =>
+  filteredTariffs.value.find((t) => product.value === t.key)
+);
+
 const originalProduct = computed(() => {
   switch (template.value.type) {
     case "ovh": {
@@ -188,10 +218,6 @@ const accountPrice = computed(() =>
 
 const defaultCurrency = computed(() => store.getters["currencies/default"]);
 
-const productBillingPeriod = computed(() => {
-  return getBillingPeriod(fullProduct.value?.period);
-});
-
 const changePM = () => {
   const planCode = product.value.slice(4).toLowerCase().replace(" ", "-");
   const tempService = JSON.parse(JSON.stringify(service.value));
@@ -250,6 +276,9 @@ const setProduct = () => {
 };
 
 watch(plans, setPlan);
+watch(plan, () => {
+  selectedPeriod.value = uniqueBillingPeriods.value[0];
+});
 </script>
 
 <style scoped></style>

From 648faeba60944152338b0a93c077d0e43a92a3bd Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 15 Sep 2023 13:28:54 +0400
Subject: [PATCH 45/88] add max email quota

---
 admin-ui/src/components/plan/cpanelPrices.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin-ui/src/components/plan/cpanelPrices.vue b/admin-ui/src/components/plan/cpanelPrices.vue
index ac7c73e4a..f986c8d55 100644
--- a/admin-ui/src/components/plan/cpanelPrices.vue
+++ b/admin-ui/src/components/plan/cpanelPrices.vue
@@ -73,6 +73,7 @@ export default {
       { text: "MAXSUB", value: "MAXSUB" },
       { text: "MAX_DEFER_FAIL_PERCENTAGE", value: "MAX_DEFER_FAIL_PERCENTAGE" },
       { text: "MAX_EMAIL_PER_HOUR", value: "MAX_EMAIL_PER_HOUR" },
+      { text: "MAX_EMAILACCT_QUOTA", value: "MAX_EMAILACCT_QUOTA" },
       { text: "QUOTA", value: "QUOTA" },
       { text: "lve_cpu", value: "lve_cpu" },
       { text: "lve_ep", value: "lve_ep" },

From 5312b383e12b3fb7c4e06bfc7aa5ccf2805dd058 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Sep 2023 12:36:21 +0200
Subject: [PATCH 46/88] Bump go.uber.org/zap from 1.25.0 to 1.26.0 (#1116)

Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.25.0 to 1.26.0.
- [Release notes](https://github.com/uber-go/zap/releases)
- [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uber-go/zap/compare/v1.25.0...v1.26.0)

---
updated-dependencies:
- dependency-name: go.uber.org/zap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index 9df0a1b7a..178ff8e24 100644
--- a/go.mod
+++ b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/stoewer/go-strcase v1.3.0
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
 	github.com/wI2L/jsondiff v0.4.0
-	go.uber.org/zap v1.25.0
+	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.13.0
 	google.golang.org/grpc v1.58.0
 	google.golang.org/protobuf v1.31.0
diff --git a/go.sum b/go.sum
index d98cd0270..7cd4c5719 100644
--- a/go.sum
+++ b/go.sum
@@ -48,7 +48,6 @@ github.com/arangodb/go-driver v1.6.0/go.mod h1:HQmdGkvNMVBTE3SIPSQ8T/ZddC6iwNsfM
 github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e h1:Xg+hGrY2LcQBbxd0ZFdbGSyRKTYMZCfBbw/pMJFOk1g=
 github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e/go.mod h1:mq7Shfa/CaixoDxiyAAc5jZ6CVBAyPaNQCGS7mkj4Ho=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -254,8 +253,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
-go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
-go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

From 5c5fd96deba15b813d68813a664c2b3c5e67440d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Sep 2023 12:37:04 +0200
Subject: [PATCH 47/88] Bump google.golang.org/grpc from 1.58.0 to 1.58.1
 (#1115)

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.0 to 1.58.1.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.58.0...v1.58.1)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 178ff8e24..e5f70116a 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/wI2L/jsondiff v0.4.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.13.0
-	google.golang.org/grpc v1.58.0
+	google.golang.org/grpc v1.58.1
 	google.golang.org/protobuf v1.31.0
 )
 
diff --git a/go.sum b/go.sum
index 7cd4c5719..40dec8f4a 100644
--- a/go.sum
+++ b/go.sum
@@ -549,8 +549,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o=
-google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58=
+google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

From e533e297716e94fdb45248da898ada0676e69894 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 15 Sep 2023 15:21:47 +0400
Subject: [PATCH 48/88] add delete param by click

---
 admin-ui/src/components/search/search.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index 2ae791783..fab4f25a5 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -172,14 +172,18 @@ export default {
     },
     setEntity(index) {
       const item = this.searchItems[index];
-      if (item.isSelect) {
-        return;
-      }
-
       const variant =
         this.variants[this.selectedGroupKey] || this.variants[item?.key];
       const key = variant?.key || this.selectedGroupKey;
 
+      if (item.isSelect) {
+        return this.$store.commit("appSearch/deleteCustomParam", {
+          isArray: variant.isArray,
+          key,
+          value: item.uuid,
+        });
+      }
+
       if (variant?.isArray) {
         this.customParams[key]?.forEach((i) => {
           if (i.temporary) {

From a6b3bb1c0bd5f5e30f1a7387020e5cad4e6bbd86 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 18 Sep 2023 19:26:02 +0400
Subject: [PATCH 49/88] move servecis down dns

---
 admin-ui/src/App.vue | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index eae0e2804..e1b86753e 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -127,22 +127,6 @@
             </v-list-item-content>
           </v-list-item>
 
-          <v-list-item
-            v-bind="listItemBind"
-            :to="{ name: 'Services' }"
-            @click.ctrl="() => (easterEgg = true)"
-          >
-            <v-list-item-icon>
-              <v-icon :color="easterEgg ? 'green darker-2' : undefined"
-                >mdi-alien</v-icon
-              >
-            </v-list-item-icon>
-
-            <v-list-item-content>
-              <v-list-item-title>{{ navTitle("Services") }}</v-list-item-title>
-            </v-list-item-content>
-          </v-list-item>
-
           <v-subheader>BILLING</v-subheader>
 
           <v-list-item v-bind="listItemBind" :to="{ name: 'Plans' }">
@@ -244,6 +228,22 @@
             </v-list-item-content>
           </v-list-item>
 
+          <v-list-item
+            v-bind="listItemBind"
+            :to="{ name: 'Services' }"
+            @click.ctrl="() => (easterEgg = true)"
+          >
+            <v-list-item-icon>
+              <v-icon :color="easterEgg ? 'green darker-2' : undefined"
+                >mdi-alien</v-icon
+              >
+            </v-list-item-icon>
+
+            <v-list-item-content>
+              <v-list-item-title>{{ navTitle("Services") }}</v-list-item-title>
+            </v-list-item-content>
+          </v-list-item>
+
           <v-list-item v-bind="listItemBind" :to="{ name: 'Settings' }">
             <v-list-item-icon>
               <v-icon>mdi-cogs</v-icon>

From fabc82bf06be351de6d735cf8b86871b98f02dbc Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 18 Sep 2023 19:28:24 +0400
Subject: [PATCH 50/88] add domain to cpanel instance card

---
 .../modules/cpanel/additionalInstanceInfo.vue   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 admin-ui/src/components/modules/cpanel/additionalInstanceInfo.vue

diff --git a/admin-ui/src/components/modules/cpanel/additionalInstanceInfo.vue b/admin-ui/src/components/modules/cpanel/additionalInstanceInfo.vue
new file mode 100644
index 000000000..8aeefdbf0
--- /dev/null
+++ b/admin-ui/src/components/modules/cpanel/additionalInstanceInfo.vue
@@ -0,0 +1,17 @@
+<template>
+  <v-row>
+    <v-col cols="2">
+      <v-text-field readonly :value="template.config.domain" label="Domain" />
+    </v-col>
+  </v-row>
+</template>
+
+<script setup>
+import { toRefs, defineProps } from "vue";
+
+const props = defineProps(["template", "sp"]);
+
+const { template } = toRefs(props);
+</script>
+
+<style scoped></style>

From 6a3ac21ec0f1b69ed26b61450f7d89b31192e0c2 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Mon, 18 Sep 2023 19:19:23 +0300
Subject: [PATCH 51/88] Set universal oauth2 credentials

---
 pkg/credentials/credentials.go   | 37 +++++++++-----------
 pkg/credentials/oauth2.go        | 60 ++++++++++++++++++++++++++++++++
 pkg/credentials/oauth2_github.go | 58 ------------------------------
 pkg/credentials/oauth2_google.go | 58 ------------------------------
 4 files changed, 76 insertions(+), 137 deletions(-)
 create mode 100644 pkg/credentials/oauth2.go
 delete mode 100644 pkg/credentials/oauth2_github.go
 delete mode 100644 pkg/credentials/oauth2_google.go

diff --git a/pkg/credentials/credentials.go b/pkg/credentials/credentials.go
index f8faea686..4263a08b6 100644
--- a/pkg/credentials/credentials.go
+++ b/pkg/credentials/credentials.go
@@ -18,6 +18,7 @@ package credentials
 import (
 	"context"
 	"errors"
+	"strings"
 
 	"github.com/arangodb/go-driver"
 	accountspb "github.com/slntopp/nocloud-proto/registry/accounts"
@@ -65,15 +66,13 @@ type Credentials interface {
 }
 
 func Determine(auth_type string) (cred Credentials, ok bool) {
-	switch auth_type {
-	case "standard":
+	switch {
+	case auth_type == "standard":
 		return &StandardCredentials{}, true
-	case "whmcs":
+	case auth_type == "whmcs":
 		return &WHMCSCredentials{}, true
-	case "oauth2-google":
-		return &OAuth2GoogleCredentials{}, true
-	case "oauth2-github":
-		return &OAuth2GithubCredentials{}, true
+	case strings.HasPrefix(auth_type, "oauth2"):
+		return &OAuth2Credentials{}, true
 	default:
 		return nil, false
 	}
@@ -81,15 +80,13 @@ func Determine(auth_type string) (cred Credentials, ok bool) {
 
 func Find(ctx context.Context, db driver.Database, log *zap.Logger, auth_type string, args ...string) (cred Credentials, err error) {
 	var ok bool
-	switch auth_type {
-	case "standard":
+	switch {
+	case auth_type == "standard":
 		cred = &StandardCredentials{Username: args[0]}
-	case "whmcs":
+	case auth_type == "whmcs":
 		cred = &WHMCSCredentials{Email: args[0]}
-	case "oauth2-google":
-		cred = &OAuth2GoogleCredentials{Email: args[0]}
-	case "oauth2-github":
-		cred = &OAuth2GithubCredentials{Login: args[0]}
+	case strings.HasPrefix(auth_type, "oauth2"):
+		cred = &OAuth2Credentials{AuthField: args[0], AuthValue: args[1]}
 	default:
 		return nil, errors.New("unknown auth type")
 	}
@@ -111,15 +108,13 @@ func Find(ctx context.Context, db driver.Database, log *zap.Logger, auth_type st
 func MakeCredentials(credentials *accountspb.Credentials, log *zap.Logger) (Credentials, error) {
 	var cred Credentials
 	var err error
-	switch credentials.Type {
-	case "standard":
+	switch {
+	case credentials.Type == "standard":
 		cred, err = NewStandardCredentials(credentials.Data)
-	case "whmcs":
+	case credentials.Type == "whmcs":
 		cred, err = NewWHMCSCredentials(credentials.Data)
-	case "oauth2-google":
-		cred, err = NewOAuth2GoogleCredentials(credentials.Data)
-	case "oauth2-github":
-		cred, err = NewOAuth2GithubCredentials(credentials.Data)
+	case strings.HasPrefix(credentials.Type, "oauth2"):
+		cred, err = NewOAuth2Credentials(credentials.Data)
 	default:
 		return nil, errors.New("auth type is wrong")
 	}
diff --git a/pkg/credentials/oauth2.go b/pkg/credentials/oauth2.go
new file mode 100644
index 000000000..b8b4af9e9
--- /dev/null
+++ b/pkg/credentials/oauth2.go
@@ -0,0 +1,60 @@
+package credentials
+
+import (
+	"context"
+	"fmt"
+	"github.com/arangodb/go-driver"
+	"github.com/slntopp/nocloud/pkg/nocloud/schema"
+	"go.uber.org/zap"
+)
+
+type OAuth2Credentials struct {
+	AuthField string `json:"auth_field"`
+	AuthValue string `json:"auth_value"`
+
+	log *zap.Logger
+	driver.DocumentMeta
+}
+
+func NewOAuth2Credentials(data []string) (Credentials, error) {
+	if len(data) < 2 {
+		return nil, fmt.Errorf("some credentials data is missing, expected data length to be 2, got: %d", len(data))
+	}
+	field, value := data[0], data[1]
+	return &OAuth2Credentials{AuthField: field, AuthValue: value}, nil
+}
+
+func (*OAuth2Credentials) Type() string {
+	return "oauth2-github"
+}
+
+// Authorize method for StandardCredentials assumes that args consist of username and password stored at 0 and 1 accordingly
+func (cred *OAuth2Credentials) Authorize(args ...string) bool {
+	return cred.AuthField == args[0] && cred.AuthValue == args[1]
+}
+
+func (cred *OAuth2Credentials) SetLogger(log *zap.Logger) {
+	cred.log = log.Named("OAuth2")
+	cred.log.Debug("Logger is now set")
+}
+
+func (cred *OAuth2Credentials) Find(ctx context.Context, db driver.Database) bool {
+	query := `FOR cred IN @@credentials FILTER cred[@field] == @value RETURN cred`
+	c, err := db.Query(ctx, query, map[string]interface{}{
+		"field":        cred.AuthField,
+		"value":        cred.AuthValue,
+		"@credentials": schema.CREDENTIALS_COL,
+	})
+	if err != nil {
+		return false
+	}
+	defer c.Close()
+
+	_, err = c.ReadDocument(ctx, &cred)
+	return err == nil
+}
+
+func (cred *OAuth2Credentials) FindByKey(ctx context.Context, col driver.Collection, key string) error {
+	_, err := col.ReadDocument(ctx, key, cred)
+	return err
+}
diff --git a/pkg/credentials/oauth2_github.go b/pkg/credentials/oauth2_github.go
deleted file mode 100644
index 3adbcf588..000000000
--- a/pkg/credentials/oauth2_github.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package credentials
-
-import (
-	"context"
-	"errors"
-	"github.com/arangodb/go-driver"
-	"github.com/slntopp/nocloud/pkg/nocloud/schema"
-	"go.uber.org/zap"
-)
-
-type OAuth2GithubCredentials struct {
-	Login string `json:"login"`
-
-	log *zap.Logger
-	driver.DocumentMeta
-}
-
-func NewOAuth2GithubCredentials(data []string) (Credentials, error) {
-	if len(data) < 1 {
-		return nil, errors.New("empty Credentials")
-	}
-	login := data[0]
-	return &OAuth2GithubCredentials{Login: login}, nil
-}
-
-func (*OAuth2GithubCredentials) Type() string {
-	return "oauth2-github"
-}
-
-// Authorize method for StandardCredentials assumes that args consist of username and password stored at 0 and 1 accordingly
-func (cred *OAuth2GithubCredentials) Authorize(args ...string) bool {
-	return cred.Login == args[0]
-}
-
-func (cred *OAuth2GithubCredentials) SetLogger(log *zap.Logger) {
-	cred.log = log.Named("OAuth2Github")
-	cred.log.Debug("Logger is now set")
-}
-
-func (cred *OAuth2GithubCredentials) Find(ctx context.Context, db driver.Database) bool {
-	query := `FOR cred IN @@credentials FILTER cred.login == @login RETURN cred`
-	c, err := db.Query(ctx, query, map[string]interface{}{
-		"login":        cred.Login,
-		"@credentials": schema.CREDENTIALS_COL,
-	})
-	if err != nil {
-		return false
-	}
-	defer c.Close()
-
-	_, err = c.ReadDocument(ctx, &cred)
-	return err == nil
-}
-
-func (cred *OAuth2GithubCredentials) FindByKey(ctx context.Context, col driver.Collection, key string) error {
-	_, err := col.ReadDocument(ctx, key, cred)
-	return err
-}
diff --git a/pkg/credentials/oauth2_google.go b/pkg/credentials/oauth2_google.go
deleted file mode 100644
index 286eb6680..000000000
--- a/pkg/credentials/oauth2_google.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package credentials
-
-import (
-	"context"
-	"errors"
-	"github.com/arangodb/go-driver"
-	"github.com/slntopp/nocloud/pkg/nocloud/schema"
-	"go.uber.org/zap"
-)
-
-type OAuth2GoogleCredentials struct {
-	Email string `json:"email"`
-
-	log *zap.Logger
-	driver.DocumentMeta
-}
-
-func NewOAuth2GoogleCredentials(data []string) (Credentials, error) {
-	if len(data) < 1 {
-		return nil, errors.New("empty Credentials")
-	}
-	email := data[0]
-	return &OAuth2GoogleCredentials{Email: email}, nil
-}
-
-func (*OAuth2GoogleCredentials) Type() string {
-	return "oauth2-google"
-}
-
-// Authorize method for StandardCredentials assumes that args consist of username and password stored at 0 and 1 accordingly
-func (cred *OAuth2GoogleCredentials) Authorize(args ...string) bool {
-	return cred.Email == args[0]
-}
-
-func (cred *OAuth2GoogleCredentials) SetLogger(log *zap.Logger) {
-	cred.log = log.Named("OAuth2Google")
-	cred.log.Debug("Logger is now set")
-}
-
-func (cred *OAuth2GoogleCredentials) Find(ctx context.Context, db driver.Database) bool {
-	query := `FOR cred IN @@credentials FILTER cred.email == @email RETURN cred`
-	c, err := db.Query(ctx, query, map[string]interface{}{
-		"email":        cred.Email,
-		"@credentials": schema.CREDENTIALS_COL,
-	})
-	if err != nil {
-		return false
-	}
-	defer c.Close()
-
-	_, err = c.ReadDocument(ctx, &cred)
-	return err == nil
-}
-
-func (cred *OAuth2GoogleCredentials) FindByKey(ctx context.Context, col driver.Collection, key string) error {
-	_, err := col.ReadDocument(ctx, key, cred)
-	return err
-}

From 1e107070b1adad0d7c609eabf125b34aa922ef6b Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Mon, 18 Sep 2023 20:03:09 +0300
Subject: [PATCH 52/88] Complete bitrix handler

---
 pkg/oauth2/config/config.go   |   5 ++
 pkg/oauth2/handlers/bitrix.go | 135 ++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)
 create mode 100644 pkg/oauth2/handlers/bitrix.go

diff --git a/pkg/oauth2/config/config.go b/pkg/oauth2/config/config.go
index 6d134d878..6b6055534 100644
--- a/pkg/oauth2/config/config.go
+++ b/pkg/oauth2/config/config.go
@@ -25,6 +25,11 @@ type OAuth2Config struct {
 	ClientID     string `json:"client_id"`
 	ClientSecret string `json:"client_secret"`
 	RedirectURL  string `json:"redirect_url"`
+	AuthURL      string `json:"auth_url"`
+	TokenURL     string `json:"token_url"`
+	StateString  string `json:"state_string"`
+	UserInfoURL  string `json:"user_info_url"`
+	AuthField    string `json:"auth_field"`
 }
 
 func Config() (map[string]OAuth2Config, error) {
diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
new file mode 100644
index 000000000..803f92e25
--- /dev/null
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -0,0 +1,135 @@
+package handlers
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"github.com/gorilla/mux"
+	"github.com/slntopp/nocloud-proto/registry"
+	"github.com/slntopp/nocloud-proto/registry/accounts"
+	"github.com/slntopp/nocloud/pkg/nocloud/auth"
+	"github.com/slntopp/nocloud/pkg/nocloud/schema"
+	"github.com/slntopp/nocloud/pkg/oauth2/config"
+	"golang.org/x/oauth2"
+	"google.golang.org/grpc/metadata"
+	"io"
+	"net/http"
+	"time"
+)
+
+type BitrixHandler struct{}
+
+type UserInfo struct {
+	Result []map[string]interface{} `json:"result"`
+}
+
+func (g *BitrixHandler) Setup(router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+	oauth2Config := &oauth2.Config{
+		ClientID:     cfg.ClientID,
+		ClientSecret: cfg.ClientSecret,
+		RedirectURL:  cfg.RedirectURL,
+		Endpoint: oauth2.Endpoint{
+			AuthURL:  cfg.AuthURL,
+			TokenURL: cfg.TokenURL,
+		},
+	}
+
+	stateString := cfg.StateString
+	userInfoUrl := cfg.UserInfoURL
+	field := cfg.AuthField
+
+	router.Handle("/oauth/bitrix/login", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		url := oauth2Config.AuthCodeURL(stateString)
+		http.Redirect(w, r, url, http.StatusTemporaryRedirect)
+	}))
+	router.Handle("/oauth/bitrix/checkout", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		state, code := r.FormValue("state"), r.FormValue("code")
+
+		if state != stateString {
+			return
+		}
+
+		token, err := oauth2Config.Exchange(context.Background(), code)
+		if err != nil {
+			return
+		}
+
+		response, err := http.Get(fmt.Sprintf("%s/rest/user.current.json?auth=%s", userInfoUrl, token.AccessToken))
+
+		defer response.Body.Close()
+		body, err := io.ReadAll(response.Body)
+
+		var userInfo = UserInfo{}
+		err = json.Unmarshal(body, &userInfo)
+		if err != nil {
+			return
+		}
+
+		if userInfo.Result == nil {
+			return
+		}
+
+		if len(userInfo.Result) != 1 {
+			return
+		}
+
+		user := userInfo.Result[0]
+		value := user[field].(string)
+
+		name := user["NAME"].(string)
+		last_name := user["LAST_NAME"].(string)
+
+		rootToken, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
+		if err != nil {
+			return
+		}
+
+		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+rootToken)
+
+		resp, err := regClient.Token(ctx, &accounts.TokenRequest{
+			Auth: &accounts.Credentials{
+				Type: "oauth2-github",
+				Data: []string{
+					field,
+					value,
+				},
+			},
+			Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
+		})
+		if err != nil {
+			_, err = regClient.Create(ctx, &accounts.CreateRequest{
+				Title:     fmt.Sprintf("%s %s", name, last_name),
+				Namespace: schema.ROOT_NAMESPACE_KEY,
+				Auth: &accounts.Credentials{
+					Type: "oauth2-bitrix",
+					Data: []string{
+						field,
+						value,
+					},
+				},
+			})
+			if err != nil {
+				return
+			}
+			resp, err = regClient.Token(ctx, &accounts.TokenRequest{
+				Auth: &accounts.Credentials{
+					Type: "oauth2-github",
+					Data: []string{
+						field,
+						value,
+					},
+				},
+				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
+			})
+			if err != nil {
+				return
+			}
+		}
+
+		res := map[string]string{
+			"token": resp.GetToken(),
+		}
+		marshal, _ := json.Marshal(res)
+		w.Write(marshal)
+	}))
+}

From cfebea16ed415bb026b3c2ed85bfc0efb9d1f3a2 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Mon, 18 Sep 2023 20:13:13 +0300
Subject: [PATCH 53/88] Fix handlers

---
 pkg/oauth2/handlers/bitrix.go   | 4 ++--
 pkg/oauth2/handlers/github.go   | 3 +++
 pkg/oauth2/handlers/google.go   | 3 +++
 pkg/oauth2/handlers/handlers.go | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 803f92e25..70a0d43f9 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -17,13 +17,13 @@ import (
 	"time"
 )
 
-type BitrixHandler struct{}
+type BitrixOauthHandler struct{}
 
 type UserInfo struct {
 	Result []map[string]interface{} `json:"result"`
 }
 
-func (g *BitrixHandler) Setup(router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+func (g *BitrixOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
 	oauth2Config := &oauth2.Config{
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index 90f029ca4..efda6894f 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -51,6 +51,7 @@ func (g *GithubOauthHandler) successHandler(regClient registry.AccountsServiceCl
 			Auth: &accounts.Credentials{
 				Type: "oauth2-github",
 				Data: []string{
+					"login",
 					*user.Login,
 				},
 			},
@@ -63,6 +64,7 @@ func (g *GithubOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				Auth: &accounts.Credentials{
 					Type: "oauth2-github",
 					Data: []string{
+						"login",
 						*user.Login,
 					},
 				},
@@ -74,6 +76,7 @@ func (g *GithubOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				Auth: &accounts.Credentials{
 					Type: "oauth2-github",
 					Data: []string{
+						"login",
 						*user.Login,
 					},
 				},
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index da609d611..255f9d88f 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -51,6 +51,7 @@ func (g *GoogleOauthHandler) successHandler(regClient registry.AccountsServiceCl
 			Auth: &accounts.Credentials{
 				Type: "oauth2-google",
 				Data: []string{
+					"email",
 					user.Email,
 				},
 			},
@@ -63,6 +64,7 @@ func (g *GoogleOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				Auth: &accounts.Credentials{
 					Type: "oauth2-google",
 					Data: []string{
+						"email",
 						user.Email,
 					},
 				},
@@ -74,6 +76,7 @@ func (g *GoogleOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				Auth: &accounts.Credentials{
 					Type: "oauth2-google",
 					Data: []string{
+						"email",
 						user.Email,
 					},
 				},
diff --git a/pkg/oauth2/handlers/handlers.go b/pkg/oauth2/handlers/handlers.go
index 6b9d8fdf9..382c1d8f5 100644
--- a/pkg/oauth2/handlers/handlers.go
+++ b/pkg/oauth2/handlers/handlers.go
@@ -16,6 +16,8 @@ func GetOAuthHandler(handlerType string) OAuthHandler {
 		return &GoogleOauthHandler{}
 	case "github":
 		return &GithubOauthHandler{}
+	case "bitrix":
+		return &BitrixOauthHandler{}
 	default:
 		return nil
 	}

From 33670433593e34108c8d753e8b9c90749e08a50e Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 19 Sep 2023 11:51:46 +0300
Subject: [PATCH 54/88] Add logging

---
 pkg/oauth2/handlers/bitrix.go   |  9 ++++++++-
 pkg/oauth2/handlers/github.go   | 11 ++++++++---
 pkg/oauth2/handlers/google.go   | 11 ++++++++---
 pkg/oauth2/handlers/handlers.go |  3 ++-
 pkg/oauth2/main.go              |  2 +-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 70a0d43f9..b0bef50b5 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -10,6 +10,7 @@ import (
 	"github.com/slntopp/nocloud/pkg/nocloud/auth"
 	"github.com/slntopp/nocloud/pkg/nocloud/schema"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
+	"go.uber.org/zap"
 	"golang.org/x/oauth2"
 	"google.golang.org/grpc/metadata"
 	"io"
@@ -23,7 +24,7 @@ type UserInfo struct {
 	Result []map[string]interface{} `json:"result"`
 }
 
-func (g *BitrixOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
 	oauth2Config := &oauth2.Config{
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
@@ -46,11 +47,13 @@ func (g *BitrixOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config,
 		state, code := r.FormValue("state"), r.FormValue("code")
 
 		if state != stateString {
+			log.Debug("State string not equal to state", zap.String("state", state), zap.String("stateString", stateString))
 			return
 		}
 
 		token, err := oauth2Config.Exchange(context.Background(), code)
 		if err != nil {
+			log.Error("Failed to get token from exchange", zap.Error(err))
 			return
 		}
 
@@ -62,6 +65,7 @@ func (g *BitrixOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config,
 		var userInfo = UserInfo{}
 		err = json.Unmarshal(body, &userInfo)
 		if err != nil {
+			log.Error("Failed unmarshal body", zap.Error(err))
 			return
 		}
 
@@ -81,6 +85,7 @@ func (g *BitrixOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config,
 
 		rootToken, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
 		if err != nil {
+			log.Error("Failed create token", zap.Error(err))
 			return
 		}
 
@@ -109,6 +114,7 @@ func (g *BitrixOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config,
 				},
 			})
 			if err != nil {
+				log.Error("Failed create account", zap.Error(err))
 				return
 			}
 			resp, err = regClient.Token(ctx, &accounts.TokenRequest{
@@ -122,6 +128,7 @@ func (g *BitrixOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config,
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
 			if err != nil {
+				log.Error("Failed get token", zap.Error(err))
 				return
 			}
 		}
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index efda6894f..d9675b5e3 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -11,6 +11,7 @@ import (
 	"github.com/slntopp/nocloud/pkg/nocloud/auth"
 	"github.com/slntopp/nocloud/pkg/nocloud/schema"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
+	"go.uber.org/zap"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"
 	"google.golang.org/grpc/metadata"
@@ -20,7 +21,7 @@ import (
 
 type GithubOauthHandler struct{}
 
-func (g *GithubOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+func (g *GithubOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
 	oauth2Config := &oauth2.Config{
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
@@ -30,18 +31,20 @@ func (g *GithubOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config,
 	stateConfig := gologin.DefaultCookieConfig
 
 	router.Handle("/oauth/github/login", github_gologin.StateHandler(stateConfig, github_gologin.LoginHandler(oauth2Config, nil)))
-	router.Handle("/oauth/github/checkout", github_gologin.StateHandler(stateConfig, github_gologin.CallbackHandler(oauth2Config, g.successHandler(regClient), nil)))
+	router.Handle("/oauth/github/checkout", github_gologin.StateHandler(stateConfig, github_gologin.CallbackHandler(oauth2Config, g.successHandler(log, regClient), nil)))
 }
 
-func (g *GithubOauthHandler) successHandler(regClient registry.AccountsServiceClient) http.Handler {
+func (g *GithubOauthHandler) successHandler(log *zap.Logger, regClient registry.AccountsServiceClient) http.Handler {
 	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
 		user, err := github_gologin.UserFromContext(request.Context())
 		if err != nil {
+			log.Error("Failed to get user from ctx", zap.Error(err))
 			return
 		}
 
 		token, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
 		if err != nil {
+			log.Error("Failed to create token", zap.Error(err))
 			return
 		}
 
@@ -70,6 +73,7 @@ func (g *GithubOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				},
 			})
 			if err != nil {
+				log.Error("Failed to create account", zap.Error(err))
 				return
 			}
 			response, err = regClient.Token(ctx, &accounts.TokenRequest{
@@ -83,6 +87,7 @@ func (g *GithubOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
 			if err != nil {
+				log.Error("Failed to get token", zap.Error(err))
 				return
 			}
 		}
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index 255f9d88f..6ed9091e9 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -11,6 +11,7 @@ import (
 	"github.com/slntopp/nocloud/pkg/nocloud/auth"
 	"github.com/slntopp/nocloud/pkg/nocloud/schema"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
+	"go.uber.org/zap"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/grpc/metadata"
@@ -20,7 +21,7 @@ import (
 
 type GoogleOauthHandler struct{}
 
-func (g *GoogleOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+func (g *GoogleOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
 	oauth2Config := &oauth2.Config{
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
@@ -30,18 +31,20 @@ func (g *GoogleOauthHandler) Setup(router *mux.Router, cfg config.OAuth2Config,
 	stateConfig := gologin.DefaultCookieConfig
 
 	router.Handle("/oauth/google/login", google_gologin.StateHandler(stateConfig, google_gologin.LoginHandler(oauth2Config, nil)))
-	router.Handle("/oauth/google/checkout", google_gologin.StateHandler(stateConfig, google_gologin.CallbackHandler(oauth2Config, g.successHandler(regClient), nil)))
+	router.Handle("/oauth/google/checkout", google_gologin.StateHandler(stateConfig, google_gologin.CallbackHandler(oauth2Config, g.successHandler(log, regClient), nil)))
 }
 
-func (g *GoogleOauthHandler) successHandler(regClient registry.AccountsServiceClient) http.Handler {
+func (g *GoogleOauthHandler) successHandler(log *zap.Logger, regClient registry.AccountsServiceClient) http.Handler {
 	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
 		user, err := google_gologin.UserFromContext(request.Context())
 		if err != nil {
+			log.Error("Failed to get user from ctx", zap.Error(err))
 			return
 		}
 
 		token, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
 		if err != nil {
+			log.Error("Failed to create token", zap.Error(err))
 			return
 		}
 
@@ -70,6 +73,7 @@ func (g *GoogleOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				},
 			})
 			if err != nil {
+				log.Error("Failed to create account", zap.Error(err))
 				return
 			}
 			response, err = regClient.Token(ctx, &accounts.TokenRequest{
@@ -83,6 +87,7 @@ func (g *GoogleOauthHandler) successHandler(regClient registry.AccountsServiceCl
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
 			if err != nil {
+				log.Error("Failed to get token", zap.Error(err))
 				return
 			}
 		}
diff --git a/pkg/oauth2/handlers/handlers.go b/pkg/oauth2/handlers/handlers.go
index 382c1d8f5..f7b2867b8 100644
--- a/pkg/oauth2/handlers/handlers.go
+++ b/pkg/oauth2/handlers/handlers.go
@@ -4,10 +4,11 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/slntopp/nocloud-proto/registry"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
+	"go.uber.org/zap"
 )
 
 type OAuthHandler interface {
-	Setup(*mux.Router, config.OAuth2Config, registry.AccountsServiceClient)
+	Setup(*zap.Logger, *mux.Router, config.OAuth2Config, registry.AccountsServiceClient)
 }
 
 func GetOAuthHandler(handlerType string) OAuthHandler {
diff --git a/pkg/oauth2/main.go b/pkg/oauth2/main.go
index 74ffd8793..b3ffc93f3 100644
--- a/pkg/oauth2/main.go
+++ b/pkg/oauth2/main.go
@@ -41,7 +41,7 @@ func (s *OAuth2Server) registerOAuthHandlers() {
 			continue
 		}
 
-		handler.Setup(s.router, conf, s.registryClient)
+		handler.Setup(s.log.Named(key), s.router, conf, s.registryClient)
 	}
 
 }

From bc6b023a9ca41b5911fc3dfffc8775192616c9bc Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 19 Sep 2023 11:54:31 +0300
Subject: [PATCH 55/88] Fix errors

---
 pkg/oauth2/handlers/bitrix.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index b0bef50b5..79a707767 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -59,9 +59,19 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 
 		response, err := http.Get(fmt.Sprintf("%s/rest/user.current.json?auth=%s", userInfoUrl, token.AccessToken))
 
+		if err != nil {
+			log.Error("Failed to make request", zap.Error(err))
+			return
+		}
+
 		defer response.Body.Close()
 		body, err := io.ReadAll(response.Body)
 
+		if err != nil {
+			log.Error("Failed to read body", zap.Error(err))
+			return
+		}
+
 		var userInfo = UserInfo{}
 		err = json.Unmarshal(body, &userInfo)
 		if err != nil {

From 7152e60b65da94934ff4ac81daa969b76c06d6a2 Mon Sep 17 00:00:00 2001
From: 639852 <sasha.bobyliev@mail.ru>
Date: Tue, 19 Sep 2023 15:48:01 +0400
Subject: [PATCH 56/88] - Fixed authorization in user app

---
 admin-ui/package.json                         |   3 +-
 admin-ui/src/components/instance/info.vue     |   1 +
 admin-ui/src/components/instances_table.vue   |   1 +
 .../src/components/ui/iconsAutocomplete.vue   |  21 +-
 .../src/components/ui/loginInAccountIcon.vue  |   8 +-
 admin-ui/yarn.lock                            | 454 +++++++++++-------
 6 files changed, 314 insertions(+), 174 deletions(-)

diff --git a/admin-ui/package.json b/admin-ui/package.json
index 0c4b35278..cf4a8a11c 100644
--- a/admin-ui/package.json
+++ b/admin-ui/package.json
@@ -8,7 +8,8 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@ant-design/icons-vue": "^4.0.6",
+    "@ant-design/icons": "^2.0.0",
+    "@ant-design/icons-vue": "^2.0.0",
     "@sardinefish/asn1": "^1.0.4",
     "ansi-regex": "^6.0.1",
     "apexcharts": "^3.41.1",
diff --git a/admin-ui/src/components/instance/info.vue b/admin-ui/src/components/instance/info.vue
index 77f57c838..1d3d0e8f2 100644
--- a/admin-ui/src/components/instance/info.vue
+++ b/admin-ui/src/components/instance/info.vue
@@ -76,6 +76,7 @@
               <login-in-account-icon
                 :uuid="account?.uuid"
                 :instanceId="template.uuid"
+                :type="template.type"
               />
             </template>
           </v-text-field>
diff --git a/admin-ui/src/components/instances_table.vue b/admin-ui/src/components/instances_table.vue
index 771942afa..c8774311e 100644
--- a/admin-ui/src/components/instances_table.vue
+++ b/admin-ui/src/components/instances_table.vue
@@ -26,6 +26,7 @@
         <login-in-account-icon
           :uuid="getAccount(item).uuid"
           :instanceId="item.uuid"
+          :type="item.type"
         />
       </div>
     </template>
diff --git a/admin-ui/src/components/ui/iconsAutocomplete.vue b/admin-ui/src/components/ui/iconsAutocomplete.vue
index 54da67c2a..7b1e82f1c 100644
--- a/admin-ui/src/components/ui/iconsAutocomplete.vue
+++ b/admin-ui/src/components/ui/iconsAutocomplete.vue
@@ -9,12 +9,12 @@
     @input="emits('input:value', $event)"
   >
     <template v-slot:prepend>
-      <component :is="currentIcon" class="ml-3" />
+      <antd-icon :type="currentIcon" class="ml-3" />
     </template>
     <template v-slot:item="{ item }">
       <div class="d-flex justify-space-between" style="width: 100%">
         <span>{{ toKebabCase(item.displayName) }}</span>
-        <component :is="item" style="font-size: 24px" />
+        <antd-icon :type="item" style="font-size: 24px" />
       </div>
     </template>
   </v-autocomplete>
@@ -22,6 +22,7 @@
 
 <script setup>
 import { computed, onMounted, ref, toRefs } from "vue";
+import antdIcon from "@ant-design/icons-vue"
 import { toKebabCase } from "@/functions";
 
 const props = defineProps({
@@ -41,11 +42,19 @@ onMounted(fetchIcons);
 
 async function fetchIcons() {
   isIconsLoading.value = true;
-  const iconsRes = await import("@ant-design/icons-vue");
+  const iconsRes = await import("@ant-design/icons");
 
-  icons.value = Object.values(iconsRes).filter((icon) =>
-    typeof icon !== 'function' && icon.displayName
-  );
+  icons.value = Object.entries(iconsRes).map(([name, icon]) => {
+    let displayName = name;
+
+    if (name.endsWith('Outline')) {
+      displayName = name.replace('Outline', '$&d')
+    } else if (name.endsWith('Fill')) {
+      displayName = name.replace('Fill', '$&ed')
+    }
+
+    return { ...icon, displayName };
+  });
   isIconsLoading.value = false;
 }
 </script>
diff --git a/admin-ui/src/components/ui/loginInAccountIcon.vue b/admin-ui/src/components/ui/loginInAccountIcon.vue
index 24b66f412..4e37c8452 100644
--- a/admin-ui/src/components/ui/loginInAccountIcon.vue
+++ b/admin-ui/src/components/ui/loginInAccountIcon.vue
@@ -6,7 +6,7 @@
 import api from "@/api";
 import { useStore } from "@/store";
 
-const props = defineProps(["uuid", "instanceId"]);
+const props = defineProps(["uuid", "instanceId", "type"]);
 const store = useStore();
 
 const loginHandler = () => {
@@ -16,9 +16,9 @@ const loginHandler = () => {
       api.settings.get(["app"]).then((res) => {
         const win = window.open(JSON.parse(res.app).url);
 
-        setTimeout(() => {
-          win.postMessage({ token, uuid: props.instanceId }, "*");
-        }, 300);
+        window.addEventListener('message', () => {
+          win.postMessage({ token, uuid: props.instanceId, type: props.type }, "*");
+        });
       });
     })
     .catch((e) => {
diff --git a/admin-ui/yarn.lock b/admin-ui/yarn.lock
index 2571a5ec7..2d7bd9caf 100644
--- a/admin-ui/yarn.lock
+++ b/admin-ui/yarn.lock
@@ -31,21 +31,18 @@
   dependencies:
     tinycolor2 "^1.4.1"
 
-"@ant-design/icons-svg@^4.0.0":
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.3.0.tgz"
-  integrity sha512-WOgvdH/1Wl8Z7VXigRbCa5djO14zxrNTzvrAQzhWiBQtEKT0uTc8K1ltjKZ8U1gPn/wXhMA8/jE39SJl0WNxSg==
-
-"@ant-design/icons-vue@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-4.0.6.tgz"
-  integrity sha512-nOrvzlOrjNEqE1KK5B+aZa3gWQMFIHHaSYFVjHiCgNGgnx05oLMKu7+Bc2ylLaSRuJ+/+PfU2qZan5QdJwFzBA==
+"@ant-design/icons-vue@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-2.0.0.tgz"
+  integrity sha512-2c0QQE5hL4N48k5NkPG5sdpMl9YnvyNhf0U7YkdZYDlLnspoRU7vIA0UK9eHBs6OpFLcJB6o8eJrIl2ajBskPg==
   dependencies:
     "@ant-design/colors" "^3.1.0"
-    "@ant-design/icons-svg" "^4.0.0"
-    classnames "^2.2.6"
-    insert-css "^2.0.0"
-    lodash "^4.17.15"
+    babel-runtime "^6.26.0"
+
+"@ant-design/icons@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-2.0.0.tgz"
+  integrity sha512-N4h0v9TbAkzobiDrPNF5LMLbBoR+VdlXJX7RFbZS33lar6Pff37wIF1xJHzTYSZZmE6THSYGmSlEsHQJHx0pJg==
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.5":
   version "7.22.5"
@@ -59,7 +56,7 @@
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz"
   integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
-"@babel/core@^7.12.16":
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.11.0", "@babel/core@^7.12.0", "@babel/core@^7.12.16", "@babel/core@^7.13.0", "@babel/core@^7.4.0-0":
   version "7.22.9"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz"
   integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==
@@ -992,7 +989,7 @@
     "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
-"@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0":
+"@discoveryjs/json-ext@^0.5.0", "@discoveryjs/json-ext@0.5.7":
   version "0.5.7"
   resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
@@ -1087,16 +1084,16 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@1.4.14":
-  version "1.4.14"
-  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
-
 "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.15"
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
+"@jridgewell/sourcemap-codec@1.4.14":
+  version "1.4.14"
+  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.18"
   resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz"
@@ -1132,7 +1129,7 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
   version "2.0.5"
   resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -1521,7 +1518,7 @@
   resolved "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz"
   integrity sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA==
 
-"@vue/cli-service@~5.0.7":
+"@vue/cli-service@^3.0.0 || ^4.0.0 || ^5.0.0-0", "@vue/cli-service@~5.0.7":
   version "5.0.8"
   resolved "https://registry.npmjs.org/@vue/cli-service/-/cli-service-5.0.8.tgz"
   integrity sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw==
@@ -1641,7 +1638,7 @@
   resolved "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"
   integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==
 
-"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
+"@webassemblyjs/ast@^1.11.5", "@webassemblyjs/ast@1.11.6":
   version "1.11.6"
   resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz"
   integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
@@ -1742,7 +1739,7 @@
     "@webassemblyjs/wasm-gen" "1.11.6"
     "@webassemblyjs/wasm-parser" "1.11.6"
 
-"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
+"@webassemblyjs/wasm-parser@^1.11.5", "@webassemblyjs/wasm-parser@1.11.6":
   version "1.11.6"
   resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz"
   integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
@@ -1810,7 +1807,7 @@ acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.2.0:
   resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^8.0.4, acorn@^8.0.5, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.9.0:
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8, acorn@^8.0.4, acorn@^8.0.5, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.9.0:
   version "8.10.0"
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
@@ -1839,7 +1836,7 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1849,7 +1846,17 @@ ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.9.0:
+ajv@^8.0.0:
+  version "8.12.0"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+ajv@^8.8.2, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -1901,7 +1908,14 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -1921,7 +1935,7 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apexcharts@^3.41.1:
+apexcharts@^3.26.0, apexcharts@^3.41.1:
   version "3.41.1"
   resolved "https://registry.npmjs.org/apexcharts/-/apexcharts-3.41.1.tgz"
   integrity sha512-kta8fhXrfZYqW7K9kF7FqZ6imQaC6moyRgcUZjwIky/oeHVVISSN/2rjUIvZXnwxWHiSdDHMqLy+TqJhB4DXFA==
@@ -1943,16 +1957,16 @@ argparse@^2.0.1:
   resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
-  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
-
 array-flatten@^2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
@@ -2505,7 +2519,7 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.21.9:
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.21.9, "browserslist@>= 4.21.0":
   version "4.21.10"
   resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz"
   integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
@@ -2630,7 +2644,15 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^4.1.0:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2638,7 +2660,15 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3:
+chalk@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chokidar@^3.5.3, "chokidar@>=3.0.0 <4.0.0":
   version "3.5.3"
   resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -2663,11 +2693,6 @@ ci-info@^1.5.0:
   resolved "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz"
   integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
-classnames@^2.2.6:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz"
-  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
-
 clean-css@^5.2.2:
   version "5.3.2"
   resolved "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz"
@@ -2757,16 +2782,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
 color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
 colord@^2.9.1:
   version "2.9.3"
   resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz"
@@ -2891,9 +2916,9 @@ core-js@^2.4.0:
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.32.1, core-js@^3.8.3:
-  version "3.32.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.1.tgz#a7d8736a3ed9dd05940c3c4ff32c591bb735be77"
-  integrity sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==
+  version "3.32.2"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz"
+  integrity sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -2945,7 +2970,7 @@ css-declaration-sorter@^6.3.1:
   resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz"
   integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==
 
-css-loader@^6.5.0:
+css-loader@*, css-loader@^6.5.0:
   version "6.7.4"
   resolved "https://registry.npmjs.org/css-loader/-/css-loader-6.7.4.tgz"
   integrity sha512-0Y5uHtK5BswfaGJ+jrO+4pPg1msFBc0pwPIE1VqfpmVn6YbDfYfXMj8rfd7nt+4goAhJueO+H/I40VWJfcP1mQ==
@@ -3073,7 +3098,7 @@ de-indent@^1.0.2:
   resolved "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"
   integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==
 
-debug@2.6.9, debug@^2.6.8:
+debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -3094,6 +3119,13 @@ debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
   dependencies:
     ms "2.1.2"
 
+debug@2.6.9:
+  version "2.6.9"
+  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
 decache@^4.6.0:
   version "4.6.1"
   resolved "https://registry.npmjs.org/decache/-/decache-4.6.1.tgz"
@@ -3150,16 +3182,16 @@ define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-depd@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
 destroy@1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
@@ -3363,15 +3395,15 @@ eslint-plugin-vue@^9.17.0:
     vue-eslint-parser "^9.3.1"
     xml-name-validator "^4.0.0"
 
-eslint-scope@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+eslint-scope@^7.1.1:
+  version "7.2.2"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
-    estraverse "^4.1.1"
+    estraverse "^5.2.0"
 
-eslint-scope@^7.1.1, eslint-scope@^7.2.2:
+eslint-scope@^7.2.2:
   version "7.2.2"
   resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz"
   integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
@@ -3379,12 +3411,25 @@ eslint-scope@^7.1.1, eslint-scope@^7.2.2:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
+eslint-scope@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
 eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+eslint-visitor-keys@^3.3.0:
+  version "3.4.1"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
+
+eslint-visitor-keys@^3.4.1:
   version "3.4.1"
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz"
   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
@@ -3405,7 +3450,7 @@ eslint-webpack-plugin@^3.1.0:
     normalize-path "^3.0.0"
     schema-utils "^4.0.0"
 
-eslint@^8.47.0:
+"eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^6.2.0 || ^7.0.0 || ^8.0.0", "eslint@^7.0.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", eslint@^8.47.0, eslint@>=6.0.0, eslint@>=7.5.0:
   version "8.47.0"
   resolved "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz"
   integrity sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==
@@ -3476,7 +3521,12 @@ estraverse@^4.1.1:
   resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.1.0, estraverse@^5.2.0:
+estraverse@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+estraverse@^5.2.0:
   version "5.3.0"
   resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -3695,7 +3745,15 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@^4.0.0, find-up@^4.1.0:
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -3764,11 +3822,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
@@ -3816,7 +3869,7 @@ get-stream@^6.0.0:
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -3830,6 +3883,13 @@ glob-parent@^6.0.1, glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
@@ -4035,6 +4095,16 @@ http-deceiver@^1.2.7:
   resolved "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"
   integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
+  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
 http-errors@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"
@@ -4046,16 +4116,6 @@ http-errors@2.0.0:
     statuses "2.0.1"
     toidentifier "1.0.1"
 
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
-  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
 http-parser-js@>=0.5.1:
   version "0.5.8"
   resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"
@@ -4137,7 +4197,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
+inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@2, inherits@2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4147,11 +4207,6 @@ inherits@2.0.3:
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-insert-css@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/insert-css/-/insert-css-2.0.0.tgz"
-  integrity sha512-xGq5ISgcUP5cvGkS2MMFLtPDBtrtQPSFfC6gA6U8wHKqfjTIMZLZNxOItQnoSjdOzlXOLU/yD32RKC4SvjNbtA==
-
 interpret@^1.0.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"
@@ -4169,16 +4224,16 @@ invariant@^2.2.2:
   dependencies:
     loose-envify "^1.0.0"
 
-ipaddr.js@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
 ipaddr.js@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz"
   integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
 
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
 is-arguments@^1.0.4:
   version "1.1.1"
   resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"
@@ -4563,7 +4618,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
+lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -4599,7 +4654,15 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lru-cache@^4.0.1, lru-cache@^4.1.2:
+lru-cache@^4.0.1:
+  version "4.1.5"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+lru-cache@^4.1.2:
   version "4.1.5"
   resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -4680,7 +4743,7 @@ micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+"mime-db@>= 1.43.0 < 2", mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
@@ -4755,16 +4818,16 @@ mrmime@^1.0.0:
   resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz"
   integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
 
+ms@^2.1.1, ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.2, ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
 ms@2.1.3:
   version "2.1.3"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
@@ -4825,11 +4888,10 @@ nocloud-ui@^1.0.7:
   resolved "https://registry.npmjs.org/nocloud-ui/-/nocloud-ui-1.0.7.tgz"
   integrity sha512-MMuuuBO7BO3HFq1LQqGQoJxGpbrdGgTJEzH0HtwUl0KeHPWaCXXhEytKZgP2HdJJL7CwzzC/Mt8/O4BLQ8lTmg==
 
-
-nocloudjsrest@^1.5.11:
-  version "1.5.11"
-  resolved "https://registry.yarnpkg.com/nocloudjsrest/-/nocloudjsrest-1.5.11.tgz#b07ec73e95f84d26d1bcda0fec875ca691d22067"
-  integrity sha512-xM6Na/Dj0obmL+uYkrouluWMpSznoR2qwjWK8eCiit9POgDkGKEtDEorFYIdAbpHHlzrsfLrqzrRn7EDbAqmIw==
+nocloudjsrest@^1.5.14:
+  version "1.5.14"
+  resolved "https://registry.npmjs.org/nocloudjsrest/-/nocloudjsrest-1.5.14.tgz"
+  integrity sha512-OIfnJYYeYglZ/bjCciKoLnDbqklSexogfUk8GQsbp+p4vPhFp/9IA5qoZBCITPnx6O8z5ao+OmYjepARV3TW5A==
   dependencies:
     axios "^0.24.0"
 
@@ -5137,7 +5199,12 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^2.0.0, path-key@^2.0.1:
+path-key@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
+
+path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
   integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
@@ -5440,15 +5507,7 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^7.0.36:
-  version "7.0.39"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-  dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
-postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.21:
+"postcss@^7.0.0 || ^8.0.1", postcss@^8.0.9, postcss@^8.1.0, postcss@^8.2.15, postcss@^8.2.2, postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.21:
   version "8.4.23"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz"
   integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==
@@ -5457,6 +5516,14 @@ postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.21:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^7.0.36:
+  version "7.0.39"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
+  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
+  dependencies:
+    picocolors "^0.2.1"
+    source-map "^0.6.1"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
@@ -5821,15 +5888,20 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.1.0, safe-buffer@>=5.1.0, safe-buffer@~5.2.0, safe-buffer@5.2.1:
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+safe-buffer@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 "safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
@@ -5844,7 +5916,7 @@ sass-loader@^13.0.2:
     klona "^2.0.6"
     neo-async "^2.6.2"
 
-sass@~1.32.6:
+sass@^1.3.0, sass@~1.32.6:
   version "1.32.13"
   resolved "https://registry.npmjs.org/sass/-/sass-1.32.13.tgz"
   integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==
@@ -5860,7 +5932,25 @@ schema-utils@^2.6.5:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
+schema-utils@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+schema-utils@^3.1.1:
+  version "3.3.0"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+schema-utils@^3.2.0:
   version "3.3.0"
   resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"
   integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
@@ -5891,7 +5981,7 @@ selfsigned@^2.1.1:
   dependencies:
     node-forge "^1"
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0:
+semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -5901,20 +5991,53 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.1.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
+semver@^7.1.2:
   version "7.5.1"
   resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz"
   integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.3.6, semver@^7.5.4:
+semver@^7.3.4:
+  version "7.5.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz"
+  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^7.3.5:
+  version "7.5.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz"
+  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^7.3.6:
   version "7.5.4"
   resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.3.8:
+  version "7.5.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz"
+  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
+"semver@2 || 3 || 4 || 5":
+  version "5.7.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
@@ -5976,7 +6099,7 @@ setprototypeof@1.2.0:
 
 sha256-uint8array@^0.10.7:
   version "0.10.7"
-  resolved "https://registry.yarnpkg.com/sha256-uint8array/-/sha256-uint8array-0.10.7.tgz#c751fc914f4227b26d996980562065fa4eadcf99"
+  resolved "https://registry.npmjs.org/sha256-uint8array/-/sha256-uint8array-0.10.7.tgz"
   integrity sha512-1Q6JQU4tX9NqsDGodej6pkrUVQVNapLZnvkwIhddH/JqzBZF1fSaxSWNY6sziXBE8aEa2twtGkXUrwzGeZCMpQ==
 
 shallow-clone@^3.0.0:
@@ -6150,15 +6273,29 @@ stackframe@^1.3.4:
   resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz"
   integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
+"statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
+
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-"statuses@>= 1.4.0 < 2":
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
-  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
 
 string-width@^2.1.1:
   version "2.1.1"
@@ -6177,20 +6314,6 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
@@ -6297,7 +6420,7 @@ svg.filter.js@^2.0.2:
   dependencies:
     svg.js "^2.2.5"
 
-svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5:
+svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5, svg.js@>=2.3.x:
   version "2.7.1"
   resolved "https://registry.npmjs.org/svg.js/-/svg.js-2.7.1.tgz"
   integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA==
@@ -6505,7 +6628,7 @@ universalify@^2.0.0:
   resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-unpipe@1.0.0, unpipe@~1.0.0:
+unpipe@~1.0.0, unpipe@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
@@ -6622,7 +6745,7 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.3:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.7.14:
+vue-template-compiler@^2.0.0, vue-template-compiler@^2.7.14, vue-template-compiler@>=2.5.0:
   version "2.7.14"
   resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"
   integrity sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==
@@ -6635,14 +6758,7 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue2-editor@^2.10.3:
-  version "2.10.3"
-  resolved "https://registry.npmjs.org/vue2-editor/-/vue2-editor-2.10.3.tgz"
-  integrity sha512-99rWL93xfGeFRrq8NY5L7U+Cog/Uenx+UOOJragtxtbhBE9Rv5/C3P/YhJhjMECSbQyHFjUriqv1S3mghvU9Kg==
-  dependencies:
-    quill "^1.3.6"
-
-vue@^2.7.14:
+vue@*, "vue@^2 || ^3.2.13", vue@^2.0.0, vue@^2.6.4, vue@^2.7.0, vue@^2.7.14, vue@^2.7.2, vue@>=2.5.0:
   version "2.7.14"
   resolved "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"
   integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
@@ -6650,6 +6766,13 @@ vue@^2.7.14:
     "@vue/compiler-sfc" "2.7.14"
     csstype "^3.1.0"
 
+vue2-editor@^2.10.3:
+  version "2.10.3"
+  resolved "https://registry.npmjs.org/vue2-editor/-/vue2-editor-2.10.3.tgz"
+  integrity sha512-99rWL93xfGeFRrq8NY5L7U+Cog/Uenx+UOOJragtxtbhBE9Rv5/C3P/YhJhjMECSbQyHFjUriqv1S3mghvU9Kg==
+  dependencies:
+    quill "^1.3.6"
+
 vuetify-loader@^1.9.2:
   version "1.9.2"
   resolved "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.9.2.tgz"
@@ -6661,7 +6784,7 @@ vuetify-loader@^1.9.2:
     file-loader "^6.2.0"
     loader-utils "^2.0.0"
 
-vuetify@^2.7.1:
+"vuetify@^1.3.0 || ^2.0.0", vuetify@^2.7.1:
   version "2.7.1"
   resolved "https://registry.npmjs.org/vuetify/-/vuetify-2.7.1.tgz"
   integrity sha512-DVFmRsDtYrITw9yuGLwpFWngFYzEgk0KwloDCIV3+vhZw+NBFJOSzdbttbYmOwtqvQlhDxUyIRQolrRbSFAKlg==
@@ -6722,7 +6845,7 @@ webpack-chain@^6.5.1:
     deepmerge "^1.5.2"
     javascript-stringify "^2.0.1"
 
-webpack-cli@^5.1.4:
+webpack-cli@^5.1.4, webpack-cli@5.x.x:
   version "5.1.4"
   resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz"
   integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==
@@ -6796,7 +6919,7 @@ webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
-webpack-sources@^3.2.3:
+webpack-sources@*, webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
@@ -6806,7 +6929,7 @@ webpack-virtual-modules@^0.4.2:
   resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz"
   integrity sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==
 
-webpack@^5.54.0, webpack@^5.88.2:
+"webpack@^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.54.0, webpack@^5.88.2, webpack@>=2, webpack@5.x.x:
   version "5.88.2"
   resolved "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz"
   integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==
@@ -6836,7 +6959,7 @@ webpack@^5.54.0, webpack@^5.88.2:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
-websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
+websocket-driver@^0.7.4, websocket-driver@>=0.5.1:
   version "0.7.4"
   resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
   integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
@@ -6939,7 +7062,12 @@ yallist@^4.0.0:
   resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0, yaml@^1.10.2:
+yaml@^1.10.0:
+  version "1.10.2"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
+yaml@^1.10.2:
   version "1.10.2"
   resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==

From cd6f95eb6582d7443f15fcac234616ad79823088 Mon Sep 17 00:00:00 2001
From: 639852 <sasha.bobyliev@mail.ru>
Date: Tue, 19 Sep 2023 16:57:17 +0400
Subject: [PATCH 57/88] - Fixed bug with token

---
 admin-ui/src/App.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index eae0e2804..4db34041f 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -420,13 +420,14 @@ export default {
     },
   },
   created() {
-    window.addEventListener("message", ({ data, origin }) => {
-      const url = `https://app.${location.host.split(".").slice(1).join(".")}`;
-
-      if (origin !== url) return;
-      this.$store.commit("auth/setToken", data);
-      location.assign("/admin");
-    });
+    // window.addEventListener("message", ({ data, origin }) => {
+    //   const url = `https://app.${location.host.split(".").slice(1).join(".")}`;
+
+    //   if (origin !== url) return;
+    //   if (data === 'ready') return;
+    //   this.$store.commit("auth/setToken", data);
+    //   location.assign("/admin");
+    // });
 
     this.$store.dispatch("auth/load");
 

From 15846d6d648ca54f86f10ffa16447c9d43e6f5b7 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 19 Sep 2023 18:04:24 +0400
Subject: [PATCH 58/88] add copy product

---
 .../src/components/plans_products_table.vue   | 52 ++++++++++++++++---
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/admin-ui/src/components/plans_products_table.vue b/admin-ui/src/components/plans_products_table.vue
index 0b1ccad34..b3c26a731 100644
--- a/admin-ui/src/components/plans_products_table.vue
+++ b/admin-ui/src/components/plans_products_table.vue
@@ -32,6 +32,15 @@
               <v-divider inset vertical class="mx-4" />
               <v-spacer />
 
+              <v-btn
+                :disabled="selected.length < 1"
+                class="mr-2"
+                color="background-light"
+                @click="copyProducts"
+              >
+                Copy
+              </v-btn>
+
               <v-btn class="mr-2" color="background-light" @click="addConfig">
                 Create
               </v-btn>
@@ -157,7 +166,7 @@
 </template>
 
 <script setup>
-import { computed, ref, toRefs, watch } from "vue";
+import { computed, onMounted, ref, toRefs, watch } from "vue";
 import { VueEditor } from "vue2-editor";
 import dateField from "@/components/date.vue";
 import JsonEditor from "@/components/JsonEditor.vue";
@@ -187,13 +196,17 @@ const tabs = ["Products", "Resources"];
 const headers = [
   { text: "Key", value: "key" },
   { text: "Title", value: "title" },
-  { text: "Price", value: "price",width:150 },
-  { text: "Period", value: "period" ,width:220},
+  { text: "Price", value: "price", width: 150 },
+  { text: "Period", value: "period", width: 220 },
   { text: "Kind", value: "kind", width: 228 },
   { text: "Public", value: "public" },
   { text: "Sorter", value: "sorter" },
 ];
 
+onMounted(() => {
+  setFullDates(products.value);
+});
+
 function changeDate({ value }, id) {
   fullDate.value[id] = value;
   emits("change:product", { key: "date", value, id });
@@ -207,6 +220,31 @@ function changeResource(data) {
   emits("change:resource", data);
 }
 
+const copyProducts = () => {
+  const copiedProducts = [
+    ...selected.value.map((p) => ({
+      ...p,
+      id: Math.random().toString(16).slice(2),
+    })),
+  ];
+
+  const newProducts = {};
+  for (const product of productsArray.value) {
+    const key = product.key;
+    delete product.key;
+    newProducts[key] = product;
+  }
+  for (const product of copiedProducts) {
+    const key = product.key;
+    delete product.key;
+    newProducts[key + " 1"] = product;
+  }
+
+  changeProduct("products", newProducts);
+  setFullDates(newProducts);
+  selected.value = [];
+};
+
 function addConfig() {
   const value = [...productsArray.value];
   const result = {};
@@ -250,9 +288,11 @@ function removeConfig() {
   changeProduct("products", result);
 }
 
-Object.values(products.value).forEach(({ period, id }) => {
-  fullDate.value[id] = getFullDate(period);
-});
+const setFullDates = (products) => {
+  Object.values(products).forEach(({ period, id }) => {
+    fullDate.value[id] = getFullDate(period);
+  });
+};
 
 const productsArray = computed(() =>
   Object.entries(products.value).map(([key, value]) => ({ key, ...value }))

From 664f00aaf196a76bc4bacf95dca402e183e4901a Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 19 Sep 2023 19:09:39 +0400
Subject: [PATCH 59/88] fix ovh pm

---
 admin-ui/src/components/dialogs/editPriceModel.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
index 089b2d668..d4031717f 100644
--- a/admin-ui/src/components/dialogs/editPriceModel.vue
+++ b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -219,7 +219,6 @@ const accountPrice = computed(() =>
 const defaultCurrency = computed(() => store.getters["currencies/default"]);
 
 const changePM = () => {
-  const planCode = product.value.slice(4).toLowerCase().replace(" ", "-");
   const tempService = JSON.parse(JSON.stringify(service.value));
 
   const igIndex = tempService.instancesGroups.findIndex((ig) =>
@@ -231,9 +230,14 @@ const changePM = () => {
 
   tempService.instancesGroups[igIndex].instances[instanceIndex].billingPlan =
     plan.value;
-  tempService.instancesGroups[igIndex].instances[
-    instanceIndex
-  ].config.planCode = planCode;
+  if (template.value.type.includes("ovh")) {
+    tempService.instancesGroups[igIndex].instances[
+      instanceIndex
+    ].config.duration = product.value.split(" ")[0];
+    tempService.instancesGroups[igIndex].instances[
+      instanceIndex
+    ].config.planCode = product.value.split(" ")[1];
+  }
   tempService.instancesGroups[igIndex].instances[instanceIndex].product =
     product.value;
 

From 061ca60aa9b477f65c826bb504d2897d82e8604a Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 19 Sep 2023 19:12:38 +0400
Subject: [PATCH 60/88] fix cancel

---
 .../src/components/dialogs/editPriceModel.vue   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
index d4031717f..d41f3f3ac 100644
--- a/admin-ui/src/components/dialogs/editPriceModel.vue
+++ b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -55,7 +55,7 @@
       </v-row>
 
       <v-row justify="end">
-        <v-btn class="mx-3" @click="emit('input', false)">Close</v-btn>
+        <v-btn class="mx-3" @click="cancel">Cancel</v-btn>
         <v-btn
           class="mx-3"
           :loading="isChangePMLoading"
@@ -98,9 +98,7 @@ const product = ref({});
 const selectedPeriod = ref("");
 
 onMounted(() => {
-  setPlan();
-  setProduct();
-  selectedPeriod.value = billingPeriods.value[originalProduct.value];
+  setDefaultPlan();
 });
 
 const tariffs = computed(() => {
@@ -261,6 +259,17 @@ const changePM = () => {
     });
 };
 
+const cancel = () => {
+  setDefaultPlan();
+  emit("input", false);
+};
+
+const setDefaultPlan = () => {
+  setPlan();
+  setProduct();
+  selectedPeriod.value = billingPeriods.value[originalProduct.value];
+};
+
 const setPlan = () => {
   plan.value =
     plans.value.find(({ uuid }) => uuid === template.value.billingPlan.uuid) ||

From aa74abf388b341ca684553319ee870ed50887618 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 19 Sep 2023 19:33:46 +0400
Subject: [PATCH 61/88] fix ovh pm (pricingMode)

---
 admin-ui/src/components/dialogs/editPriceModel.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
index d41f3f3ac..a35e323ee 100644
--- a/admin-ui/src/components/dialogs/editPriceModel.vue
+++ b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -229,12 +229,16 @@ const changePM = () => {
   tempService.instancesGroups[igIndex].instances[instanceIndex].billingPlan =
     plan.value;
   if (template.value.type.includes("ovh")) {
+    const duration = product.value.split(" ")[0];
     tempService.instancesGroups[igIndex].instances[
       instanceIndex
-    ].config.duration = product.value.split(" ")[0];
+    ].config.duration = duration;
     tempService.instancesGroups[igIndex].instances[
       instanceIndex
     ].config.planCode = product.value.split(" ")[1];
+    tempService.instancesGroups[igIndex].instances[
+      instanceIndex
+    ].config.pricingMode = duration === "P1M" ? "default" : "upfront12";
   }
   tempService.instancesGroups[igIndex].instances[instanceIndex].product =
     product.value;

From e1cbc38de5754b175b2782523a3d1ababa4e262a Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 19 Sep 2023 19:48:53 +0400
Subject: [PATCH 62/88] fix reports filtres

---
 admin-ui/src/components/reports_table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/components/reports_table.vue b/admin-ui/src/components/reports_table.vue
index f2eaad726..cb63e53d9 100644
--- a/admin-ui/src/components/reports_table.vue
+++ b/admin-ui/src/components/reports_table.vue
@@ -136,6 +136,7 @@ const isLoading = computed(() => {
 });
 
 const requestOptions = computed(() => ({
+  ...filters.value,
   page: page.value,
   limit: options.value.itemsPerPage,
   field: options.value.sortBy[0],
@@ -146,7 +147,6 @@ const requestOptions = computed(() => ({
   to: durationFilter.value.to
     ? new Date(durationFilter.value.to).getTime() / 1000
     : undefined,
-  filters: filters.value,
 }));
 
 const onUpdateOptions = async (newOptions) => {

From 90d423b94b44730ba8f838d291c4f169ba51683c Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 19 Sep 2023 19:49:10 +0400
Subject: [PATCH 63/88] fix two reports fetch

---
 admin-ui/src/views/Transactions.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin-ui/src/views/Transactions.vue b/admin-ui/src/views/Transactions.vue
index 794611be2..3842f331c 100644
--- a/admin-ui/src/views/Transactions.vue
+++ b/admin-ui/src/views/Transactions.vue
@@ -48,6 +48,7 @@
     />
 
     <reports-table
+      v-if="!isInitLoading"
       table-name="transaction-table"
       :filters="filters"
       :select-record="selectTransaction"
@@ -72,6 +73,7 @@ export default {
     serviceId: null,
     series: [],
     chartLoading: false,
+    isInitLoading: true,
     chartOptions: {
       chart: { height: 250, type: "line" },
       dataLabels: { enabled: false },
@@ -150,6 +152,7 @@ export default {
     } else {
       this.accountId = this.user.uuid || null;
     }
+    this.isInitLoading = false;
   },
   mounted() {
     this.$store.dispatch("accounts/fetch");
@@ -266,4 +269,4 @@ export default {
 .apexcharts-svg {
   background: none !important;
 }
-</style>
\ No newline at end of file
+</style>

From b10a85187243ea79b4c4230ed9654343ba8e73fd Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 20 Sep 2023 00:16:34 +0300
Subject: [PATCH 64/88] Fix bitrix oauth

---
 pkg/oauth2/handlers/bitrix.go | 31 ++++++++++++++++++++++++-------
 pkg/oauth2/handlers/github.go |  6 +++++-
 pkg/oauth2/handlers/google.go | 10 +++++++++-
 pkg/oauth2/main.go            | 29 ++++++++++++++++++++++++++---
 4 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 79a707767..8f0a8c490 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -15,16 +15,23 @@ import (
 	"google.golang.org/grpc/metadata"
 	"io"
 	"net/http"
+	"sync"
 	"time"
 )
 
-type BitrixOauthHandler struct{}
+type BitrixOauthHandler struct {
+	states map[string]string
+	m      *sync.Mutex
+}
 
 type UserInfo struct {
 	Result []map[string]interface{} `json:"result"`
 }
 
 func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+	g.states = map[string]string{}
+	g.m = &sync.Mutex{}
+
 	oauth2Config := &oauth2.Config{
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
@@ -40,17 +47,30 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 	field := cfg.AuthField
 
 	router.Handle("/oauth/bitrix/login", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		state, redirect := r.FormValue("state"), r.FormValue("redirect")
+
+		g.m.Lock()
+		g.states[state] = redirect
+		g.m.Unlock()
+
 		url := oauth2Config.AuthCodeURL(stateString)
 		http.Redirect(w, r, url, http.StatusTemporaryRedirect)
 	}))
 	router.Handle("/oauth/bitrix/checkout", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		state, code := r.FormValue("state"), r.FormValue("code")
+		var redirect string
 
-		if state != stateString {
+		g.m.Lock()
+
+		if _, ok := g.states[state]; !ok {
 			log.Debug("State string not equal to state", zap.String("state", state), zap.String("stateString", stateString))
 			return
 		}
 
+		redirect = g.states[state]
+		delete(g.states, state)
+		g.m.Unlock()
+
 		token, err := oauth2Config.Exchange(context.Background(), code)
 		if err != nil {
 			log.Error("Failed to get token from exchange", zap.Error(err))
@@ -143,10 +163,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			}
 		}
 
-		res := map[string]string{
-			"token": resp.GetToken(),
-		}
-		marshal, _ := json.Marshal(res)
-		w.Write(marshal)
+		http.Redirect(w, r, fmt.Sprintf("%s?token=?%s", redirect, resp.GetToken()), http.StatusSeeOther)
+
 	}))
 }
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index d9675b5e3..4ea43684c 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -16,10 +16,14 @@ import (
 	"golang.org/x/oauth2/github"
 	"google.golang.org/grpc/metadata"
 	"net/http"
+	"sync"
 	"time"
 )
 
-type GithubOauthHandler struct{}
+type GithubOauthHandler struct {
+	states map[string]string
+	m      *sync.Mutex
+}
 
 func (g *GithubOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
 	oauth2Config := &oauth2.Config{
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index 6ed9091e9..7574430d0 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -16,12 +16,20 @@ import (
 	"golang.org/x/oauth2/google"
 	"google.golang.org/grpc/metadata"
 	"net/http"
+	"sync"
 	"time"
 )
 
-type GoogleOauthHandler struct{}
+type GoogleOauthHandler struct {
+	states map[string]string
+	m      *sync.Mutex
+}
 
 func (g *GoogleOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+
+	g.states = map[string]string{}
+	g.m = &sync.Mutex{}
+
 	oauth2Config := &oauth2.Config{
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
diff --git a/pkg/oauth2/main.go b/pkg/oauth2/main.go
index b3ffc93f3..55f2af6d5 100644
--- a/pkg/oauth2/main.go
+++ b/pkg/oauth2/main.go
@@ -1,11 +1,12 @@
 package oauth2
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/gorilla/mux"
 	"github.com/rs/cors"
 	"github.com/slntopp/nocloud-proto/registry"
-	config2 "github.com/slntopp/nocloud/pkg/oauth2/config"
+	config "github.com/slntopp/nocloud/pkg/oauth2/config"
 	"github.com/slntopp/nocloud/pkg/oauth2/handlers"
 	"go.uber.org/zap"
 	"net/http"
@@ -30,12 +31,12 @@ func (s *OAuth2Server) SetupRegistryClient(registryClient registry.AccountsServi
 }
 
 func (s *OAuth2Server) registerOAuthHandlers() {
-	config, err := config2.Config()
+	cfg, err := config.Config()
 	if err != nil {
 		s.log.Fatal("Failed to read config", zap.Error(err))
 	}
 
-	for key, conf := range config {
+	for key, conf := range cfg {
 		handler := handlers.GetOAuthHandler(key)
 		if handler == nil {
 			continue
@@ -49,6 +50,28 @@ func (s *OAuth2Server) registerOAuthHandlers() {
 func (s *OAuth2Server) Start(port string, corsAllowed []string) {
 	s.registerOAuthHandlers()
 
+	s.router.HandleFunc("/oauth", func(writer http.ResponseWriter, request *http.Request) {
+		cfg, err := config.Config()
+		if err != nil {
+			s.log.Error("Failed to read config", zap.Error(err))
+			return
+		}
+
+		var resp []string
+
+		for key := range cfg {
+			resp = append(resp, key)
+		}
+
+		marshal, err := json.Marshal(resp)
+		if err != nil {
+			s.log.Error("Failed to marshal config", zap.Error(err))
+			return
+		}
+
+		writer.Write(marshal)
+	})
+
 	handler := cors.New(cors.Options{
 		AllowedOrigins:   corsAllowed,
 		AllowedHeaders:   []string{"Content-Type", "Authorization"},

From 3adea9599ed87e25cc58ad7165be67818bbf8fcb Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 20 Sep 2023 00:30:18 +0300
Subject: [PATCH 65/88] Fix authorizations

---
 pkg/oauth2/config/config.go   |   2 +-
 pkg/oauth2/handlers/bitrix.go |  11 ++--
 pkg/oauth2/handlers/github.go | 107 ++++++++++++++++++++++++----------
 pkg/oauth2/handlers/google.go | 105 +++++++++++++++++++++++----------
 4 files changed, 158 insertions(+), 67 deletions(-)

diff --git a/pkg/oauth2/config/config.go b/pkg/oauth2/config/config.go
index 6b6055534..8d34e033e 100644
--- a/pkg/oauth2/config/config.go
+++ b/pkg/oauth2/config/config.go
@@ -27,9 +27,9 @@ type OAuth2Config struct {
 	RedirectURL  string `json:"redirect_url"`
 	AuthURL      string `json:"auth_url"`
 	TokenURL     string `json:"token_url"`
-	StateString  string `json:"state_string"`
 	UserInfoURL  string `json:"user_info_url"`
 	AuthField    string `json:"auth_field"`
+	Scope        string `json:"scope"`
 }
 
 func Config() (map[string]OAuth2Config, error) {
diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 8f0a8c490..073219dcf 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -42,7 +42,6 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 		},
 	}
 
-	stateString := cfg.StateString
 	userInfoUrl := cfg.UserInfoURL
 	field := cfg.AuthField
 
@@ -53,7 +52,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 		g.states[state] = redirect
 		g.m.Unlock()
 
-		url := oauth2Config.AuthCodeURL(stateString)
+		url := oauth2Config.AuthCodeURL(state)
 		http.Redirect(w, r, url, http.StatusTemporaryRedirect)
 	}))
 	router.Handle("/oauth/bitrix/checkout", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -63,7 +62,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 		g.m.Lock()
 
 		if _, ok := g.states[state]; !ok {
-			log.Debug("State string not equal to state", zap.String("state", state), zap.String("stateString", stateString))
+			log.Debug("State string not equal to state", zap.String("state", state), zap.String("stateString", state))
 			return
 		}
 
@@ -77,7 +76,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			return
 		}
 
-		response, err := http.Get(fmt.Sprintf("%s/rest/user.current.json?auth=%s", userInfoUrl, token.AccessToken))
+		response, err := http.Get(fmt.Sprintf("%s%s", userInfoUrl, token.AccessToken))
 
 		if err != nil {
 			log.Error("Failed to make request", zap.Error(err))
@@ -123,7 +122,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 
 		resp, err := regClient.Token(ctx, &accounts.TokenRequest{
 			Auth: &accounts.Credentials{
-				Type: "oauth2-github",
+				Type: "oauth2-bitrix",
 				Data: []string{
 					field,
 					value,
@@ -149,7 +148,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			}
 			resp, err = regClient.Token(ctx, &accounts.TokenRequest{
 				Auth: &accounts.Credentials{
-					Type: "oauth2-github",
+					Type: "oauth2-bitrix",
 					Data: []string{
 						field,
 						value,
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index 4ea43684c..e3c58666d 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -3,8 +3,7 @@ package handlers
 import (
 	"context"
 	"encoding/json"
-	"github.com/dghubble/gologin/v2"
-	github_gologin "github.com/dghubble/gologin/v2/github"
+	"fmt"
 	"github.com/gorilla/mux"
 	"github.com/slntopp/nocloud-proto/registry"
 	"github.com/slntopp/nocloud-proto/registry/accounts"
@@ -15,6 +14,7 @@ import (
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"
 	"google.golang.org/grpc/metadata"
+	"io"
 	"net/http"
 	"sync"
 	"time"
@@ -26,80 +26,127 @@ type GithubOauthHandler struct {
 }
 
 func (g *GithubOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+	g.states = map[string]string{}
+	g.m = &sync.Mutex{}
+
 	oauth2Config := &oauth2.Config{
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
 		RedirectURL:  cfg.RedirectURL,
 		Endpoint:     github.Endpoint,
 	}
-	stateConfig := gologin.DefaultCookieConfig
 
-	router.Handle("/oauth/github/login", github_gologin.StateHandler(stateConfig, github_gologin.LoginHandler(oauth2Config, nil)))
-	router.Handle("/oauth/github/checkout", github_gologin.StateHandler(stateConfig, github_gologin.CallbackHandler(oauth2Config, g.successHandler(log, regClient), nil)))
-}
+	userInfoUrl := cfg.UserInfoURL
+	field := cfg.AuthField
+
+	router.Handle("/oauth/github/login", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		state, redirect := r.FormValue("state"), r.FormValue("redirect")
+
+		g.m.Lock()
+		g.states[state] = redirect
+		g.m.Unlock()
+
+		url := oauth2Config.AuthCodeURL(state)
+		http.Redirect(w, r, url, http.StatusTemporaryRedirect)
+	}))
+
+	router.Handle("/oauth/github/checkout", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		state, code := r.FormValue("state"), r.FormValue("code")
+		var redirect string
+
+		g.m.Lock()
+
+		if _, ok := g.states[state]; !ok {
+			log.Debug("State string not equal to state", zap.String("state", state), zap.String("stateString", state))
+			return
+		}
+
+		redirect = g.states[state]
+		delete(g.states, state)
+		g.m.Unlock()
+
+		token, err := oauth2Config.Exchange(context.Background(), code)
+		if err != nil {
+			log.Error("Failed to get token from exchange", zap.Error(err))
+			return
+		}
+
+		response, err := http.Get(fmt.Sprintf("%s%s", userInfoUrl, token.AccessToken))
+
+		if err != nil {
+			log.Error("Failed to make request", zap.Error(err))
+			return
+		}
+
+		defer response.Body.Close()
+		body, err := io.ReadAll(response.Body)
 
-func (g *GithubOauthHandler) successHandler(log *zap.Logger, regClient registry.AccountsServiceClient) http.Handler {
-	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-		user, err := github_gologin.UserFromContext(request.Context())
 		if err != nil {
-			log.Error("Failed to get user from ctx", zap.Error(err))
+			log.Error("Failed to read body", zap.Error(err))
 			return
 		}
 
-		token, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
+		var userInfo = map[string]interface{}{}
+		err = json.Unmarshal(body, &userInfo)
 		if err != nil {
-			log.Error("Failed to create token", zap.Error(err))
+			log.Error("Failed unmarshal body", zap.Error(err))
 			return
 		}
 
-		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+token)
+		value := userInfo[field].(string)
 
-		response, err := regClient.Token(ctx, &accounts.TokenRequest{
+		name := userInfo["name"].(string)
+
+		rootToken, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
+		if err != nil {
+			log.Error("Failed create token", zap.Error(err))
+			return
+		}
+
+		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+rootToken)
+
+		resp, err := regClient.Token(ctx, &accounts.TokenRequest{
 			Auth: &accounts.Credentials{
 				Type: "oauth2-github",
 				Data: []string{
-					"login",
-					*user.Login,
+					field,
+					value,
 				},
 			},
 			Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 		})
 		if err != nil {
 			_, err = regClient.Create(ctx, &accounts.CreateRequest{
-				Title:     *user.Name,
+				Title:     name,
 				Namespace: schema.ROOT_NAMESPACE_KEY,
 				Auth: &accounts.Credentials{
 					Type: "oauth2-github",
 					Data: []string{
-						"login",
-						*user.Login,
+						field,
+						value,
 					},
 				},
 			})
 			if err != nil {
-				log.Error("Failed to create account", zap.Error(err))
+				log.Error("Failed create account", zap.Error(err))
 				return
 			}
-			response, err = regClient.Token(ctx, &accounts.TokenRequest{
+			resp, err = regClient.Token(ctx, &accounts.TokenRequest{
 				Auth: &accounts.Credentials{
 					Type: "oauth2-github",
 					Data: []string{
-						"login",
-						*user.Login,
+						field,
+						value,
 					},
 				},
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
 			if err != nil {
-				log.Error("Failed to get token", zap.Error(err))
+				log.Error("Failed get token", zap.Error(err))
 				return
 			}
 		}
 
-		res := map[string]string{
-			"token": response.GetToken(),
-		}
-		marshal, _ := json.Marshal(res)
-		writer.Write(marshal)
-	})
+		http.Redirect(w, r, fmt.Sprintf("%s?token=?%s", redirect, resp.GetToken()), http.StatusSeeOther)
+	}))
 }
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index 7574430d0..9bfe9e820 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -3,8 +3,7 @@ package handlers
 import (
 	"context"
 	"encoding/json"
-	"github.com/dghubble/gologin/v2"
-	google_gologin "github.com/dghubble/gologin/v2/google"
+	"fmt"
 	"github.com/gorilla/mux"
 	"github.com/slntopp/nocloud-proto/registry"
 	"github.com/slntopp/nocloud-proto/registry/accounts"
@@ -15,6 +14,7 @@ import (
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/grpc/metadata"
+	"io"
 	"net/http"
 	"sync"
 	"time"
@@ -34,76 +34,121 @@ func (g *GoogleOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 		ClientID:     cfg.ClientID,
 		ClientSecret: cfg.ClientSecret,
 		RedirectURL:  cfg.RedirectURL,
+		Scopes:       []string{cfg.Scope},
 		Endpoint:     google.Endpoint,
 	}
-	stateConfig := gologin.DefaultCookieConfig
 
-	router.Handle("/oauth/google/login", google_gologin.StateHandler(stateConfig, google_gologin.LoginHandler(oauth2Config, nil)))
-	router.Handle("/oauth/google/checkout", google_gologin.StateHandler(stateConfig, google_gologin.CallbackHandler(oauth2Config, g.successHandler(log, regClient), nil)))
-}
+	userInfoUrl := cfg.UserInfoURL
+	field := cfg.AuthField
+
+	router.Handle("/oauth/google/login", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		state, redirect := r.FormValue("state"), r.FormValue("redirect")
+
+		g.m.Lock()
+		g.states[state] = redirect
+		g.m.Unlock()
+
+		url := oauth2Config.AuthCodeURL(state)
+		http.Redirect(w, r, url, http.StatusTemporaryRedirect)
+	}))
+
+	router.Handle("/oauth/google/checkout", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		state, code := r.FormValue("state"), r.FormValue("code")
+		var redirect string
+
+		g.m.Lock()
+
+		if _, ok := g.states[state]; !ok {
+			log.Debug("State string not equal to state", zap.String("state", state), zap.String("stateString", state))
+			return
+		}
 
-func (g *GoogleOauthHandler) successHandler(log *zap.Logger, regClient registry.AccountsServiceClient) http.Handler {
-	return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-		user, err := google_gologin.UserFromContext(request.Context())
+		redirect = g.states[state]
+		delete(g.states, state)
+		g.m.Unlock()
+
+		token, err := oauth2Config.Exchange(context.Background(), code)
 		if err != nil {
-			log.Error("Failed to get user from ctx", zap.Error(err))
+			log.Error("Failed to get token from exchange", zap.Error(err))
 			return
 		}
 
-		token, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
+		response, err := http.Get(fmt.Sprintf("%s%s", userInfoUrl, token.AccessToken))
+
 		if err != nil {
-			log.Error("Failed to create token", zap.Error(err))
+			log.Error("Failed to make request", zap.Error(err))
 			return
 		}
 
-		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+token)
+		defer response.Body.Close()
+		body, err := io.ReadAll(response.Body)
 
-		response, err := regClient.Token(ctx, &accounts.TokenRequest{
+		if err != nil {
+			log.Error("Failed to read body", zap.Error(err))
+			return
+		}
+
+		var userInfo = map[string]interface{}{}
+		err = json.Unmarshal(body, &userInfo)
+		if err != nil {
+			log.Error("Failed unmarshal body", zap.Error(err))
+			return
+		}
+
+		value := userInfo[field].(string)
+
+		name := userInfo["name"].(string)
+
+		rootToken, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
+		if err != nil {
+			log.Error("Failed create token", zap.Error(err))
+			return
+		}
+
+		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+rootToken)
+
+		resp, err := regClient.Token(ctx, &accounts.TokenRequest{
 			Auth: &accounts.Credentials{
 				Type: "oauth2-google",
 				Data: []string{
-					"email",
-					user.Email,
+					field,
+					value,
 				},
 			},
 			Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 		})
 		if err != nil {
 			_, err = regClient.Create(ctx, &accounts.CreateRequest{
-				Title:     user.Name,
+				Title:     name,
 				Namespace: schema.ROOT_NAMESPACE_KEY,
 				Auth: &accounts.Credentials{
 					Type: "oauth2-google",
 					Data: []string{
-						"email",
-						user.Email,
+						field,
+						value,
 					},
 				},
 			})
 			if err != nil {
-				log.Error("Failed to create account", zap.Error(err))
+				log.Error("Failed create account", zap.Error(err))
 				return
 			}
-			response, err = regClient.Token(ctx, &accounts.TokenRequest{
+			resp, err = regClient.Token(ctx, &accounts.TokenRequest{
 				Auth: &accounts.Credentials{
 					Type: "oauth2-google",
 					Data: []string{
-						"email",
-						user.Email,
+						field,
+						value,
 					},
 				},
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
 			if err != nil {
-				log.Error("Failed to get token", zap.Error(err))
+				log.Error("Failed get token", zap.Error(err))
 				return
 			}
 		}
 
-		res := map[string]string{
-			"token": response.GetToken(),
-		}
-		marshal, _ := json.Marshal(res)
-		writer.Write(marshal)
-	})
+		http.Redirect(w, r, fmt.Sprintf("%s?token=?%s", redirect, resp.GetToken()), http.StatusSeeOther)
+	}))
 }

From 0c77753767bb54d67fa5064517f704443007941d Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 20 Sep 2023 00:33:58 +0300
Subject: [PATCH 66/88] Fix oauth2 type

---
 pkg/credentials/credentials.go | 2 +-
 pkg/credentials/oauth2.go      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/credentials/credentials.go b/pkg/credentials/credentials.go
index 4263a08b6..4b55eebb4 100644
--- a/pkg/credentials/credentials.go
+++ b/pkg/credentials/credentials.go
@@ -86,7 +86,7 @@ func Find(ctx context.Context, db driver.Database, log *zap.Logger, auth_type st
 	case auth_type == "whmcs":
 		cred = &WHMCSCredentials{Email: args[0]}
 	case strings.HasPrefix(auth_type, "oauth2"):
-		cred = &OAuth2Credentials{AuthField: args[0], AuthValue: args[1]}
+		cred = &OAuth2Credentials{AuthField: args[0], AuthValue: args[1], AuthType: auth_type}
 	default:
 		return nil, errors.New("unknown auth type")
 	}
diff --git a/pkg/credentials/oauth2.go b/pkg/credentials/oauth2.go
index b8b4af9e9..b93cdb060 100644
--- a/pkg/credentials/oauth2.go
+++ b/pkg/credentials/oauth2.go
@@ -12,6 +12,8 @@ type OAuth2Credentials struct {
 	AuthField string `json:"auth_field"`
 	AuthValue string `json:"auth_value"`
 
+	AuthType string `json:"auth_type"`
+
 	log *zap.Logger
 	driver.DocumentMeta
 }
@@ -24,8 +26,8 @@ func NewOAuth2Credentials(data []string) (Credentials, error) {
 	return &OAuth2Credentials{AuthField: field, AuthValue: value}, nil
 }
 
-func (*OAuth2Credentials) Type() string {
-	return "oauth2-github"
+func (cred *OAuth2Credentials) Type() string {
+	return cred.AuthType
 }
 
 // Authorize method for StandardCredentials assumes that args consist of username and password stored at 0 and 1 accordingly

From 5d33228b75d4032496f6269bf4c4f6c64e4570b3 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 10:42:14 +0400
Subject: [PATCH 67/88] change to all by default

---
 admin-ui/src/views/Transactions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/views/Transactions.vue b/admin-ui/src/views/Transactions.vue
index 3842f331c..184114d23 100644
--- a/admin-ui/src/views/Transactions.vue
+++ b/admin-ui/src/views/Transactions.vue
@@ -150,7 +150,7 @@ export default {
     if (this.$route.query.account) {
       this.accountId = this.$route.query.account;
     } else {
-      this.accountId = this.user.uuid || null;
+      this.accountId = null;
     }
     this.isInitLoading = false;
   },

From a5d3fcca4371353568ff66f91b2588d9bf032124 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 10:49:52 +0400
Subject: [PATCH 68/88] fix records select

---
 admin-ui/src/components/reports_table.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin-ui/src/components/reports_table.vue b/admin-ui/src/components/reports_table.vue
index cb63e53d9..1c6b1505b 100644
--- a/admin-ui/src/components/reports_table.vue
+++ b/admin-ui/src/components/reports_table.vue
@@ -17,7 +17,6 @@
       :footer-error="fetchError"
       :server-items-length="count"
       :server-side-page="page"
-      :show-select="false"
       sort-by="exec"
       sort-desc
       @update:options="onUpdateOptions"

From cf5b97b7fc20b7ac6442ee9a53abde533be4c08f Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 11:36:50 +0400
Subject: [PATCH 69/88] add currencies fetch by default

---
 admin-ui/src/App.vue              |  1 +
 admin-ui/src/hooks/useCurrency.js | 51 +++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 admin-ui/src/hooks/useCurrency.js

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index e1b86753e..b8c78aecd 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -480,6 +480,7 @@ export default {
     isLoggedIn(newVal) {
       if (newVal) {
         this.$store.dispatch("plugins/fetch");
+        this.$store.dispatch("currencies/fetch");
       }
     },
   },
diff --git a/admin-ui/src/hooks/useCurrency.js b/admin-ui/src/hooks/useCurrency.js
new file mode 100644
index 000000000..f34f4d4be
--- /dev/null
+++ b/admin-ui/src/hooks/useCurrency.js
@@ -0,0 +1,51 @@
+import { computed } from "vue";
+import { useStore } from "@/store";
+
+const useCurrency = () => {
+  const store = useStore();
+
+  const defaultCurrency = computed(() => {
+    return store.getters["currencies/default"];
+  });
+
+  const rates = computed(() => {
+    return store.getters["currencies/rates"];
+  });
+
+  const convertFrom = (price, currency) => {
+    let rate;
+
+    if (currency === defaultCurrency.value) {
+      rate = 1;
+    } else {
+      rate = rates.value.find(
+        (r) => r.to === defaultCurrency.value && r.from === currency
+      )?.rate;
+    }
+
+    return rate ? (price * rate).toFixed(2) : 0;
+  };
+
+  const convertTo = (price, currency) => {
+    let rate;
+
+    if (currency === defaultCurrency.value) {
+      rate = 1;
+    } else {
+      rate = rates.value.find(
+        (r) => r.to === currency && r.from === defaultCurrency.value
+      )?.rate;
+    }
+
+    return rate ? (price * rate).toFixed(2) : 0;
+  };
+
+  return {
+    convertFrom,
+    rates,
+    defaultCurrency,
+    convertTo,
+  };
+};
+
+export default useCurrency;

From bfa5292008fea6cd87cdc124f0dbf94cbab40230 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 11:36:59 +0400
Subject: [PATCH 70/88] fix reports

---
 admin-ui/src/components/reports_table.vue | 33 +++--------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/admin-ui/src/components/reports_table.vue b/admin-ui/src/components/reports_table.vue
index 1c6b1505b..6c2916442 100644
--- a/admin-ui/src/components/reports_table.vue
+++ b/admin-ui/src/components/reports_table.vue
@@ -69,8 +69,8 @@ import { toRefs, ref, computed, watch } from "vue";
 import api from "@/api";
 import NocloudTable from "@/components/table.vue";
 import { useStore } from "@/store";
-import useRate from "@/hooks/useRate";
 import DatePicker from "@/components/ui/datePicker.vue";
+import useCurrency from "@/hooks/useCurrency";
 
 const props = defineProps({
   filters: { type: Object },
@@ -83,7 +83,7 @@ const props = defineProps({
 const { filters, hideInstance, hideService, hideAccount } = toRefs(props);
 
 const store = useStore();
-const { convertTo, fetchRate } = useRate();
+const { rates, convertFrom, defaultCurrency } = useCurrency();
 
 const reports = ref([]);
 const count = ref(10);
@@ -94,7 +94,6 @@ const fetchError = ref("");
 const options = ref({});
 const itemsPerPageOptions = ref([5, 10, 15, 25]);
 const durationFilter = ref({ to: "", from: "" });
-const rates = ref({});
 
 const reportsHeaders = computed(() => {
   const headers = [
@@ -118,14 +117,6 @@ const reportsHeaders = computed(() => {
   return headers;
 });
 
-const defaultCurrency = computed(() => store.getters["currencies/default"]);
-const allCurrencies = computed(() => {
-  const currencies = new Map(
-    reports.value.map((r) => [r.currency, r.currency])
-  );
-  return [...currencies.values()];
-});
-
 const instances = computed(() => store.getters["services/getInstances"]);
 const services = computed(() => store.getters["services/all"]);
 const accounts = computed(() => store.getters["accounts/all"]);
@@ -171,9 +162,7 @@ const onUpdateOptions = async (newOptions) => {
         service: r.service,
         instance: r.instance,
         account: r.account,
-        totalDefault: rates.value[r.currency]
-          ? convertTo(r.total, rates.value[r.currency])
-          : null,
+        totalDefault: convertFrom(r.total, r.currency),
       };
     });
   } finally {
@@ -209,24 +198,10 @@ const getService = (value) => services.value.find((s) => s.uuid === value);
 watch(rates, () => {
   reports.value = reports.value.map((r) => ({
     ...r,
-    totalDefault: rates.value[r.currency]
-      ? convertTo(r.total, rates.value[r.currency])
-      : null,
+    totalDefault: convertFrom(r.total, r.currency),
   }));
 });
 
-watch(allCurrencies, () => {
-  allCurrencies.value.map(async (c) => {
-    if (rates.value[c]) {
-      return;
-    }
-
-    rates.value[c] = "blocked";
-    const rate = await fetchRate(c);
-    rates.value = { ...rates.value, [c]: rate };
-  });
-});
-
 watch(
   durationFilter,
   () => {

From 1413e2f2e4121ac6d6848f47bc148b7ab5590cad Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 11:48:37 +0400
Subject: [PATCH 71/88] add invoice amount types

---
 admin-ui/src/views/TransactionsCreate.vue | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 43b27fddc..9b6960d3e 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -234,12 +234,6 @@ export default {
       { value: "transaction", title: "Transaction" },
     ],
     type: "transaction",
-
-    amountTypes: [
-      { title: "Top-up", value: false },
-      { title: "Debit", value: true },
-      { title: "Account balance", value: null },
-    ],
     amountType: true,
   }),
   methods: {
@@ -405,6 +399,20 @@ export default {
           "This field is required!",
       ];
     },
+    amountTypes() {
+      if (this.isTransaction) {
+        return [
+          { title: "Top-up", value: false },
+          { title: "Debit", value: true },
+          { title: "Account balance", value: null },
+        ];
+      }
+
+      return [
+        { title: "Top-up invoice (with balance change)", value: true },
+        { title: "Payment invoice (no balance change)", value: false },
+      ];
+    },
   },
   watch: {
     "transaction.service"() {
@@ -413,6 +421,7 @@ export default {
     type() {
       this.transaction.meta.type = this.type;
       if (this.isInvoice) {
+        this.amountType = false;
         this.resetDate();
       } else if (this.isTransaction) {
         this.initDate();

From 601916432779e1b05d64bbbff9df852c20e495f1 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 12:30:54 +0400
Subject: [PATCH 72/88] fix show select always true

---
 admin-ui/src/components/table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/components/table.vue b/admin-ui/src/components/table.vue
index f76cb7c4c..df05867bd 100644
--- a/admin-ui/src/components/table.vue
+++ b/admin-ui/src/components/table.vue
@@ -8,7 +8,7 @@
     loading-text="Loading... Please wait"
     color="background-light"
     :items="items"
-    :show-select="!!tableName || showSelect"
+    :show-select="showSelect"
     :value="selected"
     @input="handleSelect"
     :hide-default-footer="hideDefaultFooter"

From 433dfdbcbf864d99b226a07aaf8dc20647e31da9 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 12:48:10 +0400
Subject: [PATCH 73/88] fix vps no addons

---
 admin-ui/src/components/plan/vpsTable.vue | 192 ++++++++++++----------
 1 file changed, 101 insertions(+), 91 deletions(-)

diff --git a/admin-ui/src/components/plan/vpsTable.vue b/admin-ui/src/components/plan/vpsTable.vue
index 0a0e9ac53..1b2cf4e3a 100644
--- a/admin-ui/src/components/plan/vpsTable.vue
+++ b/admin-ui/src/components/plan/vpsTable.vue
@@ -7,16 +7,16 @@
 
       <v-list dense v-if="tabsIndex < 2">
         <v-list-item
-            dense
-            v-for="item of filters[tabsIndex][column]"
-            :key="item"
+          dense
+          v-for="item of filters[tabsIndex][column]"
+          :key="item"
         >
           <v-checkbox
-              dense
-              v-model="selected[tabsIndex][column]"
-              :value="item"
-              :label="item"
-              @change="
+            dense
+            v-model="selected[tabsIndex][column]"
+            :value="item"
+            :label="item"
+            @change="
               selected[tabsIndex] = Object.assign({}, selected[tabsIndex])
             "
           />
@@ -32,32 +32,32 @@
       </v-col>
     </v-row>
     <v-tabs
-        class="rounded-t-lg"
-        v-model="tabsIndex"
-        background-color="background-light"
+      class="rounded-t-lg"
+      v-model="tabsIndex"
+      background-color="background-light"
     >
       <v-tab v-for="tab in tabs" :key="tab">{{ tab }}</v-tab>
     </v-tabs>
 
     <v-tabs-items
-        v-model="tabsIndex"
-        style="background: var(--v-background-light-base)"
-        class="rounded-b-lg"
+      v-model="tabsIndex"
+      style="background: var(--v-background-light-base)"
+      class="rounded-b-lg"
     >
       <v-tab-item v-for="tab in tabs" :key="tab">
         <v-progress-linear v-if="isPlansLoading" indeterminate class="pt-1" />
 
         <nocloud-table
-            item-key="id"
-            table-name="vps-tarrifs"
-            v-else-if="tab === 'Tariffs'"
-            :show-expand="true"
-            :show-select="false"
-            :items="filteredPlans"
-            :headers="headers"
-            :expanded.sync="expanded"
-            :loading="isPlansLoading"
-            :footer-error="fetchError"
+          item-key="id"
+          table-name="vps-tarrifs"
+          v-else-if="tab === 'Tariffs'"
+          :show-expand="true"
+          :show-select="false"
+          :items="filteredPlans"
+          :headers="headers"
+          :expanded.sync="expanded"
+          :loading="isPlansLoading"
+          :footer-error="fetchError"
         >
           <template v-slot:[`item.name`]="{ item }">
             <v-text-field dense style="width: 200px" v-model="item.name" />
@@ -65,10 +65,10 @@
           <template v-slot:[`item.group`]="{ item }">
             <template v-if="mode === 'edit' && planId === item.id">
               <v-text-field
-                  dense
-                  class="d-inline-block mr-1"
-                  style="width: 200px"
-                  v-model="newGroupName"
+                dense
+                class="d-inline-block mr-1"
+                style="width: 200px"
+                v-model="newGroupName"
               />
               <v-icon @click="editGroup(item.group)">mdi-content-save</v-icon>
               <v-icon @click="mode = 'none'">mdi-close</v-icon>
@@ -76,10 +76,10 @@
 
             <template v-if="mode === 'create' && planId === item.id">
               <v-text-field
-                  dense
-                  class="d-inline-block mr-1"
-                  style="width: 200px"
-                  v-model="newGroupName"
+                dense
+                class="d-inline-block mr-1"
+                style="width: 200px"
+                v-model="newGroupName"
               />
               <v-icon @click="createGroup(item)">mdi-content-save</v-icon>
               <v-icon @click="mode = 'none'">mdi-close</v-icon>
@@ -87,17 +87,17 @@
 
             <template v-if="mode === 'none'">
               <v-select
-                  dense
-                  class="d-inline-block"
-                  style="width: 200px"
-                  v-model="item.group"
-                  :items="groups"
-                  @change="item.name = getName(item)"
+                dense
+                class="d-inline-block"
+                style="width: 200px"
+                v-model="item.group"
+                :items="groups"
+                @change="item.name = getName(item)"
               />
               <v-icon @click="changeMode('create', item)">mdi-plus</v-icon>
               <v-icon @click="changeMode('edit', item)">mdi-pencil</v-icon>
               <v-icon v-if="groups.length > 1" @click="deleteGroup(item.group)"
-              >mdi-delete</v-icon
+                >mdi-delete</v-icon
               >
             </template>
 
@@ -128,9 +128,9 @@
               </td>
               <td>
                 <v-text-field
-                    dense
-                    style="width: 150px"
-                    v-model="item.windows.value"
+                  dense
+                  style="width: 150px"
+                  v-model="item.windows.value"
                 />
               </td>
               <td></td>
@@ -143,13 +143,13 @@
         </nocloud-table>
 
         <nocloud-table
-            table-name="vps-addons"
-            v-else-if="tab === 'Addons'"
-            :show-select="false"
-            :items="filteredAddons"
-            :headers="addonsHeaders"
-            :loading="isPlansLoading"
-            :footer-error="fetchError"
+          table-name="vps-addons"
+          v-else-if="tab === 'Addons'"
+          :show-select="false"
+          :items="filteredAddons"
+          :headers="addonsHeaders"
+          :loading="isPlansLoading"
+          :footer-error="fetchError"
         >
           <template v-slot:[`item.margin`]="{ item }">
             {{ getMargin(item, false) }}
@@ -170,21 +170,21 @@
 
         <div class="os-tab__card" v-else-if="tab === 'OS'">
           <v-card
-              outlined
-              class="pt-4 pl-4 d-flex"
-              style="gap: 10px"
-              color="background"
-              v-for="item of allImages"
-              :key="item"
+            outlined
+            class="pt-4 pl-4 d-flex"
+            style="gap: 10px"
+            color="background"
+            v-for="item of allImages"
+            :key="item"
           >
             <v-chip
-                close
-                outlined
-                :color="images.includes(item) ? 'info' : 'error'"
-                :close-icon="
+              close
+              outlined
+              :color="images.includes(item) ? 'info' : 'error'"
+              :close-icon="
                 images.includes(item) ? 'mdi-close-circle' : 'mdi-plus-circle'
               "
-                @click:close="changeImage(item)"
+              @click:close="changeImage(item)"
             >
               {{ item }}
             </v-chip>
@@ -279,7 +279,7 @@ export default {
 
     planId: -1,
     tabsIndex: 0,
-    usedFee: {}
+    usedFee: {},
   }),
   mixins: [currencyRate],
   methods: {
@@ -357,8 +357,8 @@ export default {
               }
 
               this.filters[this.tabsIndex] = Object.assign(
-                  {},
-                  this.filters[this.tabsIndex]
+                {},
+                this.filters[this.tabsIndex]
               );
               element.dispatchEvent(new Event("click"));
 
@@ -393,19 +393,22 @@ export default {
             const newPrice = parseFloat((price.value * this.rate).toFixed(2));
 
             const { configurations, addonFamilies } = catalog.plans.find(
-                ({ planCode }) => planCode.includes(code)
+              ({ planCode }) => planCode.includes(code)
             );
             const os = configurations[1].values;
             const datacenter = configurations[0].values;
             const addons = addonFamilies.reduce(
-                (res, { addons }) => [...res, ...addons],
-                []
+              (res, { addons }) => [...res, ...addons],
+              []
             );
             const plan = { windows: null, addons, os, datacenter };
 
             if (option) {
-              const { price: { value } } = option.prices.find(
-                  (el) => el.duration === duration && el.pricingMode === pricingMode
+              const {
+                price: { value },
+              } = option.prices.find(
+                (el) =>
+                  el.duration === duration && el.pricingMode === pricingMode
               );
               const newPrice = parseFloat((value * this.rate).toFixed(2));
 
@@ -417,8 +420,10 @@ export default {
               };
             }
 
-            const installation = prices.find((price) =>
-                price.capacities.includes("installation") && price.pricingMode === pricingMode
+            const installation = prices.find(
+              (price) =>
+                price.capacities.includes("installation") &&
+                price.pricingMode === pricingMode
             );
 
             result.push({
@@ -634,10 +639,13 @@ export default {
             case "Payment":
               filter = this.getPayment(plan[value]);
               break;
-            case "Margin":
+            case "Margin": {
               filter = this.getMargin(plan, false);
+            }
+          }
+          if (i === 1 && key === "Margin") {
+            return result.push(true);
           }
-
           if (filters.includes(filter)) result.push(true);
           else result.push(false);
         });
@@ -679,21 +687,21 @@ export default {
     this.fetchRate();
 
     api.servicesProviders
-        .action({ action: "get_plans", uuid: this.sp.uuid })
-        .then(({ meta }) => {
-          this.changePlans(meta);
-          this.changeAddons(meta);
-
-          this.fetchError = "";
-          this.changeIcon();
-        })
-        .catch((err) => {
-          this.fetchError = err.response?.data?.message ?? err.message ?? err;
-          console.error(err);
-        })
-        .finally(() => {
-          this.$emit("changeLoading");
-        });
+      .action({ action: "get_plans", uuid: this.sp.uuid })
+      .then(({ meta }) => {
+        this.changePlans(meta);
+        this.changeAddons(meta);
+
+        this.fetchError = "";
+        this.changeIcon();
+      })
+      .catch((err) => {
+        this.fetchError = err.response?.data?.message ?? err.message ?? err;
+        console.error(err);
+      })
+      .finally(() => {
+        this.$emit("changeLoading");
+      });
   },
   mounted() {
     const icon = document.querySelector(".group-icon");
@@ -737,7 +745,7 @@ export default {
         this.plans.forEach((plan, i) => {
           const product = this.template.products[plan.id];
           const winKey = Object.keys(product?.meta || {}).find((el) =>
-              el.includes("windows")
+            el.includes("windows")
           );
           const title = (product?.title ?? plan.name).replace(/VPS[\W0-9]/, "");
           const group = title.split(/[\W0-9]/)[0];
@@ -757,8 +765,10 @@ export default {
         const sellingPlans = this.plans.filter(({ sell }) => sell);
 
         if (sellingPlans.length < 1) this.images = this.plans[1].os;
-        else this.images = (sellingPlans[1] ?? sellingPlans[0]).os
-            .filter((image) => this.allImages.includes(image));
+        else
+          this.images = (sellingPlans[1] ?? sellingPlans[0]).os.filter(
+            (image) => this.allImages.includes(image)
+          );
 
         if (this.template.resources.length === this.addons.length) {
           this.filters["1"].Sell = ["true"];
@@ -814,4 +824,4 @@ export default {
     grid-template-columns: 1fr;
   }
 }
-</style>
\ No newline at end of file
+</style>

From fd4c0661acf235935cdb91c67809ff7532c64e84 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 20 Sep 2023 13:27:29 +0300
Subject: [PATCH 74/88] Fix

---
 go.mod                        |  9 -------
 go.sum                        | 47 -----------------------------------
 pkg/oauth2/handlers/github.go |  2 +-
 3 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/go.mod b/go.mod
index a2f4a1122..d5cd16edf 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,6 @@ go 1.20
 require (
 	github.com/Pallinder/go-randomdata v1.2.0
 	github.com/arangodb/go-driver v1.6.0
-	github.com/dghubble/gologin/v2 v2.4.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/google/uuid v1.3.1
@@ -30,16 +29,8 @@ require (
 require (
 	cloud.google.com/go/compute v1.23.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/go-github/v48 v48.2.0 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/google/s2a-go v0.1.4 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
-	google.golang.org/api v0.126.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
diff --git a/go.sum b/go.sum
index d6ccf9f46..faaa54ac1 100644
--- a/go.sum
+++ b/go.sum
@@ -44,14 +44,12 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00lCDlaYPg=
 github.com/Pallinder/go-randomdata v1.2.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/arangodb/go-driver v1.6.0 h1:NFWj/idqXZxhFVueihMSI2R9NotNIsgvNfM/xmpekb4=
 github.com/arangodb/go-driver v1.6.0/go.mod h1:HQmdGkvNMVBTE3SIPSQ8T/ZddC6iwNsfMR+dDJQxIsI=
 github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e h1:Xg+hGrY2LcQBbxd0ZFdbGSyRKTYMZCfBbw/pMJFOk1g=
 github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e/go.mod h1:mq7Shfa/CaixoDxiyAAc5jZ6CVBAyPaNQCGS7mkj4Ho=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -61,17 +59,11 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cskr/pubsub v1.0.2 h1:vlOzMhl6PFn60gRlTQQsIfVwaPB/B/8MziK8FhEPt/0=
 github.com/cskr/pubsub v1.0.2/go.mod h1:/8MzYXk/NJAz782G8RPkFzXTZVu63VotefPnR9TIRis=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dghubble/gologin/v2 v2.4.0 h1:Ga0dxZ2C/8MrMtC0qFLIg1K7cVjZQWSbTj/MIgFqMAg=
-github.com/dghubble/gologin/v2 v2.4.0/go.mod h1:85FO9Je/O6n9/KdHTUtVDSaXQjR6Ducx7blL/3CUfnw=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -79,12 +71,10 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -102,8 +92,6 @@ github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
@@ -126,7 +114,6 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -139,14 +126,9 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-github/v48 v48.2.0 h1:68puzySE6WqUY9KWmpOsDEQfDZsso98rT6pZcz9HqcE=
-github.com/google/go-github/v48 v48.2.0/go.mod h1:dDlehKBDo850ZPvCTK0sEqTCVWcrGl2LcDiajkYi89Y=
-github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
-github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -161,17 +143,11 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
-github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
 github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
-github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
@@ -180,7 +156,6 @@ github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWm
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -219,7 +194,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rabbitmq/amqp091-go v1.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0h1hA=
 github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8=
@@ -266,16 +240,12 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
@@ -292,8 +262,6 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
@@ -330,7 +298,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -359,13 +326,11 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -389,8 +354,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -430,14 +393,11 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -446,7 +406,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -502,7 +461,6 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -526,8 +484,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o=
-google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -560,7 +516,6 @@ google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
@@ -593,7 +548,6 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
@@ -621,7 +575,6 @@ gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index e3c58666d..96fa1fb9c 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -147,6 +147,6 @@ func (g *GithubOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			}
 		}
 
-		http.Redirect(w, r, fmt.Sprintf("%s?token=?%s", redirect, resp.GetToken()), http.StatusSeeOther)
+		http.Redirect(w, r, fmt.Sprintf("%s?token=%s", redirect, resp.GetToken()), http.StatusSeeOther)
 	}))
 }

From 7595406afd2a83782bb24ab9050129f132832692 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 20 Sep 2023 13:40:56 +0300
Subject: [PATCH 75/88] Fix

---
 pkg/oauth2/handlers/bitrix.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 073219dcf..2fca8bde3 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -76,7 +76,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			return
 		}
 
-		response, err := http.Get(fmt.Sprintf("%s%s", userInfoUrl, token.AccessToken))
+		response, err := http.Get(fmt.Sprintf("%s?auth=%s", userInfoUrl, token.AccessToken))
 
 		if err != nil {
 			log.Error("Failed to make request", zap.Error(err))

From 90b031328ce1257df0596d1d9538c41afea0dfe1 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 20 Sep 2023 13:52:38 +0300
Subject: [PATCH 76/88] Fix

---
 pkg/oauth2/handlers/bitrix.go | 2 +-
 pkg/oauth2/handlers/github.go | 2 +-
 pkg/oauth2/handlers/google.go | 2 +-
 pkg/oauth2/main.go            | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 2fca8bde3..23f0b4ded 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -45,7 +45,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 	userInfoUrl := cfg.UserInfoURL
 	field := cfg.AuthField
 
-	router.Handle("/oauth/bitrix/login", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	router.Handle("/oauth/bitrix/sign_in", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		state, redirect := r.FormValue("state"), r.FormValue("redirect")
 
 		g.m.Lock()
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index 96fa1fb9c..f3195a87d 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -39,7 +39,7 @@ func (g *GithubOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 	userInfoUrl := cfg.UserInfoURL
 	field := cfg.AuthField
 
-	router.Handle("/oauth/github/login", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	router.Handle("/oauth/github/sign_in", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		state, redirect := r.FormValue("state"), r.FormValue("redirect")
 
 		g.m.Lock()
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index 9bfe9e820..57ef887ac 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -41,7 +41,7 @@ func (g *GoogleOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 	userInfoUrl := cfg.UserInfoURL
 	field := cfg.AuthField
 
-	router.Handle("/oauth/google/login", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	router.Handle("/oauth/google/sign_in", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		state, redirect := r.FormValue("state"), r.FormValue("redirect")
 
 		g.m.Lock()
diff --git a/pkg/oauth2/main.go b/pkg/oauth2/main.go
index 55f2af6d5..b514e5ee4 100644
--- a/pkg/oauth2/main.go
+++ b/pkg/oauth2/main.go
@@ -32,11 +32,13 @@ func (s *OAuth2Server) SetupRegistryClient(registryClient registry.AccountsServi
 
 func (s *OAuth2Server) registerOAuthHandlers() {
 	cfg, err := config.Config()
+	s.log.Debug("Read config", zap.Any("cfg", cfg))
 	if err != nil {
 		s.log.Fatal("Failed to read config", zap.Error(err))
 	}
 
 	for key, conf := range cfg {
+		s.log.Debug("Setting handler", zap.String("key", key))
 		handler := handlers.GetOAuthHandler(key)
 		if handler == nil {
 			continue
@@ -79,7 +81,8 @@ func (s *OAuth2Server) Start(port string, corsAllowed []string) {
 		AllowCredentials: true,
 	}).Handler(s.router)
 
-	err := http.ListenAndServe(fmt.Sprintf("localhost:%s", port), handler)
+	s.log.Debug("listen", zap.String("port", port))
+	err := http.ListenAndServe(fmt.Sprintf("0.0.0.0:%s", port), handler)
 	if err != nil {
 		s.log.Fatal("Failed to start server", zap.Error(err))
 	}

From 56698c0b1fa68e5a3c7489dc6c226f877efeb1d2 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 20 Sep 2023 14:04:39 +0300
Subject: [PATCH 77/88] Fix

---
 pkg/oauth2/main.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/oauth2/main.go b/pkg/oauth2/main.go
index b514e5ee4..e468b0326 100644
--- a/pkg/oauth2/main.go
+++ b/pkg/oauth2/main.go
@@ -20,13 +20,15 @@ type OAuth2Server struct {
 }
 
 func NewOAuth2Server(log *zap.Logger, host string) *OAuth2Server {
+	log.Debug("New Server")
 	return &OAuth2Server{
-		log:    log,
+		log:    log.Named("OauthServer"),
 		router: mux.NewRouter(),
 	}
 }
 
 func (s *OAuth2Server) SetupRegistryClient(registryClient registry.AccountsServiceClient) {
+	s.log.Debug("Reg registry client")
 	s.registryClient = registryClient
 }
 

From 5ccca544d28d99cac080d987815218f317fb3d63 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 16:50:33 +0400
Subject: [PATCH 78/88] fix ovh period

---
 admin-ui/src/components/plan/ovhPrices.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/components/plan/ovhPrices.vue b/admin-ui/src/components/plan/ovhPrices.vue
index 350c35c89..7ca9e9075 100644
--- a/admin-ui/src/components/plan/ovhPrices.vue
+++ b/admin-ui/src/components/plan/ovhPrices.vue
@@ -165,7 +165,7 @@ export default {
         case "P1M":
           return 3600 * 24 * 30;
         case "P1Y":
-          return 3600 * 24 * 30 * 12;
+          return 3600 * 24 * 365;
       }
     },
     setFee() {

From df97feca69f0727b4fbd6610147c804ca3c96af9 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 17:40:30 +0400
Subject: [PATCH 79/88] fix convert from

---
 admin-ui/src/hooks/useCurrency.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/hooks/useCurrency.js b/admin-ui/src/hooks/useCurrency.js
index f34f4d4be..5f50fb832 100644
--- a/admin-ui/src/hooks/useCurrency.js
+++ b/admin-ui/src/hooks/useCurrency.js
@@ -23,7 +23,7 @@ const useCurrency = () => {
       )?.rate;
     }
 
-    return rate ? (price * rate).toFixed(2) : 0;
+    return rate ? (price / rate).toFixed(2) : 0;
   };
 
   const convertTo = (price, currency) => {

From 5e1133fed0aa4e5daedeebaa3d14b0c934f0670f Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 17:40:41 +0400
Subject: [PATCH 80/88] add base billing label

---
 admin-ui/src/components/ui/billingLabel.vue | 122 ++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 admin-ui/src/components/ui/billingLabel.vue

diff --git a/admin-ui/src/components/ui/billingLabel.vue b/admin-ui/src/components/ui/billingLabel.vue
new file mode 100644
index 000000000..f6da499aa
--- /dev/null
+++ b/admin-ui/src/components/ui/billingLabel.vue
@@ -0,0 +1,122 @@
+<template>
+  <v-container>
+    <v-row>
+      <v-col>
+        <v-chip outlined color="primary">Due to date: {{ dueDate }}</v-chip>
+      </v-col>
+      <v-col>
+        <confirm-dialog
+          title="Do you want to renew server?"
+          :text="renewTemplate"
+          :width="500"
+          :success-disabled="isRenewDisabled"
+          @confirm="sendRenew"
+        >
+          <v-btn
+            color="primary"
+            :disabled="isRenewDisabled"
+            :loading="isLoading"
+          >
+            Renew
+          </v-btn>
+        </confirm-dialog>
+      </v-col>
+    </v-row>
+    <v-row class="mt-0" align="center" justify="end">
+      <v-col class="d-flex justify-end">
+        <v-chip color="primary" outlined
+          >Price: {{ price }} {{ accountCurrency }}</v-chip
+        >
+      </v-col>
+      <v-col class="d-flex justify-end">
+        <instance-state :state="template.state.state" />
+      </v-col>
+    </v-row>
+  </v-container>
+</template>
+
+<script setup>
+import { computed, toRefs } from "vue";
+import { useStore } from "@/store";
+import confirmDialog from "@/components/confirmDialog.vue";
+import InstanceState from "@/components/ui/instanceState.vue";
+import useCurrency from "@/hooks/useCurrency";
+
+const props = defineProps([
+  "template",
+  "dueDate",
+  "addonsPrice",
+  "tariffPrice",
+  "account",
+]);
+
+const store = useStore();
+const { convertFrom } = useCurrency();
+
+const { template, addonsPrice, tariffPrice, dueDate, account } = toRefs(props);
+
+const currency = computed(() => ({
+  code: store.getters["currencies/default"],
+}));
+
+const accountCurrency = computed(() => {
+  return account.value.currency;
+});
+
+const price = computed(() => {
+  const addonsSum = Object.values(addonsPrice.value).reduce((a, b) => a + b);
+
+  return convertFrom(tariffPrice.value + addonsSum, accountCurrency.value);
+});
+
+const isRenewDisabled = computed(() => {
+  return (
+    (account.value.balance || 0) < price.value || template.value.data.blocked
+  );
+});
+
+function sendRenew() {
+  store
+    .dispatch("actions/sendVmAction", {
+      action: "manual_renew",
+      template: template.value,
+    })
+    .then(() => {
+      template.value.data.blocked = true;
+      template.value.data = Object.assign({}, template.value.data);
+    });
+}
+
+const addonsTemplate = Object.entries(addonsPrice.value).map(
+  ([key, value]) => `<li>${key}: ${value} ${currency.value.code}</li>`
+);
+
+const isLoading = computed(() => store.getters["actions/isSendActionLoading"]);
+
+const renewTemplate = `
+      <div style="font-size: 16px; white-space: initial">
+        <div>Manual renewal:</div>
+        <span style="font-weight: 700">Tariff price: </span>
+        ${tariffPrice.value} ${currency.value.code}
+        ${
+          addonsPrice.value
+            ? `
+          <div>
+            <span style="font-weight: 700">Addons prices:</span>
+            <ul style="list-style: '-  '; padding-left: 25px; margin-bottom: 5px">
+              ${addonsTemplate.join("")}
+            </ul>
+          </div>
+        `
+            : ""
+        }
+
+        <div>
+          <span style="font-weight: 700">Total: </span>
+          ${price.value} ${currency.value.code}
+        </div>
+      </div>
+    `.trim();
+</script>
+
+<style scoped></style>
\ No newline at end of file

From fb2f08c3e228ce38f0fbae117fed175daa099d43 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 17:40:54 +0400
Subject: [PATCH 81/88] refactor modules billing label

---
 .../components/modules/ione/billingLabel.vue  | 117 +++--------------
 .../components/modules/ovh/billingLabel.vue   | 124 ++++--------------
 2 files changed, 40 insertions(+), 201 deletions(-)

diff --git a/admin-ui/src/components/modules/ione/billingLabel.vue b/admin-ui/src/components/modules/ione/billingLabel.vue
index 998d3d8bf..c4a42ba27 100644
--- a/admin-ui/src/components/modules/ione/billingLabel.vue
+++ b/admin-ui/src/components/modules/ione/billingLabel.vue
@@ -1,44 +1,18 @@
 <template>
-  <v-container>
-    <v-row>
-      <v-col>
-        <v-chip outlined color="primary">Due to date: {{ dueDate }}</v-chip>
-      </v-col>
-      <v-col>
-        <confirm-dialog
-          title="Do you want to renew server?"
-          :text="renewTemplate"
-          :width="500"
-          :success-disabled="isRenewDisabled"
-          @confirm="sendRenew"
-        >
-          <v-btn
-            color="primary"
-            :disabled="isRenewDisabled"
-            :loading="isLoading"
-          >
-            Renew
-          </v-btn>
-        </confirm-dialog>
-      </v-col>
-    </v-row>
-    <v-row class="mt-0" align="center" justify="end">
-      <v-col class="d-flex justify-end">
-        <v-chip color="primary" outlined>Price: {{ price }}</v-chip>
-      </v-col>
-      <v-col class="d-flex justify-end">
-        <instance-state :state="template.state.state" />
-      </v-col>
-    </v-row>
-  </v-container>
+  <billing-label
+    :account="account"
+    :template="template"
+    :addons-price="addonsPrice"
+    :tariff-price="tariffPrice"
+    :due-date="dueDate"
+  />
 </template>
 
 <script setup>
 import { computed, ref, toRefs } from "vue";
 import { formatSecondsToDate } from "@/functions";
 import { useStore } from "@/store";
-import confirmDialog from "@/components/confirmDialog.vue";
-import InstanceState from "@/components/ui/instanceState.vue";
+import billingLabel from "@/components/ui/billingLabel.vue";
 
 const props = defineProps(["template"]);
 
@@ -46,6 +20,16 @@ const store = useStore();
 
 const { template } = toRefs(props);
 
+const account = computed(() => {
+  const namespace = store.getters["namespaces/all"]?.find(
+    (n) => n.uuid === template.value.access.namespace
+  );
+  const account = store.getters["accounts/all"].find(
+    (a) => a.uuid === namespace.access.namespace
+  );
+  return account;
+});
+
 const tariffPrice = ref(
   template.value.billingPlan.products[template.value.product]?.price ?? 0
 );
@@ -79,77 +63,12 @@ const addonsPrice = ref(
   }, {})
 );
 
-const currency = computed(() => ({
-  code: store.getters["currencies/default"],
-}));
-const price = computed(() => {
-  const addonsSum = Object.values(addonsPrice.value).reduce((a, b) => a + b);
-
-  return (tariffPrice.value + addonsSum)?.toFixed(2);
-});
-
-const isRenewDisabled = computed(() => {
-  return getAccountBalance() < price.value || template.value.data.blocked;
-});
-const getAccountBalance = () => {
-  const namespace = store.getters["namespaces/all"]?.find(
-    (n) => n.uuid === template.value.access.namespace
-  );
-  const account = store.getters["accounts/all"].find(
-    (a) => a.uuid === namespace.access.namespace
-  );
-  return account?.balance;
-};
-
 const dueDate = computed(() => {
   return formatSecondsToDate(
     +template.value?.data?.last_monitoring +
       +template.value.billingPlan.products[template.value.product].period
   );
 });
-
-function sendRenew() {
-  store
-    .dispatch("actions/sendVmAction", {
-      action: "manual_renew",
-      template: template.value,
-    })
-    .then(() => {
-      template.value.data.blocked = true;
-      template.value.data = Object.assign({}, template.value.data);
-    });
-}
-
-const addonsTemplate = Object.entries(addonsPrice.value).map(
-  ([key, value]) => `<li>${key}: ${value} ${currency.value.code}</li>`
-);
-
-const isLoading = computed(() => store.getters["actions/isSendActionLoading"]);
-
-const renewTemplate = `
-      <div style="font-size: 16px; white-space: initial">
-        <div>Manual renewal:</div>
-        <span style="font-weight: 700">Tariff price: </span>
-        ${tariffPrice.value} ${currency.value.code}
-        ${
-          addonsPrice.value
-            ? `
-          <div>
-            <span style="font-weight: 700">Addons prices:</span>
-            <ul style="list-style: '-  '; padding-left: 25px; margin-bottom: 5px">
-              ${addonsTemplate.join("")}
-            </ul>
-          </div>
-        `
-            : ""
-        }
-
-        <div>
-          <span style="font-weight: 700">Total: </span>
-          ${price.value} ${currency.value.code}
-        </div>
-      </div>
-    `.trim();
 </script>
 
 <style scoped></style>
diff --git a/admin-ui/src/components/modules/ovh/billingLabel.vue b/admin-ui/src/components/modules/ovh/billingLabel.vue
index 6bed501de..c702d8a9b 100644
--- a/admin-ui/src/components/modules/ovh/billingLabel.vue
+++ b/admin-ui/src/components/modules/ovh/billingLabel.vue
@@ -1,49 +1,34 @@
 <template>
-  <v-container>
-    <v-row>
-      <v-col>
-        <v-chip outlined color="primary">Due to date: {{ dueDate }}</v-chip>
-      </v-col>
-      <v-col>
-        <confirm-dialog
-          title="Do you want to renew server?"
-          :text="renewTemplate"
-          :width="500"
-          :success-disabled="isRenewDisabled"
-          @confirm="sendRenew"
-        >
-          <v-btn
-            color="primary"
-            :disabled="isRenewDisabled"
-            :loading="isLoading"
-          >
-            Renew
-          </v-btn>
-        </confirm-dialog>
-      </v-col>
-    </v-row>
-    <v-row justify="end" align="center">
-      <v-col class="d-flex justify-end">
-        <v-chip color="primary" outlined>Price: {{ price }}</v-chip>
-      </v-col>
-      <v-col class="d-flex justify-end">
-        <instance-state :state="template.state.state" />
-      </v-col>
-    </v-row>
-  </v-container>
+  <billing-label
+    :due-date="dueDate"
+    :tariff-price="tariffPrice"
+    :template="template"
+    :addons-price="addonsPrice"
+    :account="account"
+  />
 </template>
 
 <script setup>
-import { computed, ref } from "vue";
-import { formatSecondsToDate, getOvhPrice } from "@/functions";
+import { computed, ref, toRefs } from "vue";
+import { formatSecondsToDate } from "@/functions";
+import billingLabel from "@/components/ui/billingLabel.vue";
 import { useStore } from "@/store";
-import confirmDialog from "@/components/confirmDialog.vue";
-import InstanceState from "@/components/ui/instanceState.vue";
 
 const props = defineProps(["template"]);
 
+const { template } = toRefs(props);
+
 const store = useStore();
-const isDisabled = ref(false);
+
+const account = computed(() => {
+  const namespace = store.getters["namespaces/all"]?.find(
+    (n) => n.uuid === template.value.access.namespace
+  );
+  const account = store.getters["accounts/all"].find(
+    (a) => a.uuid === namespace.access.namespace
+  );
+  return account;
+});
 
 const dueDate = computed(() => {
   const { duration, planCode } = props.template.config;
@@ -58,8 +43,6 @@ const dueDate = computed(() => {
   return props.template.data.expiration;
 });
 
-const isLoading = computed(() => store.getters["actions/isSendActionLoading"]);
-
 const tariffPrice = computed(() => {
   const { duration, planCode } = props.template.config;
   const key = `${duration} ${planCode}`;
@@ -86,69 +69,6 @@ const addonsPrice = ref(
     return { ...res, [key]: +price || 0 };
   }, {})
 );
-
-const currency = computed(() => ({
-  code: store.getters["currencies/default"],
-}));
-const price = computed(() => {
-  return getOvhPrice(props.template);
-});
-
-const isRenewDisabled = computed(() => {
-  return (
-    getAccountBalance() < getOvhPrice(props.template) ||
-    props.template.data.blocked ||
-    isDisabled.value
-  );
-});
-const getAccountBalance = () => {
-  const namespace = store.getters["namespaces/all"]?.find(
-    (n) => n.uuid === props.template.access.namespace
-  );
-  const account = store.getters["accounts/all"].find(
-    (a) => a.uuid === namespace.access.namespace
-  );
-  return account.balance;
-};
-
-function sendRenew() {
-  store
-    .dispatch("actions/sendVmAction", {
-      action: "manual_renew",
-      template: props.template,
-    })
-    .then(() => {
-      isDisabled.value = true;
-    });
-}
-
-const addonsTemplate = Object.entries(addonsPrice.value).map(
-  ([key, value]) => `<li>${key}: ${value} ${currency.value.code}</li>`
-);
-
-const renewTemplate = `
-      <div style="font-size: 16px; white-space: initial">
-        <div>Manual renewal:</div>
-        <span style="font-weight: 700">Tariff price: </span>
-        ${tariffPrice.value} ${currency.value.code}
-        <div>
-          <span style="font-weight: 700">Addons prices:</span>
-          ${
-            addonsTemplate.value
-              ? `<ul style="list-style: '-  '; padding-left: 25px; margin-bottom: 5px">
-                ${addonsTemplate.join("")}
-              </ul>`
-              : `0 ${currency.value.code}
-          `
-          }
-        </div>
-
-        <div>
-          <span style="font-weight: 700">Total: </span>
-          ${price.value} ${currency.value.code}
-        </div>
-      </div>
-    `.trim();
 </script>
 
 <style scoped></style>

From 94450ff8b83bc8eaafb518ad684f091841f09a28 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 19:10:25 +0400
Subject: [PATCH 82/88] add invoice meta type

---
 admin-ui/src/views/TransactionsCreate.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 9b6960d3e..3750eec2f 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -260,6 +260,11 @@ export default {
         } else {
           total = Math.abs(total);
           total = this.amountType ? total : -total;
+          if (this.isInvoice) {
+            this.transaction.meta.invoiceType = this.amountType
+              ? "top-up"
+              : "payment";
+          }
         }
 
         await api.transactions.create({

From bdf69764f36c79a5d2509d7f883267e1d1424337 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 21 Sep 2023 11:46:06 +0300
Subject: [PATCH 83/88] Fix

---
 pkg/graph/records.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/graph/records.go b/pkg/graph/records.go
index 2b0cf5b65..13f245fc0 100644
--- a/pkg/graph/records.go
+++ b/pkg/graph/records.go
@@ -190,12 +190,12 @@ func (ctrl *RecordsController) GetRecordsReports(ctx context.Context, req *pb.Ge
 	}
 
 	if req.Account != nil {
-		query += ` FILTER t.account == @acc`
+		query += ` FILTER record.account == @acc`
 		params["acc"] = req.GetAccount()
 	}
 
 	if req.Service != nil {
-		query += ` FILTER t.service == @srv`
+		query += ` FILTER record.service == @srv`
 		params["srv"] = req.GetService()
 	}
 
@@ -283,12 +283,12 @@ func (ctrl *RecordsController) GetRecordsReportsCount(ctx context.Context, req *
 	}
 
 	if req.Account != nil {
-		query += ` FILTER t.account == @acc`
+		query += ` FILTER record.account == @acc`
 		params["acc"] = req.GetAccount()
 	}
 
 	if req.Service != nil {
-		query += ` FILTER t.service == @srv`
+		query += ` FILTER record.service == @srv`
 		params["srv"] = req.GetService()
 	}
 

From 9be36ea0dcb156166fb9dd37d2299d4976d06fd9 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 21 Sep 2023 12:36:03 +0300
Subject: [PATCH 84/88] Fix

---
 pkg/oauth2/handlers/bitrix.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 23f0b4ded..294214c1e 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -25,7 +25,7 @@ type BitrixOauthHandler struct {
 }
 
 type UserInfo struct {
-	Result []map[string]interface{} `json:"result"`
+	Result map[string]interface{} `json:"result"`
 }
 
 func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
@@ -106,7 +106,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			return
 		}
 
-		user := userInfo.Result[0]
+		user := userInfo.Result
 		value := user[field].(string)
 
 		name := user["NAME"].(string)

From 5454037cb455ea0da2de7488189606c5c038ba0e Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 21 Sep 2023 12:43:19 +0300
Subject: [PATCH 85/88] Fix

---
 pkg/oauth2/handlers/bitrix.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 294214c1e..11f0a6e2a 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -102,10 +102,6 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			return
 		}
 
-		if len(userInfo.Result) != 1 {
-			return
-		}
-
 		user := userInfo.Result
 		value := user[field].(string)
 

From 5b7390bc7f9b59b72cd3da5e571d3c9ecc341da6 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 21 Sep 2023 12:58:42 +0300
Subject: [PATCH 86/88] Fix

---
 pkg/credentials/credentials.go | 2 +-
 pkg/credentials/oauth2.go      | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/credentials/credentials.go b/pkg/credentials/credentials.go
index 4b55eebb4..4a26bc407 100644
--- a/pkg/credentials/credentials.go
+++ b/pkg/credentials/credentials.go
@@ -114,7 +114,7 @@ func MakeCredentials(credentials *accountspb.Credentials, log *zap.Logger) (Cred
 	case credentials.Type == "whmcs":
 		cred, err = NewWHMCSCredentials(credentials.Data)
 	case strings.HasPrefix(credentials.Type, "oauth2"):
-		cred, err = NewOAuth2Credentials(credentials.Data)
+		cred, err = NewOAuth2Credentials(credentials.Data, credentials.GetType())
 	default:
 		return nil, errors.New("auth type is wrong")
 	}
diff --git a/pkg/credentials/oauth2.go b/pkg/credentials/oauth2.go
index b93cdb060..c9105e959 100644
--- a/pkg/credentials/oauth2.go
+++ b/pkg/credentials/oauth2.go
@@ -18,12 +18,12 @@ type OAuth2Credentials struct {
 	driver.DocumentMeta
 }
 
-func NewOAuth2Credentials(data []string) (Credentials, error) {
+func NewOAuth2Credentials(data []string, credType string) (Credentials, error) {
 	if len(data) < 2 {
 		return nil, fmt.Errorf("some credentials data is missing, expected data length to be 2, got: %d", len(data))
 	}
 	field, value := data[0], data[1]
-	return &OAuth2Credentials{AuthField: field, AuthValue: value}, nil
+	return &OAuth2Credentials{AuthField: field, AuthValue: value, AuthType: credType}, nil
 }
 
 func (cred *OAuth2Credentials) Type() string {
@@ -41,10 +41,11 @@ func (cred *OAuth2Credentials) SetLogger(log *zap.Logger) {
 }
 
 func (cred *OAuth2Credentials) Find(ctx context.Context, db driver.Database) bool {
-	query := `FOR cred IN @@credentials FILTER cred[@field] == @value RETURN cred`
+	query := `FOR cred IN @@credentials FILTER cred.auth_field == @field AND cred.auth_value == @value && cred.auth_type == @type RETURN cred`
 	c, err := db.Query(ctx, query, map[string]interface{}{
 		"field":        cred.AuthField,
 		"value":        cred.AuthValue,
+		"type":         cred.AuthType,
 		"@credentials": schema.CREDENTIALS_COL,
 	})
 	if err != nil {

From ffec2cd8b1b48f7b1ba2a97ceee9a7c3c1717301 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 21 Sep 2023 13:12:13 +0300
Subject: [PATCH 87/88] Fix

---
 pkg/oauth2/handlers/bitrix.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 11f0a6e2a..7c5a0cd00 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -158,7 +158,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			}
 		}
 
-		http.Redirect(w, r, fmt.Sprintf("%s?token=?%s", redirect, resp.GetToken()), http.StatusSeeOther)
+		http.Redirect(w, r, fmt.Sprintf("%s?token=%s", redirect, resp.GetToken()), http.StatusSeeOther)
 
 	}))
 }

From 1dfcd81b5078ccc2a4e9f09a51edf8bdd571dd9d Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 21 Sep 2023 13:40:03 +0300
Subject: [PATCH 88/88] Fix

---
 pkg/oauth2/handlers/bitrix.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 7c5a0cd00..726f4f14d 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -53,7 +53,13 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 		g.m.Unlock()
 
 		url := oauth2Config.AuthCodeURL(state)
-		http.Redirect(w, r, url, http.StatusTemporaryRedirect)
+
+		result := map[string]string{
+			"url": url,
+		}
+
+		marshal, _ := json.Marshal(result)
+		w.Write(marshal)
 	}))
 	router.Handle("/oauth/bitrix/checkout", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		state, code := r.FormValue("state"), r.FormValue("code")