Merge branch 'main' into vkarpov15/remove-email

osohq · Aug 23, 2024 · 68cdfb2 · 68cdfb2
2 parents a9e4e11 + ef35b7d
commit 68cdfb2
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 52 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -16,6 +16,6 @@ module.exports = {
   rules: {
     'comma-dangle': 'off',
     'space-before-function-paren': 'off',
-    'eol-last': 'warn'
+    'eol-last': 'warn',
   },
 };
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -24,3 +24,22 @@ jobs:
 
       - run: npm install
       - run: npm run lint
+
+  prettier:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [18]
+        os: [ubuntu-20.04]
+    name: Prettier
+    steps:
+      - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3
+
+      - name: Setup node
+        uses: actions/setup-node@5b52f097d36d4b0b2f94ed6de710023fbb8b2236 # v3.1.0
+        with:
+          node-version: ${{ matrix.node }}
+
+      - run: npm install
+      - run: npm run prettier -- --check
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "printWidth": 80,
+  "singleQuote": true
+}
diff --git a/oso.js b/oso.js
@@ -6,8 +6,9 @@ const assert = require('assert');
 const apiKey = process.env.OSO_CLOUD_API_KEY;
 assert.ok(apiKey, 'Must set OSO_CLOUD_API_KEY environment variable');
 
-const oso = process.env.NODE_ENV === 'test'
-  ? new Oso('http://localhost:8080', apiKey)
-  : new Oso('https://cloud.osohq.com', apiKey, { debug: { print: true } });
+const oso =
+  process.env.NODE_ENV === 'test'
+    ? new Oso('http://localhost:8080', apiKey)
+    : new Oso('https://cloud.osohq.com', apiKey, { debug: { print: true } });
 
 module.exports = oso;
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
     "tailwind:watch": "tailwindcss -o ./public/style.css --watch",
     "dev": "next dev",
     "build": "next build",
+    "prettier": "prettier --write ./src ./test ./backend ./db ./pages ./index.js ./build.js ./levels.js ./oso.js ./webpack.config.js",
     "start": "next start",
     "test": "mocha ./test/*.test.js"
   },
@@ -32,6 +33,7 @@
     "@mongoosejs/studio": "0.0.22",
     "dotenv": "16.4.5",
     "mocha": "10.4.0",
+    "prettier": "3.3.3",
     "sinon": "18.0.0"
   }
 }
diff --git a/src/api.js b/src/api.js
@@ -2,8 +2,13 @@
 
 const axios = require('axios');
 
-const client = typeof API_URL === 'undefined' ? axios.create() : axios.create({
-  baseURL: API_URL
-});
+let client = null;
+if (typeof API_URL === 'undefined') {
+  client = axios.create();
+} else {
+  client = axios.create({
+    baseURL: API_URL,
+  });
+}
 
 module.exports = client;
diff --git a/src/components.js b/src/components.js
@@ -1,6 +1,6 @@
 'use strict';
 
-  // This file is auto-generated. Do not modify this file directly.
+// This file is auto-generated. Do not modify this file directly.
 exports['add-role-fact'] = require('./add-role-fact/add-role-fact.js');
 exports['app-component'] = require('./app-component/app-component.js');
 exports['async-button'] = require('./async-button/async-button.js');
@@ -11,4 +11,4 @@ exports['modal'] = require('./modal/modal.js');
 exports['oso-footer'] = require('./oso-footer/oso-footer.js');
 exports['scorecard'] = require('./scorecard/scorecard.js');
 exports['share'] = require('./share/share.js');
-exports['splash-screen'] = require('./splash-screen/splash-screen.js');
+exports['splash-screen'] = require('./splash-screen/splash-screen.js');
diff --git a/src/index.js b/src/index.js
@@ -4,8 +4,9 @@ const components = require('./components');
 const levels = require('../levels');
 const vanillatoasts = require('vanillatoasts');
 
-const sessionId = window.localStorage.getItem('_gitclubGameSession')
-  || [...Array(30)].map(() => Math.random().toString(36)[2]).join('');
+const sessionId =
+  window.localStorage.getItem('_gitclubGameSession') ||
+  [...Array(30)].map(() => Math.random().toString(36)[2]).join('');
 window.localStorage.setItem('_gitclubGameSession', sessionId);
 
 window.setLevel = require('./_methods/setLevel');

diff --git a/src/level/level.js b/src/level/level.js
@@ -75,14 +75,21 @@ module.exports = (app) =>
       },
       deleteInProgress: false,
       showDeleteAllModal: false,
-      highlightedCode: []
+      highlightedCode: [],
     }),
     template,
     computed: {
       polarCode() {
-        return this.highlightedCode.map(line => {
-          return line.map(chunk => `<span style="${stringifyStyle(chunk.style)}">${chunk.content}</span>`).join('');
-        }).join('\n');
+        return this.highlightedCode
+          .map((line) => {
+            return line
+              .map(
+                (chunk) =>
+                  `<span style="${stringifyStyle(chunk.style)}">${chunk.content}</span>`,
+              )
+              .join('');
+          })
+          .join('\n');
       },
       allResources() {
         let ret = ['Organization', 'Repository', 'User'];
@@ -177,9 +184,13 @@ module.exports = (app) =>
           this.roleFact.role = null;
         }
       },
-      'state.currentLevel': async function(currentLevel) {
+      'state.currentLevel': async function (currentLevel) {
         this.highlightedCode = [];
-        const result = await lighter.highlight(currentLevel.polarCode, 'polar', 'github-light');
+        const result = await lighter.highlight(
+          currentLevel.polarCode,
+          'polar',
+          'github-light',
+        );
         this.highlightedCode = result.lines;
       },
     },
@@ -219,7 +230,7 @@ module.exports = (app) =>
           resourceType,
           ...this.attributeFact,
         });
-        
+
         this.attributeFact = {
           resourceId: null,
           attribute: null,
@@ -304,7 +315,9 @@ function stringifyStyle(obj) {
   if (obj == null) {
     return '';
   }
-  return Object.entries(obj).map(([key, value]) => {
-    return `${key}:${value}`;
-  }).join(';');
+  return Object.entries(obj)
+    .map(([key, value]) => {
+      return `${key}:${value}`;
+    })
+    .join(';');
 }
diff --git a/test/e2e.test.js b/test/e2e.test.js
@@ -13,27 +13,30 @@ const oso = require('../oso');
 const levels = require('../levels');
 const { renderToString } = require('vue/server-renderer');
 
-const policy = require('fs').readFileSync(`${__dirname}/../src/policy.polar`, 'utf8');
+const policy = require('fs').readFileSync(
+  `${__dirname}/../src/policy.polar`,
+  'utf8',
+);
 
-describe('e2e test', function() {
+describe('e2e test', function () {
   let appInstance = null;
   let server = null;
   let state = null;
 
-  before(async function() {
+  before(async function () {
     await connect();
     await Player.deleteMany({});
   });
 
-  before(async function() {
+  before(async function () {
     state = reactive({
       sessionId: 'e2eTest',
       level: 0,
       currentLevel: levels[0],
       facts: [],
       results: [],
       constraints: levels[0].constraints,
-      showNextLevelButton: true
+      showNextLevelButton: true,
     });
     const app = createSSRApp({
       data: () => ({}),
@@ -43,24 +46,24 @@ describe('e2e test', function() {
       },
       setup() {
         provide('state', state);
-      }
+      },
     });
     for (const component of Object.values(components)) {
       component(app);
     }
     await renderToString(app);
   });
 
-  before(async function() {
+  before(async function () {
     await oso.policy(policy);
 
     const app = express();
     app.use(express.json());
     for (const endpoint of Object.keys(backend)) {
-      app.all(`/api/${kebabize(endpoint)}`, function(req, res) {
+      app.all(`/api/${kebabize(endpoint)}`, function (req, res) {
         backend[endpoint]({ ...req.body, ...req.query })
-          .then(result => res.json(result))
-          .catch(err => {
+          .then((result) => res.json(result))
+          .catch((err) => {
             console.error(err);
             res.status(500).json({ message: err.message });
           });
@@ -69,17 +72,19 @@ describe('e2e test', function() {
     server = await app.listen(3000);
   });
 
-  after(async function() {
+  after(async function () {
     await server.close();
   });
 
-  it('can complete first level', async function() {
+  it('can complete first level', async function () {
     this.timeout(10000);
 
     const appComponent = appInstance.$options.$children[0];
-    
+
     // Complete splash screen
-    const splashScreenComponent = appComponent.$options.$children.find(el => el.$options.name === 'splash-screen');
+    const splashScreenComponent = appComponent.$options.$children.find(
+      (el) => el.$options.name === 'splash-screen',
+    );
     splashScreenComponent.name = 'John Smith';
     await splashScreenComponent.startGame();
     assert.strictEqual(state.level, 1);
@@ -90,20 +95,24 @@ describe('e2e test', function() {
         action: 'read',
         resourceType: 'Organization',
         resourceId: 'osohq',
-        pass: false
+        pass: false,
       },
       {
         userId: 'Anthony',
         action: 'add_member',
         resourceType: 'Organization',
         resourceId: 'osohq',
-        pass: false
-      }
+        pass: false,
+      },
     ]);
 
     // Add first fact
-    const levelComponent = appComponent.$options.$children.find(el => el.$options.name === 'level');
-    const addRoleFactComponent = levelComponent.$options.$children.find(el => el.$options.name === 'add-role-fact');
+    const levelComponent = appComponent.$options.$children.find(
+      (el) => el.$options.name === 'level',
+    );
+    const addRoleFactComponent = levelComponent.$options.$children.find(
+      (el) => el.$options.name === 'add-role-fact',
+    );
 
     addRoleFactComponent.userId = 'Alice';
     addRoleFactComponent.role = 'admin';
@@ -118,15 +127,15 @@ describe('e2e test', function() {
         action: 'read',
         resourceType: 'Organization',
         resourceId: 'osohq',
-        pass: true
+        pass: true,
       },
       {
         userId: 'Anthony',
         action: 'add_member',
         resourceType: 'Organization',
         resourceId: 'osohq',
-        pass: false
-      }
+        pass: false,
+      },
     ]);
     assert.ok(!state.showNextLevelButton);
 
@@ -144,15 +153,15 @@ describe('e2e test', function() {
         action: 'read',
         resourceType: 'Organization',
         resourceId: 'osohq',
-        pass: true
+        pass: true,
       },
       {
         userId: 'Anthony',
         action: 'add_member',
         resourceType: 'Organization',
         resourceId: 'osohq',
-        pass: true
-      }
+        pass: true,
+      },
     ]);
     assert.ok(state.showNextLevelButton);
 
@@ -165,32 +174,36 @@ describe('e2e test', function() {
         action: 'read',
         resourceType: 'Organization',
         resourceId: 'osohq',
-        pass: false
+        pass: false,
       },
       {
         userId: 'Bob',
         action: 'add_member',
         resourceType: 'Organization',
         resourceId: 'osohq',
-        pass: false
+        pass: false,
       },
       {
         userId: 'Bill',
         action: 'read',
         resourceType: 'Organization',
         resourceId: 'osohq',
-        pass: false
+        pass: false,
       },
       {
         userId: 'Bill',
         action: 'add_member',
         resourceType: 'Organization',
         resourceId: 'osohq',
         pass: true,
-        shouldFail: true
-      }
+        shouldFail: true,
+      },
     ]);
   });
 });
 
-const kebabize = (str) => str.replace(/[A-Z]+(?![a-z])|[A-Z]/g, ($, ofs) => (ofs ? '-' : '') + $.toLowerCase());
+const kebabize = (str) =>
+  str.replace(
+    /[A-Z]+(?![a-z])|[A-Z]/g,
+    ($, ofs) => (ofs ? '-' : '') + $.toLowerCase(),
+  );