@cuboapp/api-backend 1.0.17 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",

package/src/index.ts

@@ -19,9 +19,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
 
   async init() {
     try {
-      this.auth = await this.request<{ variables: Record<string, any> }>('/auth/me?with=variables', {
-        headers: this.options.api?.headers || {}
-      })
+      this.auth = await this.request<{ variables: Record<string, any> }>('/auth/me?with=variables')
 
       if (!this.auth) {
         throw { code: 403, text: 'Авторизация Cubo-Backend не пройдена' }
@@ -40,13 +38,17 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
     }
   }
 
-  public async request<T>(url: string, opts?: RequestInit & { debug?: boolean; withoutContentType?: boolean }) {
+  public async request<T>(url: string, opts?: RequestInit & { debug?: boolean; withoutAuth?: boolean; withoutContentType?: boolean }) {
     const baseUrl = this.options?.api?.base_url || 'https://api.cubo.sh'
 
     const headers: Record<string, any> = {
       ...(opts?.headers || {})
     }
 
+    if (!opts?.withoutAuth) {
+      Object.assign(headers, this.options.api?.headers || {})
+    }
+
     if (!headers['Content-Type'] && !opts?.withoutContentType) {
       headers['Accept'] = 'application/json'
       headers['Content-Type'] = 'application/json'
@@ -137,7 +139,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
     const regularQuery = await this.helpers.createFindQuery(req, entity, queryDto)
     const countQuery = await this.helpers.createFindQuery(req, entity, queryDto, true)
 
-    const db = await this.helpers.getConnection('read')
+    const db = await this.helpers.getConnection('write')
 
     if (opts?.log) {
       console.log(`QUERY:getMany to "${String(entityAlias)}":`, regularQuery.sql, regularQuery.replacements, { req, opts, queryDto })
@@ -250,7 +252,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
       response = await augmentation.afterCreate(response, req, opts)
     }
 
-    if (opts.crdt !== false && this.crdt.isCrdtSupported(entity)) {
+    if (opts.crdt === true && this.crdt?.isCrdtSupported(entity)) {
       const state = await this.crdt.createState({ entityAlias, id: created_id, entity }, response)
 
       const fieldKey = entity.fields.find((f) => f.type === 'binary').alias
@@ -302,7 +304,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>> {
       response = await augmentation.afterUpdate(response, req, opts)
     }
 
-    if (opts.crdt !== false && this.crdt.isCrdtSupported(entity)) {
+    if (opts.crdt === true && this.crdt?.isCrdtSupported(entity)) {
       const context = { auth: opts?.extra?.auth }
       await this.crdt.updateDocument({ entityAlias, id: item.id, entity }, response, context)