Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3608e7601f | |||
| a75cfa1056 | |||
| f08c4102fd | |||
| 9bfd7c7d9a | |||
| a359b4fbdb |
@@ -3,6 +3,14 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.0.17](https://github.com/copenomics/cooparser/compare/cooparser-ts@1.0.17-alpha.2...cooparser-ts@1.0.17) (2024-07-25)
|
||||
|
||||
**Note:** Version bump only for package cooparser-ts
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## [1.0.16](https://github.com/copenomics/cooparser/compare/cooparser-ts@1.0.16-alpha.0...cooparser-ts@1.0.16) (2024-07-15)
|
||||
|
||||
**Note:** Version bump only for package cooparser-ts
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "pkg-placeholder",
|
||||
"version": "1.0.17-alpha.2",
|
||||
"version": "1.0.17",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "pkg-placeholder",
|
||||
"version": "1.0.17-alpha.2",
|
||||
"version": "1.0.17",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "^2.16.0",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "cooparser-ts",
|
||||
"type": "module",
|
||||
"version": "1.0.17-alpha.2",
|
||||
"version": "1.0.17",
|
||||
"private": true,
|
||||
"packageManager": "pnpm@9.0.6",
|
||||
"description": "",
|
||||
|
||||
@@ -3,6 +3,14 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.7.27](https://github.com/hagopj13/node-express-boilerplate/compare/coopback@1.7.27-alpha.5...coopback@1.7.27) (2024-07-25)
|
||||
|
||||
**Note:** Version bump only for package coopback
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## [1.7.26](https://github.com/hagopj13/node-express-boilerplate/compare/coopback@1.7.26-alpha.0...coopback@1.7.26) (2024-07-15)
|
||||
|
||||
**Note:** Version bump only for package coopback
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "create-nodejs-express-app",
|
||||
"version": "1.7.27-alpha.3",
|
||||
"version": "1.7.27",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "create-nodejs-express-app",
|
||||
"version": "1.7.27-alpha.3",
|
||||
"version": "1.7.27",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@a2seven/yoo-checkout": "^1.1.4",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "coopback",
|
||||
"version": "1.7.27-alpha.3",
|
||||
"version": "1.7.27",
|
||||
"description": "",
|
||||
"private": true,
|
||||
"bin": "bin/createNodejsApp.js",
|
||||
@@ -28,6 +28,7 @@
|
||||
"docker:dev": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml up",
|
||||
"docker:test": "docker-compose -f docker-compose.yml -f docker-compose.test.yml up",
|
||||
"types": "ts-node scripts/types.ts",
|
||||
"init": "ts-node scripts/init.ts",
|
||||
"swagger": "ts-node scripts/swagger.ts",
|
||||
"typecheck": "tsc --noEmit",
|
||||
"docs-watch": "swagger-ui-watcher ./src/docs/swagger.json",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import config from '../src/config/config';
|
||||
import { User } from '../src/models';
|
||||
import { tokenService } from '../src/services';
|
||||
import userService from '../src/services/user.service';
|
||||
import { userService } from '../src/services';
|
||||
import mongoose from 'mongoose';
|
||||
|
||||
const args = process.argv.slice(2);
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
import config from '../src/config/config';
|
||||
import { User } from '../src/models';
|
||||
import { tokenService } from '../src/services';
|
||||
import { userService } from '../src/services';
|
||||
import mongoose from 'mongoose';
|
||||
import { connectGenerator } from '../src/services/document.service';
|
||||
import crypto from 'crypto';
|
||||
import bcryptjs from 'bcryptjs';
|
||||
|
||||
const { compare, hash } = bcryptjs;
|
||||
|
||||
async function init() {
|
||||
try {
|
||||
await connectGenerator();
|
||||
|
||||
await mongoose.connect(config.mongoose.url, config.mongoose.options);
|
||||
const wif = '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3';
|
||||
const password = await crypto.createHash('sha256').update(wif).digest('hex');
|
||||
const hashed_password = await hash(password, 8);
|
||||
|
||||
console.log('password: ', hashed_password);
|
||||
|
||||
await userService.createUser({
|
||||
username: 'ant',
|
||||
email: 'dacom.dark.sun@gmail.com',
|
||||
password,
|
||||
public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
|
||||
role: 'chairman',
|
||||
type: 'individual',
|
||||
individual_data: {
|
||||
first_name: 'Иван',
|
||||
last_name: 'Иванов',
|
||||
middle_name: 'Иванович',
|
||||
birthdate: '2000-01-01',
|
||||
phone: '+1234567890',
|
||||
email: 'ivanov.ivan@example.com',
|
||||
full_address: 'Переулок Иванов д. 1',
|
||||
},
|
||||
});
|
||||
|
||||
const user = await userService.getUserByUsername('ant');
|
||||
user.status = 'active';
|
||||
user.is_registered = true;
|
||||
await user.save();
|
||||
|
||||
const voskhod = await userService.createUser({
|
||||
username: 'voskhod',
|
||||
email: 'chairman.voskhod@gmail.com',
|
||||
password,
|
||||
public_key: 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV',
|
||||
role: 'user',
|
||||
type: 'organization',
|
||||
organization_data: {
|
||||
is_cooperative: true,
|
||||
type: 'coop',
|
||||
short_name: '"ПК ТЕСТ-Восход"',
|
||||
full_name: 'Потребительский Кооператив "ТЕСТ-ВОСХОД"',
|
||||
represented_by: {
|
||||
first_name: 'Иван',
|
||||
last_name: 'Иванов',
|
||||
middle_name: 'Иванович',
|
||||
position: 'Председатель',
|
||||
based_on: 'Решения общего собрания №1',
|
||||
},
|
||||
country: 'Russia',
|
||||
city: 'Москва',
|
||||
full_address: 'Переулок Правды, дом 1',
|
||||
email: 'chairman.voskhod@gmail.com',
|
||||
phone: '+77077770707',
|
||||
details: {
|
||||
inn: '1234567890',
|
||||
ogrn: '1234567890123',
|
||||
},
|
||||
bank_account: {
|
||||
account_number: '40817810099910004312',
|
||||
currency: 'RUB',
|
||||
card_number: '1234567890123456',
|
||||
bank_name: 'Sberbank',
|
||||
details: {
|
||||
bik: '123456789',
|
||||
corr: '30101810400000000225',
|
||||
kpp: '123456789',
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
const coop = await userService.getUserByUsername('voskhod');
|
||||
coop.status = 'active';
|
||||
coop.is_registered = true;
|
||||
await coop.save();
|
||||
|
||||
console.log('ok');
|
||||
} catch (e: any) {
|
||||
console.log('Ошибка: ', e);
|
||||
}
|
||||
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
init();
|
||||
@@ -3,12 +3,12 @@ import crypto from 'crypto';
|
||||
const { compare, hash } = bcryptjs;
|
||||
|
||||
async function generate() {
|
||||
const wif = '';
|
||||
const wif = '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3';
|
||||
|
||||
const hash_from_wif = await crypto.createHash('sha256').update(wif).digest('hex');
|
||||
|
||||
const password = await hash(hash_from_wif, 8)
|
||||
console.log(password)
|
||||
console.log('hash_from_wif: ', hash_from_wif);
|
||||
const password = await hash(hash_from_wif, 8);
|
||||
console.log(password);
|
||||
}
|
||||
|
||||
generate();
|
||||
|
||||
@@ -10,8 +10,8 @@ export const login = catchAsync(async (req, res) => {
|
||||
const { email, password } = req.body;
|
||||
const user = await authService.loginUserWithEmailAndPassword(email, password);
|
||||
|
||||
if (user.is_registered === false)
|
||||
throw new Error('Регистрация не была завершена. Пожалуйста, подождите решения совета или начните с начала. ');
|
||||
// if (user.is_registered === false)
|
||||
// throw new Error('Регистрация не была завершена. Пожалуйста, подождите решения совета или начните с начала. ');
|
||||
|
||||
const tokens = await tokenService.generateAuthTokens(user);
|
||||
res.send({ user, tokens });
|
||||
|
||||
@@ -11,7 +11,7 @@ import ApiError from '../utils/ApiError';
|
||||
import httpStatus from 'http-status';
|
||||
import { ICreatedPayment, IYandexIPN, PaymentDetails } from '../types/common';
|
||||
import { Cooperative } from 'cooptypes';
|
||||
import type { Filter } from 'mongodb';
|
||||
import { FilterQuery } from 'mongoose';
|
||||
|
||||
const { connection } = mongoose;
|
||||
|
||||
@@ -19,11 +19,11 @@ export const savePaymentMethod = async (data: Cooperative.Payments.IPaymentData)
|
||||
return await generator.save('paymentMethod', data);
|
||||
};
|
||||
|
||||
export const deletePaymentMethod = async (filter: Filter<Cooperative.Payments.IPaymentData>) => {
|
||||
export const deletePaymentMethod = async (filter: FilterQuery<Cooperative.Payments.IPaymentData>) => {
|
||||
return await generator.del('paymentMethod', filter as any);
|
||||
};
|
||||
|
||||
export const listPaymentMethods = async (filter: Filter<Cooperative.Payments.IPaymentData>) => {
|
||||
export const listPaymentMethods = async (filter: FilterQuery<Cooperative.Payments.IPaymentData>) => {
|
||||
return await generator.list('paymentMethod', filter as any);
|
||||
};
|
||||
|
||||
|
||||
@@ -3,6 +3,14 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.0.72](https://github.com/copenomics/coopdoc-generator-ts/compare/coopdoc-generator-ts@1.0.72-alpha.3...coopdoc-generator-ts@1.0.72) (2024-07-25)
|
||||
|
||||
**Note:** Version bump only for package coopdoc-generator-ts
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## [1.0.71](https://github.com/copenomics/coopdoc-generator-ts/compare/coopdoc-generator-ts@1.0.71-alpha.0...coopdoc-generator-ts@1.0.71) (2024-07-15)
|
||||
|
||||
**Note:** Version bump only for package coopdoc-generator-ts
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "coopdoc-generator-ts",
|
||||
"type": "module",
|
||||
"version": "1.0.72-alpha.3",
|
||||
"version": "1.0.72",
|
||||
"private": true,
|
||||
"packageManager": "pnpm@9.0.6",
|
||||
"description": "",
|
||||
|
||||
@@ -3,6 +3,14 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.0.17](https://github.com/coopenomics/cooptypes/compare/cooptypes@1.0.17-alpha.3...cooptypes@1.0.17) (2024-07-25)
|
||||
|
||||
**Note:** Version bump only for package cooptypes
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## [1.0.16](https://github.com/coopenomics/cooptypes/compare/cooptypes@1.0.16-alpha.0...cooptypes@1.0.16) (2024-07-15)
|
||||
|
||||
**Note:** Version bump only for package cooptypes
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "cooptypes",
|
||||
"type": "module",
|
||||
"version": "1.0.17-alpha.3",
|
||||
"version": "1.0.17",
|
||||
"description": "_description_",
|
||||
"author": "Alex Ant <dacom.dark.sun@gmail.com>",
|
||||
"license": "MIT",
|
||||
|
||||
@@ -3,6 +3,14 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [0.0.21](https://github.com/copenomics/coop-notificator/compare/coop-notificator@0.0.21-alpha.3...coop-notificator@0.0.21) (2024-07-25)
|
||||
|
||||
**Note:** Version bump only for package coop-notificator
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## [0.0.20](https://github.com/copenomics/coop-notificator/compare/coop-notificator@0.0.20-alpha.1...coop-notificator@0.0.20) (2024-07-15)
|
||||
|
||||
**Note:** Version bump only for package coop-notificator
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "coop-notificator",
|
||||
"type": "module",
|
||||
"version": "0.0.21-alpha.3",
|
||||
"version": "0.0.21",
|
||||
"private": true,
|
||||
"packageManager": "pnpm@9.1.1",
|
||||
"description": "_description_",
|
||||
|
||||
@@ -3,6 +3,14 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [0.1.30](https://github.com/coopenomics/monocoop/compare/terminal@0.1.30-alpha.4...terminal@0.1.30) (2024-07-25)
|
||||
|
||||
**Note:** Version bump only for package terminal
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## [0.1.29](https://github.com/coopenomics/monocoop/compare/terminal@0.1.29-alpha.1...terminal@0.1.29) (2024-07-15)
|
||||
|
||||
**Note:** Version bump only for package terminal
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "terminal",
|
||||
"version": "0.1.30-alpha.3",
|
||||
"version": "0.1.30",
|
||||
"description": "A Terminal Project",
|
||||
"productName": "Terminal App",
|
||||
"author": "Alex Ant <dacom.dark.sun@gmail.com>",
|
||||
|
||||
@@ -76,7 +76,7 @@ const receiver = computed(() => props.receiver)
|
||||
const loadDocuments = async () => {
|
||||
try {
|
||||
onLoading.value = true
|
||||
documents.value = (await sendGET('/v1/data/get-documents', {
|
||||
documents.value = (await sendGET('/v1/documents/get-documents', {
|
||||
filter: {
|
||||
receiver: receiver.value ? receiver.value : route.params.coopname
|
||||
},
|
||||
|
||||
@@ -3,7 +3,7 @@ import type { IGenerate, IGeneratedDocument } from '../model';
|
||||
import { sendPOST } from 'src/shared/api';
|
||||
|
||||
async function generateDocument(data: IGenerate): Promise<IGeneratedDocument> {
|
||||
return await sendPOST('/v1/data/generate', data);
|
||||
return await sendPOST('/v1/documents/generate', data);
|
||||
}
|
||||
|
||||
export const api = {
|
||||
|
||||
@@ -2,11 +2,11 @@ import { sendPOST } from 'src/shared/api';
|
||||
import { hashSHA256 } from 'src/shared/api/crypto';
|
||||
import { ICreatedUser } from 'src/shared/lib/types/user';
|
||||
|
||||
async function loginUser(username: string, wif: string): Promise<ICreatedUser> {
|
||||
async function loginUser(email: string, wif: string): Promise<ICreatedUser> {
|
||||
const password = await hashSHA256(wif);
|
||||
|
||||
const data = {
|
||||
username,
|
||||
email,
|
||||
password,
|
||||
};
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ q-card.bordered.q-pa-md.signup(flat)
|
||||
form(@submit.prevent="submit").full-width
|
||||
|
||||
q-input(
|
||||
v-model="username"
|
||||
label="Введите имя аккаунта"
|
||||
v-model="email"
|
||||
label="Введите электронную почту"
|
||||
color="primary"
|
||||
hint=""
|
||||
outlined
|
||||
@@ -37,7 +37,7 @@ q-card.bordered.q-pa-md.signup(flat)
|
||||
:loading="loading"
|
||||
:disable="!privateKey")
|
||||
|
||||
|
||||
|
||||
</template>
|
||||
<script lang="ts" setup>
|
||||
|
||||
@@ -45,22 +45,25 @@ import { useCurrentUserStore } from 'src/entities/User';
|
||||
import { useLoginUser } from 'src/features/User/LoginUser';
|
||||
import { FailAlert } from 'src/shared/api';
|
||||
import { COOPNAME } from 'src/shared/config';
|
||||
import { useGlobalStore } from 'src/shared/store';
|
||||
import { ref } from 'vue';
|
||||
import { useRouter } from 'vue-router';
|
||||
|
||||
const router = useRouter()
|
||||
|
||||
const username = ref('')
|
||||
const email = ref('')
|
||||
const privateKey = ref('')
|
||||
const loading = ref(false)
|
||||
const currentUser = useCurrentUserStore()
|
||||
const globalStore = useGlobalStore()
|
||||
|
||||
|
||||
const submit = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const { login } = useLoginUser()
|
||||
await login(username.value, privateKey.value)
|
||||
await currentUser.loadProfile(username.value, COOPNAME)
|
||||
await login(email.value, privateKey.value)
|
||||
await currentUser.loadProfile(globalStore.username, COOPNAME)
|
||||
|
||||
if (!currentUser.isRegistrationComplete) {
|
||||
router.push({ name: 'signup' })
|
||||
|
||||
Reference in New Issue
Block a user