Merge pull request #27 from app-generator/step4/support-for-react

Added support for frontend

Author: app-generator

.env.sample

@@ -0,0 +1,6 @@
+PORT=5000
+GITHUB_OAUTH_CLIENT_ID=
+GITHUB_OAUTH_CLIENT_SECRET=
+GITHUB_OAUTH_REDIRECT_URL=
+SQLITE_PATH=./database.db
+SECRET=

GITHUB_AUTH.md

@@ -0,0 +1,14 @@
+# Github Authorization
+Follow the below steps to implement GitHub OAuth in your nodejs app
+
+- Create OAuth App on github and get client_id and client_secret. Also specify OAuth callback url in OAuth App
+
+- Save client_id, client_secret and callback url values in .env file (get help from .env.sample file)
+
+- Create a frontend part (using template engine or any other library) to enable click to precede github OAuth
+
+- Also save the secrets on frontend part
+
+- On clicking github OAuth button it would redirect to github for authorization
+
+- On successful authorization it would redirect back to callback url

README.md

@@ -203,6 +203,21 @@ authorization: JWT_TOKEN (returned by Login request)
 
 <br />
 
+## ✨ Update role for existing user
+
+Using npm: 
+
+```npm run update-role [user_id] [role_id (optional)]```
+
+Using yarn: 
+
+```npm run update-role [user_id] [role_id (optional)]```
+
+- [user_id] is the id of existing user to update role for.
+- [role_id] is the id of role: 1 for admin & 2 for user. If you don't provide any role_id it would update user to admin role.
+
+<br />
+
 ## ✨ Run the Tests
 
 ```yarn test```

package.json

@@ -17,7 +17,8 @@
         "lint": "eslint src --ext .ts",
         "build": "tsc -p tsconfig.build.json",
         "typecheck": "tsc --noEmit",
-        "typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js"
+        "typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js",
+        "update-role": "ts-node-dev src/update-role.ts"
     },
     "dependencies": {
         "axios": "^1.2.0",

src/controllers/auth.controller.ts

@@ -5,21 +5,15 @@ import {
   } from '../services/session.service';
 import { createUserWithToken } from '../services/user.service';
 
-const frontend_url = process.env.FRONTEND_URL ?? '/'
-
 export const githubOauthHandler = async (
     req: Request,
     res: Response,
   ) => {
     try {
       const code = req.query.code as string;
 
-      if (req.query.error) {
-        return res.redirect(`${frontend_url}/login`);
-      }
-  
       if (!code) {
-        console.log('authorization code not provided')
+        return res.json({error: 'authorization code not provided'})
       }
 
       // Get access_token using code
@@ -29,11 +23,8 @@ export const githubOauthHandler = async (
       const userData = await getGithubUser({access_token});
 
       const returnedUser = await createUserWithToken(userData)
-      if(returnedUser) {
-        res.redirect(frontend_url);
-      }else {
-        res.json({error: 'no user returned'})
-      }
+      
+      res.json({user: returnedUser})
 
     } catch (err: any) {
       res.json({'error': err.message})

src/controllers/logout.controller.ts

@@ -0,0 +1,13 @@
+import ActiveSession from '../models/activeSession';
+import { connection } from '../server/database';
+
+export const logoutUser = (req: any, res: any) => {
+    const { token } = req.body;
+    const activeSessionRepository = connection!.getRepository(ActiveSession);
+  
+    activeSessionRepository.delete({ token })
+      .then(() => res.json({ success: true }))
+      .catch(() => {
+        res.json({ success: false, msg: 'Token revoked' });
+      });
+  }

src/routes/users.ts

@@ -12,6 +12,7 @@ import { checkToken } from '../config/safeRoutes';
 import ActiveSession from '../models/activeSession';
 import User from '../models/user';
 import { connection } from '../server/database';
+import { logoutUser } from '../controllers/logout.controller';
 
 // eslint-disable-next-line new-cap
 const router = express.Router();
@@ -115,16 +116,7 @@ router.post('/login', (req, res) => {
   });
 });
 
-router.post('/logout', checkToken, (req, res) => {
-  const { token } = req.body;
-  const activeSessionRepository = connection!.getRepository(ActiveSession);
-
-  activeSessionRepository.delete({ token })
-    .then(() => res.json({ success: true }))
-    .catch(() => {
-      res.json({ success: false, msg: 'Token revoked' });
-    });
-});
+router.post('/logout', checkToken, logoutUser);
 
 router.post('/checkSession', checkToken, (_req, res) => {
   res.json({ success: true });

src/update-role.ts

@@ -0,0 +1,28 @@
+import "dotenv/config";
+import User from "./models/user";
+import { connection, connect } from "./server/database";
+const userId = process.argv[2];
+const updatedRole = process.argv[3] ?? "1";
+
+const updateUser = async () => {
+  await connect();
+  const userRepository = connection!.getRepository(User);
+  userRepository.find({ id: userId }).then((user: any) => {
+    if (!user.length) {
+      console.error( "No user exists with the given id" )
+      return;
+    }
+    const query = { id: user[0].id };
+    const newValues = { user_role: updatedRole };
+    userRepository
+      .update(query, newValues)
+      .then(() => console.log(`User updated successfully with role ${newValues.user_role}`)
+      )
+      .catch((err) => console.error(`error in updating user: ${err.message}`)
+      );
+  })
+  .catch((err) =>  console.log(`error: ${err.message}`)
+  )
+};
+
+updateUser();