Updated Email Validation redirections, removed "write_public" scope f…

…rom Pinterest. Updated Facebook Scopes and Validation updated fro deleting main Account. added validation of page count due to change in scope while login through Facebook Updated for Instagram business account adding config. Updated Facebook Image post with Link modifications in Pinterest view feeds,team report and passwords(eye). Updated Mail-sender to socioboard, updated Instagram business permissions. worked on team reports issue. (Facebook and Instagram) Updated reports Validations. Updated Instagram business page adding Permissions. Updated Accounts unlock validations. Updated Schedule validations. Updated View Icons in log-in , sign-up and in change-password places, Removed Icon in Main page.
socioboard · Nov 15, 2019 · a42633b · a42633b
1 parent 4839e55
commit a42633b
Show file tree

Hide file tree

Showing 87 changed files with 5,995 additions and 4,262 deletions.
diff --git a/README.md b/README.md
@@ -109,4 +109,3 @@ Socioboard comes up with two version. They are
 	* [Socioboard-4.0 API](https://github.com/socioboard/Socioboard-4.0/tree/master/socioboard-api)
 
 	* [Socioboard-4.0 PHP](https://github.com/socioboard/Socioboard-4.0/tree/master/socioboard-web-php)
-
diff --git a/socioboard-api/feeds/package.json b/socioboard-api/feeds/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "test": "jest --watchAll",
     "startdev": "pm2 start ecosystem.config.js --env=apidevelopment",
-    "startphpdev": "pm2 start ecosystem.config.js --env=phpdev"
+    "startphpdev": "pm2 start ecosystem.config.js --env=phpdev",
+    "start": "pm2 start ecosystem.config.js --env=production"
   },
   "keywords": [],
   "author": "",
@@ -36,4 +37,4 @@
   "devDependencies": {
     "jest": "^24.7.1"
   }
-}
+}
diff --git a/socioboard-api/feeds/public/explorer/index.html b/socioboard-api/feeds/public/explorer/index.html
@@ -1,45 +1,42 @@
 <!-- HTML for static distribution bundle build -->
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <title>Socioboard Api</title>
-    <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
-    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
-    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
-    <style>
-      html
-      {
-        box-sizing: border-box;
-        overflow: -moz-scrollbars-vertical;
-        overflow-y: scroll;
-      }
 
-      *,
-      *:before,
-      *:after
-      {
-        box-sizing: inherit;
-      }
+<head>
+  <meta charset="UTF-8">
+  <title>Socioboard Api</title>
+  <link rel="stylesheet" type="text/css" href="./swagger-ui.css">
+  <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+  <style>
+    html {
+      box-sizing: border-box;
+      overflow: -moz-scrollbars-vertical;
+      overflow-y: scroll;
+    }
 
-      body
-      {
-        margin:0;
-        background: #fafafa;
-      }
-    </style>
-  </head>
+    *,
+    *:before,
+    *:after {
+      box-sizing: inherit;
+    }
 
-  <body>
-    <div id="swagger-ui"></div>  
-    <script src="./swagger-ui-bundle.js"> </script>
-    <script src="./swagger-ui-standalone-preset.js"> </script>
-    <script>
-    window.onload = function() {
+    body {
+      margin: 0;
+      background: #fafafa;
+    }
+  </style>
+</head>
+
+<body>
+  <div id="swagger-ui"></div>
+  <script src="./swagger-ui-bundle.js"> </script>
+  <script src="./swagger-ui-standalone-preset.js"> </script>
+  <script>
+    window.onload = function () {
       // Begin Swagger UI call region
       const ui = SwaggerUIBundle({
-        // url: 'http://localhost:3002/feedservices.json',
-         url: 'https://nodefeeds.socioboard.com/feedservices.json',
+        url: 'http://localhost:3003/feedservices.json',
         dom_id: '#swagger-ui',
         deepLinking: true,
         presets: [
@@ -55,5 +52,6 @@
       window.ui = ui
     }
   </script>
-  </body>
-</html>
+</body>
+
+</html>
diff --git a/socioboard-api/library/mixins/userteamaccount.js b/socioboard-api/library/mixins/userteamaccount.js
@@ -7,6 +7,7 @@ const lodash = require('lodash');
 
 const socialAccount = db.social_accounts;
 const userDetails = db.user_details;
+const userActivation = db.user_activations;
 const userTeamJoinTable = db.join_table_users_teams;
 const teamSocialAccountJoinTable = db.join_table_teams_social_accounts;
 const accountFeedsUpdateTable = db.social_account_feeds_updates;
@@ -484,8 +485,37 @@ const UserTeamAccount = {
                     })
             }
         })
-    }
+    },
 
+    getUserDetails(userId) {
+        return new Promise((resolve, reject) => {
+            if (!userId) {
+                reject({ error: true, message: "Invalid userId" });
+            } else {
+                return userDetails.findOne({
+                    where: {
+                        user_id: Number(userId)
+                    },
+                    attributes: ['user_id', 'email', 'phone_no', 'first_name', 'last_name', 'date_of_birth', 'phone_code', 'about_me', 'profile_picture', 'is_account_locked', 'is_admin_user'],
+                    include: [{
+                        model: userActivation,
+                        as: "Activations",
+                        where: { id: db.Sequelize.col('user_activation_id') },
+                        attributes: ['id', 'last_login', 'user_plan', 'payment_type', 'account_expire_date', 'signup_type', 'activation_status', 'activate_2step_verification', 'shortenStatus', 'email_validate_token', 'forgot_password_validate_token', 'forgot_password_token_expire', 'otp_token', 'otp_token_expire']
+                    }]
+                })
+                    .then((userDetails) => {
+                        if (!userDetails)
+                            reject({ error: true, message: "User not found!" });
+                        else
+                            resolve(userDetails);
+                    })
+                    .catch((error) => {
+                        reject(error);
+                    });
+            }
+        });
+    }
 
 };
 

diff --git a/socioboard-api/library/network/facebook.js b/socioboard-api/library/network/facebook.js
@@ -960,7 +960,7 @@ Facebook.prototype.getFbProfileStats = function (accessToken) {
                     var parsedData = JSON.parse(body);
                     var updateDetail = {
                         friendship_count: parsedData.friends.summary.total_count,
-                        page_count: parsedData.accounts.summary.total_count,
+                        page_count: 0 || parsedData.accounts.summary.total_count,
                         //group_count: parsedData.TotalGroups, // not getting summary data                    
                         profile_picture: `https://graph.facebook.com/${parsedData.id}/picture?type=large`
                     };