Revert "[PB-2228]: feat/real time changes apn"

.env.template

@@ -39,9 +39,3 @@ STORJ_BRIDGE=http://network-api:6382
 STRIPE_SK=sk_test_F3Ny2VGUnPga9FtyXkl7mzPc
 STRIPE_SK_TEST=sk_test_R3Ny2VG7nPgeJFrtXdt8mrPc
 SENDGRID_MODE_SANDBOX=false
-
-# APN
-APN_BUNDLE_ID=
-APN_TEAM_ID=
-APN_KEY_ID=
-APN_SECRET=

src/app/models/index.ts

@@ -26,7 +26,6 @@ import initLimit, { LimitModel } from './limit';
 import initTier, { TierModel } from './tier';
 import initPaidPlan, { PaidPlansModel } from './paidPlans';
 import initTierLimit, { TierLimitsModel } from './tierLimit';
-import initUserNotificationTokens, { UserNotificationTokenModel } from './userNotificationTokens';
 
 export type ModelType =
   | AppSumoModel
@@ -54,8 +53,7 @@ export type ModelType =
   | PaidPlansModel
   | TierLimitsModel
   | LimitModel
-  | TierModel
-  | UserNotificationTokenModel;
+  | TierModel;
 
 export default (database: Sequelize) => {
   const AppSumo = initAppSumo(database);
@@ -84,7 +82,6 @@ export default (database: Sequelize) => {
   const Tier = initTier(database);
   const PaidPlans = initPaidPlan(database);
   const TierLimit = initTierLimit(database);
-  const UserNotificationToken = initUserNotificationTokens(database);
 
   AppSumo.belongsTo(User);
 
@@ -135,7 +132,6 @@ export default (database: Sequelize) => {
   User.hasMany(PrivateSharingFolder, { foreignKey: 'shared_with', sourceKey: 'uuid' });
   User.hasMany(Sharings, { foreignKey: 'owner_id', sourceKey: 'uuid' });
   User.hasMany(Sharings, { foreignKey: 'shared_with', sourceKey: 'uuid' });
-  User.hasMany(UserNotificationToken, { foreignKey: 'userId', sourceKey: 'uuid' });
 
   UserReferral.belongsTo(User, { foreignKey: 'user_id' });
   UserReferral.belongsTo(Referral, { foreignKey: 'referral_id' });
@@ -174,8 +170,6 @@ export default (database: Sequelize) => {
     as: 'tiers',
   });
 
-  UserNotificationToken.belongsTo(User, { foreignKey: 'userId', targetKey: 'uuid' });
-
   return {
     [AppSumo.name]: AppSumo,
     [Backup.name]: Backup,
@@ -203,6 +197,5 @@ export default (database: Sequelize) => {
     [Limit.name]: Limit,
     [PaidPlans.name]: PaidPlans,
     [TierLimit.name]: TierLimit,
-    ['userNotificationToken']: UserNotificationToken,
   };
 };

src/app/routes/routes.ts

@@ -25,15 +25,13 @@ import * as ReCaptchaV3 from '../../lib/recaptcha';
 import * as AnalyticsService from '../../lib/analytics/AnalyticsService';
 import { AuthorizedUser } from './types';
 import { default as Notifications } from '../../config/initializers/notifications';
-import { default as Apn } from '../../config/initializers/apn';
 
 const Logger = logger.getInstance();
 
 export default (router: Router, service: any, App: any): Router => {
   service.Analytics = AnalyticsService;
   service.ReCaptcha = ReCaptchaV3;
   service.Notifications = Notifications.getInstance();
-  service.Apn = Apn.getInstance();
 
   AuthRoutes(router, service, App.config);
   ActivationRoutes(router, service);
@@ -109,7 +107,7 @@ export default (router: Router, service: any, App: any): Router => {
       if (!userData.root_folder_id) {
         throw createHttpError(500, 'Account can not be initialized');
       }
-
+  
       const user = {
         email: userData.email,
         bucket: userData.bucket,
@@ -123,9 +121,13 @@ export default (router: Router, service: any, App: any): Router => {
       res.status(200).send({ user });
     } catch (err) {
       Logger.error(
-        `[AUTH/INITIALIZE] ERROR: ${(err as Error).message}, BODY ${JSON.stringify(req.body)}, STACK: ${
+        `[AUTH/INITIALIZE] ERROR: ${
+          (err as Error).message
+        }, BODY ${
+          JSON.stringify(req.body)
+        }, STACK: ${
           (err as Error).stack
-        }`,
+        }`
       );
 
       return res.status(500).send({ error: 'Internal Server Error' });