feat(jsbattle-webpage): add OAuth integration

Author: jamro

.gitignore

@@ -82,4 +82,6 @@ temp
 dist
 
 #others
-.vscode
+.vscode
+
+.jsbattle.config.json

packages/jsbattle-admin/features/step_definitions/navi_steps.js

@@ -48,7 +48,8 @@ BeforeAll(async function () {
       port: 8071,
       public: './dist',
       authorized: true,
-      silent: true
+      silent: true,
+      rootUrl: '/admin'
     });
   }
 });

packages/jsbattle-mockserver/app/MockServer.js

@@ -24,6 +24,7 @@ class MockServer {
       options = options || {};
       let port = options.port || 8080;
       let publicDir = options.public || './public';
+      let rootUrl = options.rootUrl || '/';
       let serverDelay = options.serverDelay || 0;
       let silent = !!(options.silent);
 
@@ -64,15 +65,15 @@ class MockServer {
       server.use('/', express.static(publicDir));
       server.use(bodyParser.urlencoded({ extended: true }))
       server.use(bodyParser.json())
-      server.get('/auth/logout', function (req, res) {
+      server.get('/auth/logout', (req, res) => {
         this._log("Logout");
         authorized = false;
-        res.redirect('/admin')
+        res.redirect(rootUrl)
       })
-      server.get('/auth/:provider', function (req, res) {
+      server.get('/auth/:provider', (req, res) => {
         this._log("Authorized");
         authorized = true;
-        res.redirect('/admin')
+        res.redirect(rootUrl)
       })
 
       server.use((req, res, next) => {
@@ -119,8 +120,6 @@ class MockServer {
         "/api/profile": "/profile",
         "/api/:a/:b": "/:a,:b",
         "/api/*": "/$1"
-
-
       }))
       server.use(router)
 

packages/jsbattle-mockserver/app/cli.js

@@ -3,9 +3,21 @@ const MockServer = require('./MockServer.js');
 
 let server = new MockServer();
 
+
+
+console.log(process.argv);
+let port = 8080;
+for(let i=0; i < process.argv.length; i++) {
+  if(process.argv[i] == '--port') {
+    i++
+    port = process.argv[i];
+  }
+}
+
 server.start({
-  port: 8080,
+  port: port,
   public: './dist',
   authorized: false,
   serverDelay: 100,
+  rootUrl: '/'
 });

packages/jsbattle-mockserver/app/db.json

@@ -185,9 +185,9 @@
     }
   ],
   "authMethods": {
-      "github":   {"name": "GitHub", "url": "../auth/github"},
-      "facebook": {"name": "Facebook", "url": "../auth/facebook"},
-      "google":   {"name": "Google", "url": "../auth/google"}
+      "github":   {"name": "GitHub", "url": "/auth/github"},
+      "facebook": {"name": "Facebook", "url": "/auth/facebook"},
+      "google":   {"name": "Google", "url": "/auth/google"}
   },
   "profile": {
     "id": "8si8Su024sj2cZwo0",

packages/jsbattle-server/app/services/ApiGateway.service.js

@@ -100,6 +100,9 @@ class ApiGatewayService extends Service {
 
         if(broker.serviceConfig.auth.enabled == false) {
           this.logger.warn('Auth is disabled. Everyone can access admin panel. The configuration is not recommended for production purposes');
+          this.app.get(`/auth/logout`, (req, res) => {
+            res.redirect('/');
+          });
         } else {
           configPassport(this.app, this.logger, broker);
         }

packages/jsbattle-server/app/services/apiGateway/configPassport.js

@@ -39,7 +39,7 @@ function configPassport(app, logger, broker) {
       `/auth/logout`,
       (req, res) => {
         res.cookie('JWT_TOKEN', '', { httpOnly: true, maxAge: 0 })
-        res.redirect('/admin');
+        res.redirect('/');
       }
     );
     app.get(`/auth/${provider.name}`, passport.authenticate(provider.name, { scope: 'email' }));
@@ -51,7 +51,7 @@ function configPassport(app, logger, broker) {
         let response = await broker.call('auth.authorize', { user });
         broker.emit("user.login", user.id);
         res.cookie('JWT_TOKEN', response.token, { httpOnly: true, maxAge: 24*60*60*1000 })
-        res.redirect('/admin');
+        res.redirect('/');
       }
     );
     logger.info(`Authorization strategy added: Log in at ${broker.serviceConfig.web.baseUrl}/auth/${provider.name}`);

packages/jsbattle-webpage/package-lock.json

@@ -27,7 +27,7 @@
     "test:smoke": "cucumber-js -t @smoke -f ./features/support/SimpleFormatter.js --retry 3 --fail-fast --world-parameters '{\"mockserver\": true}'",
     "analyse": "webpack --profile --json --config ./webpack.config.js > bundle_stats.json && webpack-bundle-analyzer bundle_stats.json",
     "watch": "npm-watch",
-    "serve": "jsbattle-mock",
+    "serve": "jsbattle-mock --port 8081",
     "start:dev": "webpack-dev-server --config ./webpack.config.js --mode=development"
   },
   "keywords": [],

packages/jsbattle-webpage/package.json

@@ -40,3 +40,9 @@ export const STATS_SANDBOX_EDIT = 'STATS_SANDBOX_EDIT';
 export const STATS_CHALLENGE_LIST_OPEN = 'STATS_CHALLENGE_LIST_OPEN';
 export const STATS_CHALLENGE_COMPLETE = 'STATS_CHALLENGE_COMPLETE';
 export const STATS_CHALLENGE_OPEN = 'STATS_CHALLENGE_OPEN';
+export const AUTH_METHODS_REQUEST = 'AUTH_METHODS_REQUEST';
+export const AUTH_METHODS_SUCCESS = 'AUTH_METHODS_SUCCESS';
+export const AUTH_METHODS_FAILURE = 'AUTH_METHODS_FAILURE';
+export const USER_PROFILE_REQUEST = 'USER_PROFILE_REQUEST';
+export const USER_PROFILE_SUCCESS = 'USER_PROFILE_SUCCESS';
+export const USER_PROFILE_FAILURE = 'USER_PROFILE_FAILURE';