@bprotsyk/aso-core 2.1.1 → 2.1.3

package/lib/app/app.d.ts

@@ -1,6 +1,6 @@
 import { AlternativeLayoutType, AlternativeLogicType, AlternativeNavigation, AlternativeNetworkTool, AlternativeOnActivityResult, AlternativeOnBackPressed, AlternativeSourceType, AlternativeStorageType } from "index";
 import { AppType } from "./app-type";
-import mongoose, { Document, Model } from "mongoose";
+import mongoose, { Document } from "mongoose";
 import { AlternativeFullscreen } from "app/app-integration";
 export interface IApp extends Document {
     id: number;
@@ -9,26 +9,23 @@ export interface IApp extends Document {
     trackingUrl?: string;
     bundle: string;
     pushesEnabled?: boolean;
-    sourceUrl?: string;
     policyUrl?: string;
     type: AppType;
     geos: string;
     geo: string[];
     onesignalAppId: string;
     onesignalRestApiKey: string;
+    appmetricaApiKey?: string;
+    appmetricaAppId?: number;
     webInterfaceName: string;
     generationOptions: IAppGenerationOptions;
     keitaroData: IAppKeitaroData | null;
     integrationVersion: IntegrationVersion;
-    integrationAlterations?: IntegrationAlterations;
-    removeDataParams?: IRemoveDataParams;
-    privacyPolicyParams?: IPrivacyPolicyParams;
     offersStubParams?: IOffersStubParams;
     directParams?: IDirectParams;
     bannerParams?: IBannerParams;
     remoteServerParams?: IRemoteServerParams;
     domainParams: IDomainParams;
-    developerParams: IDeveloperParams;
     platforms: {
         [key: string]: IPlatformParams;
     };
@@ -167,34 +164,23 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
     bundle: string;
     trackingUrl: string;
     geos: string;
-    integrationVersion: string;
     name?: string | undefined;
-    webInterfaceName?: string | undefined;
     pushesEnabled?: boolean | undefined;
-    sourceUrl?: string | undefined;
-    integrationAlterations?: any;
     removeDataParams?: any;
     privacyPolicyParams?: any;
     offersStubParams?: any;
     bannerParams?: any;
     directParams?: any;
-    remoteServerParams?: any;
     platforms?: any;
-    policyUrl?: string | undefined;
     onesignalAppId?: string | undefined;
     onesignalRestApiKey?: string | undefined;
-    linkPath?: string | undefined;
+    appmetricaApiKey?: string | undefined;
+    appmetricaAppId?: number | undefined;
     externalParams?: {
         schema?: string | undefined;
         showButton?: boolean | undefined;
         autoRedirect?: boolean | undefined;
     } | undefined;
-    generationOptions?: {
-        splashName?: string | undefined;
-        webViewName?: string | undefined;
-        linkName?: string | undefined;
-        savedName?: string | undefined;
-    } | undefined;
     keitaroData?: {
         redirectCampaignId: number;
         redirectCampaignName: string;
@@ -206,12 +192,9 @@ export declare const AppSchema: mongoose.Schema<any, mongoose.Model<any, any, an
         trackingCampaignAlias: string;
         trackingDomainId: number;
         trackingDomainName: string;
-        clickIdParameterName?: string | undefined;
-        offerIdParameterName?: string | undefined;
     } | undefined;
     domainParams?: {
         name?: string | undefined;
         clouflareZone?: string | undefined;
     } | undefined;
 }>;
-export declare function updateSchemaAndMoveValue(model: Model<IApp>): Promise<void>;

package/lib/app/app.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSchemaAndMoveValue = exports.AppSchema = exports.PlugType = exports.IntegrationVersion = exports.EPlatform = void 0;
+exports.AppSchema = exports.PlugType = exports.IntegrationVersion = exports.EPlatform = void 0;
 const app_type_1 = require("./app-type");
 const mongoose_1 = require("mongoose");
 const util = require("util");
@@ -52,14 +52,7 @@ exports.AppSchema = new mongoose_1.Schema({
         type: String,
         default: null
     },
-    webInterfaceName: String,
     pushesEnabled: Boolean,
-    sourceUrl: String,
-    policyUrl: {
-        type: String,
-        // unique: true,
-        required: false
-    },
     type: {
         type: String,
         enum: app_type_1.AppType,
@@ -80,34 +73,19 @@ exports.AppSchema = new mongoose_1.Schema({
         type: String,
         required: false
     },
-    linkPath: {
-        type: String
+    appmetricaApiKey: {
+        type: String,
+        required: false
+    },
+    appmetricaAppId: {
+        type: Number,
+        required: false
     },
     externalParams: {
         showButton: Boolean,
         schema: String,
         autoRedirect: Boolean,
     },
-    integrationVersion: {
-        type: String,
-        default: IntegrationVersion.OFFER_STUB,
-        enum: IntegrationVersion
-    },
-    integrationAlterations: Object,
-    generationOptions: {
-        splashName: {
-            type: String,
-        },
-        webViewName: {
-            type: String,
-        },
-        linkName: {
-            type: String,
-        },
-        savedName: {
-            type: String,
-        },
-    },
     keitaroData: {
         redirectCampaignId: {
             type: Number,
@@ -165,15 +143,12 @@ exports.AppSchema = new mongoose_1.Schema({
             required: true,
             default: "none"
         },
-        clickIdParameterName: String,
-        offerIdParameterName: String,
     },
     removeDataParams: Object,
     privacyPolicyParams: Object,
     offersStubParams: Object,
     bannerParams: Object,
     directParams: Object,
-    remoteServerParams: Object,
     domainParams: {
         name: {
             type: String,
@@ -185,51 +160,3 @@ exports.AppSchema = new mongoose_1.Schema({
     },
     platforms: Object
 });
-// TODO app type (casino / fin)
-async function updateSchemaAndMoveValue(model) {
-    await model.syncIndexes();
-    let pipelineStage = [
-        {
-            // $set: {
-            //     city: "$employee_addr.city",
-            //     street: "$employee_addr.street",
-            //     apartment: "$employee_addr.apartment",
-            //     employee_addr: "$$REMOVE"
-            //   },
-            $set: {
-                "plugStatus": "$$REMOVE",
-                "reservePlugStatus": "$$REMOVE",
-            }
-        }
-    ];
-    let aggregation = model.aggregate(pipelineStage);
-    try {
-        await model.collection.dropIndex("plugStatus");
-    }
-    catch (e) { }
-    try {
-        await model.collection.dropIndex("reservePlugStatus");
-    }
-    catch (e) { }
-    // await model.schema.dropIndex("generationOptions.keyPassword_1")
-    await aggregation.exec();
-    const updateOperation = {
-        $set: {
-            plugId: "none"
-        },
-        // $addToSet
-        $unset: [
-            "pastebinUrl",
-            "email",
-            "generationOptions.keyFileName",
-            "generationOptions.keyDeveloperName",
-            "generationOptions.keyDeveloperOrganization",
-            "generationOptions.keyCountryCode",
-            "generationOptions.keyCity",
-            "generationOptions.keyAlias",
-            "generationOptions.keyPassword",
-        ],
-    };
-    await model.updateMany({}, updateOperation);
-}
-exports.updateSchemaAndMoveValue = updateSchemaAndMoveValue;

package/lib/index.d.ts

@@ -8,7 +8,7 @@ export { AppType } from "./app/app-type";
 export { AlternativeLayoutType, AlternativeSourceType, AlternativeLogicType, AlternativeNetworkTool, AlternativeStorageType, AlternativeNavigation, AlternativeOnBackPressed, AlternativeOnActivityResult, IAppIntegration as IFlashIntegration } from "./app/app-integration";
 export { IPanelUser, PanelUserAccessScope, PanelUserSchema } from "./panel/user";
 export { IAuthToken } from "./panel/auth";
-export { IUpsertAppRequest, IUpsertAppResponse } from "./panel/flash/upsert-flash-app-request";
+export { IUpsertAppRequest } from "./panel/flash/upsert-flash-app-request";
 export { IGradient, IStroke, IShape, ShapeDiv } from "./general/shape";
 export { IOfferWallHomeDialogData } from "./offers/offerwall/offerwall-home-dialog-data";
 export { IOfferWallOffer } from "./offers/offerwall/offerwall-offer";

package/lib/panel/flash/upsert-flash-app-request.d.ts

@@ -1,4 +1,4 @@
-import { IAppGenerationOptions, IAppKeitaroData, IBannerParams, IDeveloperParams, IDirectParams, IDomainParams, IExternalParams, IOffersStubParams, IPlatformParams, IPrivacyPolicyParams, IRemoteServerParams, IRemoveDataParams, IntegrationVersion } from "app/app";
+import { IAppKeitaroData, IBannerParams, IDirectParams, IDomainParams, IExternalParams, IOffersStubParams, IPlatformParams, IntegrationVersion } from "app/app";
 export interface IUpsertAppRequest {
     id: number;
     name?: string;
@@ -7,17 +7,12 @@ export interface IUpsertAppRequest {
     enabled?: boolean;
     geos?: string;
     geo?: string;
-    policyUrl?: string;
+    appmetricaApiKey?: string;
+    appmetricaAppId?: number;
     integrationVersion?: IntegrationVersion;
-    webInterfaceName?: string;
-    generationOptions?: Partial<IAppGenerationOptions>;
     keitaroData?: Partial<IAppKeitaroData>;
-    removeDataParams?: IRemoveDataParams;
-    privacyPolicyParams?: IPrivacyPolicyParams;
     offersStubParams?: IOffersStubParams;
     bannerParams?: IBannerParams;
-    developerParams?: IDeveloperParams;
-    remoteServerParams?: IRemoteServerParams;
     domainParams: IDomainParams;
     directParams?: IDirectParams;
     externalParams?: IExternalParams;
@@ -25,9 +20,3 @@ export interface IUpsertAppRequest {
         [key: string]: IPlatformParams;
     };
 }
-export interface IUpsertAppResponse {
-    data: IUpsertAppRequest;
-    linkName: string;
-    archive: string;
-    externalParams?: IExternalParams;
-}

package/lib/utils/keitaro-utils.js

@@ -333,7 +333,7 @@ function createDefenceMainStreamPartialPayload(app) {
         name: "ALL",
         type: "regular",
         action_type: "http",
-        action_payload: app.sourceUrl,
+        action_payload: app.directParams?.path,
         schema: "redirect",
         filter_or: false,
         collect_clicks: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {

package/src/app/app.ts

@@ -12,30 +12,28 @@ export interface IApp extends Document {
     bundle: string
 
     pushesEnabled?: boolean
-    sourceUrl?: string,
     policyUrl?: string
     type: AppType
     geos: string
-    geo: string[]
+    geo: string[] // new one, actual
 
     onesignalAppId: string
     onesignalRestApiKey: string
 
+    appmetricaApiKey?: string
+    appmetricaAppId?: number
+
     webInterfaceName: string
 
     generationOptions: IAppGenerationOptions
     keitaroData: IAppKeitaroData | null
     integrationVersion: IntegrationVersion
-    integrationAlterations?: IntegrationAlterations
 
-    removeDataParams?: IRemoveDataParams
-    privacyPolicyParams?: IPrivacyPolicyParams
     offersStubParams?: IOffersStubParams
     directParams?: IDirectParams,
     bannerParams?: IBannerParams,
     remoteServerParams?: IRemoteServerParams,
     domainParams: IDomainParams
-    developerParams: IDeveloperParams,
     platforms: { [key: string]: IPlatformParams }
 
     offersListId: number
@@ -210,14 +208,8 @@ export const AppSchema = new Schema({
         default: null
     },
 
-    webInterfaceName: String,
     pushesEnabled: Boolean,
-    sourceUrl: String,
-    policyUrl: {
-        type: String,
-        // unique: true,
-        required: false
-    },
+
     type: {
         type: String,
         enum: AppType,
@@ -238,38 +230,21 @@ export const AppSchema = new Schema({
         type: String,
         required: false
     },
-
-    linkPath: {
-        type: String
+    appmetricaApiKey: {
+        type: String,
+        required: false
+    },
+    appmetricaAppId: {
+        type: Number,
+        required: false
     },
+
     externalParams: {
         showButton: Boolean,
         schema: String,
         autoRedirect: Boolean,
     },
 
-    integrationVersion: {
-        type: String,
-        default: IntegrationVersion.OFFER_STUB,
-        enum: IntegrationVersion
-    },
-    integrationAlterations: Object,
-
-    generationOptions: {
-        splashName: {
-            type: String,
-        },
-        webViewName: {
-            type: String,
-        },
-        linkName: {
-            type: String,
-        },
-        savedName: {
-            type: String,
-        },
-    },
-
     keitaroData: {
         redirectCampaignId: {
             type: Number,
@@ -327,16 +302,12 @@ export const AppSchema = new Schema({
             required: true,
             default: "none"
         },
-
-        clickIdParameterName: String,
-        offerIdParameterName: String,
     },
     removeDataParams: Object,
     privacyPolicyParams: Object,
     offersStubParams: Object,
     bannerParams: Object,
     directParams: Object,
-    remoteServerParams: Object,
     domainParams: {
         name: {
             type: String,
@@ -347,50 +318,4 @@ export const AppSchema = new Schema({
         },
     },
     platforms: Object
-})
-
-// TODO app type (casino / fin)
-export async function updateSchemaAndMoveValue(model: Model<IApp>): Promise<void> {
-    await model.syncIndexes()
-    let pipelineStage: PipelineStage[] = [
-        {
-            // $set: {
-            //     city: "$employee_addr.city",
-            //     street: "$employee_addr.street",
-            //     apartment: "$employee_addr.apartment",
-            //     employee_addr: "$$REMOVE"
-            //   },
-            $set: {
-                "plugStatus": "$$REMOVE",
-                "reservePlugStatus": "$$REMOVE",
-            }
-        }
-    ]
-
-    let aggregation = model.aggregate(pipelineStage)
-    try { await model.collection.dropIndex("plugStatus") } catch (e) { }
-    try { await model.collection.dropIndex("reservePlugStatus") } catch (e) { }
-
-    // await model.schema.dropIndex("generationOptions.keyPassword_1")
-    await aggregation.exec()
-
-    const updateOperation: UpdateQuery<IApp> = {
-        $set: {
-            plugId: "none"
-        },
-        // $addToSet
-        $unset: [
-            "pastebinUrl",
-            "email",
-            "generationOptions.keyFileName",
-            "generationOptions.keyDeveloperName",
-            "generationOptions.keyDeveloperOrganization",
-            "generationOptions.keyCountryCode",
-            "generationOptions.keyCity",
-            "generationOptions.keyAlias",
-            "generationOptions.keyPassword",
-        ],
-    };
-
-    await model.updateMany({}, updateOperation);
-}
+})

package/src/index.ts

@@ -11,7 +11,7 @@ export { AlternativeLayoutType, AlternativeSourceType, AlternativeLogicType, Alt
 
 export { IPanelUser, PanelUserAccessScope, PanelUserSchema } from "./panel/user"
 export { IAuthToken } from "./panel/auth"
-export { IUpsertAppRequest, IUpsertAppResponse } from "./panel/flash/upsert-flash-app-request"
+export { IUpsertAppRequest } from "./panel/flash/upsert-flash-app-request"
 
 export { IGradient, IStroke, IShape, ShapeDiv } from "./general/shape"
 export { IOfferWallHomeDialogData } from "./offers/offerwall/offerwall-home-dialog-data"

package/src/panel/flash/upsert-flash-app-request.ts

@@ -13,30 +13,16 @@ export interface IUpsertAppRequest {
     // onesignalAppId: string
     // onesignalRestApiKey: string
 
-    policyUrl?: string,
+    appmetricaApiKey?: string
+    appmetricaAppId?: number
 
     integrationVersion?: IntegrationVersion,
 
-    webInterfaceName?: string,
-    generationOptions?: Partial<IAppGenerationOptions>
     keitaroData?: Partial<IAppKeitaroData>,
-    removeDataParams?: IRemoveDataParams,
-    privacyPolicyParams?: IPrivacyPolicyParams,
     offersStubParams?: IOffersStubParams,
     bannerParams?: IBannerParams,
-    developerParams?: IDeveloperParams,
-    remoteServerParams?: IRemoteServerParams,
     domainParams: IDomainParams,
     directParams?: IDirectParams,
     externalParams?: IExternalParams,
     platforms: { [key: string]: IPlatformParams },
-    
-}
-
-export interface IUpsertAppResponse {
-    data: IUpsertAppRequest,
-    linkName: string,
-    archive: string,
-    externalParams?: IExternalParams,
-}
-
+}

package/src/utils/keitaro-utils.ts

@@ -368,7 +368,7 @@ function createDefenceMainStreamPartialPayload(app: IApp): Partial<IKeitaroStrea
         name: "ALL",
         type: "regular",
         action_type: "http",
-        action_payload: app.sourceUrl,
+        action_payload: app.directParams?.path,
         schema: "redirect",
         filter_or: false,
         collect_clicks: true,