@cocreate/authenticate 1.0.4 → 1.0.6

package/.github/workflows/automated.yml

@@ -42,19 +42,42 @@ jobs:
             new_release_published: "${{ steps.semantic.outputs.new_release_published }}"
             new_release_version: "${{ steps.semantic.outputs.new_release_version }}"
 
-    docs:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v3
-            - name: setup nodejs
-              uses: actions/setup-node@v3
-              with:
-                  node-version: 16
-            - name: update documentation
-              uses: CoCreate-app/CoCreate-docs@master
-              env:
-                organization_id: ${{ secrets.COCREATE_ORGANIZATION_ID }}
-                key: ${{ secrets.COCREATE_KEY }}
-                host: ${{ secrets.COCREATE_HOST }}
+    upload:
+      runs-on: ubuntu-latest
+
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+
+        - name: Setup Node.js
+          uses: actions/setup-node@v3
+          with:
+            node-version: 16
+
+        - name: Get Environment Variables
+          run: |
+            echo "organization_id=${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV
+            echo "key=${{ secrets.COCREATE_KEY }}" >> $GITHUB_ENV
+            echo "host=${{ secrets.COCREATE_HOST }}" >> $GITHUB_ENV
+
+        - name: Install @cocreate/cli
+          run: npm install -g @cocreate/cli
+
+        - name: CoCreate CLI Upload
+          run: coc upload
 
+    # docs:
+    #     runs-on: ubuntu-latest
+    #     steps:
+    #         - name: Checkout
+    #           uses: actions/checkout@v3
+    #         - name: setup nodejs
+    #           uses: actions/setup-node@v3
+    #           with:
+    #               node-version: 16
+    #         - name: update documentation
+    #           uses: CoCreate-app/CoCreate-docs@master
+    #           env:
+    #             organization_id: ${{ secrets.COCREATE_ORGANIZATION_ID }}
+    #             key: ${{ secrets.COCREATE_KEY }}
+    #             host: ${{ secrets.COCREATE_HOST }}

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.0.6](https://github.com/CoCreate-app/CoCreate-authenticate/compare/v1.0.5...v1.0.6) (2023-06-10)
+
+
+### Bug Fixes
+
+* Update dependencies versions for [@cocreate](https://github.com/cocreate) libraries ([9ebabdc](https://github.com/CoCreate-app/CoCreate-authenticate/commit/9ebabdcf8cb122e45c4dd085a8e68b96b6725779))
+
+## [1.0.5](https://github.com/CoCreate-app/CoCreate-authenticate/compare/v1.0.4...v1.0.5) (2023-06-10)
+
+
+### Bug Fixes
+
+* Update dependencies versions for [@cocreate](https://github.com/cocreate) libraries ([4f8053a](https://github.com/CoCreate-app/CoCreate-authenticate/commit/4f8053ab55494485b6b51af851a8ed95777d6947))
+
 ## [1.0.4](https://github.com/CoCreate-app/CoCreate-authenticate/compare/v1.0.3...v1.0.4) (2023-06-04)
 
 

package/CoCreate.config.js

@@ -1,9 +1,7 @@
 module.exports = {
-    "config": {
-        "key": "2061acef-0451-4545-f754-60cf8160",
-        "organization_id": "5ff747727005da1c272740ab",
-        "host": "general.cocreate.app"
-    },
+    "organization_id": "",
+    "key": "",
+    "host": "",
     "sources": [
         {
             "collection": "files",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/authenticate",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "A simple authenticate component in vanilla javascript. Easily configured using HTML5 data-attributes and/or JavaScript API.",
   "keywords": [
     "authenticate",
@@ -23,7 +23,7 @@
   "scripts": {
     "start": "npx webpack --config webpack.config.js --watch",
     "build": "NODE_ENV=production npx webpack --config webpack.config.js",
-    "docs": "node ./node_modules/@cocreate/docs/src/index.js"
+    "postinstall": "node ./node_modules/@cocreate/cli/check-coc.js"
   },
   "publishConfig": {
     "access": "public"
@@ -39,9 +39,11 @@
   },
   "main": "./src/index.js",
   "homepage": "https://cocreate.app/docs/authenticate",
+  "devDependencies": {
+    "@cocreate/cli": "^1.29.3"
+  },
   "dependencies": {
-    "@cocreate/docs": "^1.7.15",
-    "@cocreate/uuid": "^1.4.13",
+    "@cocreate/uuid": "^1.4.16",
     "jsonwebtoken": "^9.0.0"
   }
 }

package/src/index.js

@@ -1,102 +1,125 @@
-const jwt = require("jsonwebtoken")
-const uid = require("@cocreate/uuid")
-
-class CoCreateAuthenticate {
-    /**
-     * config structure 
-     * https://www.npmjs.com/package/jsonwebtoken
-     {
-        key: 'xxxxxx', // any value
-        options: {
-            algorithm: "HS256",
-            expiresIn: "30m",
-            issuer: "issuer"
-        }
-     }
-     **/
+const jwt = require('jsonwebtoken');
 
+// Configuration
+const tokenExpiration = 60; // Token expiration in minutes
 
-    constructor(config) {
-        this.config = config
-        this.config['key'] = uid.generate(40)
-    }
+// Array to store key pairs
+const keyPairs = new Map();
 
-    async generateToken({ user_id }) {
-        try {
-            const { key, options } = this.config
-            const result = {
-                token: jwt.sign({ user_id }, key, options),
-            }
-            return result.token;
-        } catch (err) {
-            return null
-        }
+// Map to store authenticated user
+const users = new Map();
+
+// TODO: user can have multiple sessions
+const activeSessions = new Map();
+
+// crud.listen('createDocument', function (data) {
+//     if (data.document && data.document[0] && data.document[0].type === 'keyPair')
+//         keyPairs.set(data.document[0]._id, data.document[0]);
+// });
+
+// crud.listen('deleteDocument', function (data) {
+//     if (data.document && data.document[0] && data.document[0].type === 'keyPair')
+//         keyPairs.delete(data.document[0]._id);
+// });
+
+// Create new RSA key pair
+function createKeyPair() {
+    const { privateKey, publicKey } = jwt.generateKeyPairSync('rsa', {
+        modulusLength: 2048,
+    });
+
+    const keyPair = {
+        _id: crud.ObjectId(),
+        privateKey,
+        publicKey,
+        created: new Date().getTime(), // Store as timestamp
+        expires: new Date().getTime() + tokenExpiration * 60 * 1000 * 2, // Convert minutes to milliseconds
+    };
+
+    keyPairs.set(keyPair._id, keyPair);
+
+    // crud.createDocument({
+    //     collection: 'keys',
+    //     document: {
+    //         ...keyPair,
+    //     },
+    //     organization_id: process.env.organization_id,
+    // });
+
+    return keyPair;
+}
+
+// Function to retrieve keys from the database (example using CRUD operations)
+function readKeyPairs() {
+    const keys = crud.readDocument({
+        collection: 'keys',
+        filter: {
+            query: [
+                { name: 'type', value: 'keyPair' },
+            ],
+        },
+        organization_id: process.env.organization_id,
+    });
+
+    // Add retrieved key pairs to the keyPairs array
+    if (keys.document && keys.document.length) {
+        keys.document.forEach((keyPair) => {
+            keyPairs.set(keyPair._id, keyPair);
+        });
     }
+}
+
+// Delete new RSA key pair
+function deleteKeyPair(keyPair) {
+    keyPairs.delete(keyPair._id)
+    // crud.deleteDocument({
+    //     collection: 'keys',
+    //     document: {
+    //         _id: keyPair._id,
+    //         type: 'keyPair'
+    //     },
+    //     organization_id: process.env.organization_id,
+    // });
+}
 
-    async getUserId(req) {
-        try {
-            let { user_id } = await this.wsCheck(req)
-            return user_id
-        } catch (err) {
-            return null
+// Function to sign a new token using the newest keyPair
+function encodeToken(payload) {
+    let keyPair = null
+    const currentTime = new Date().getTime();
+    for (let [key, value] of keyPairs) {
+        if (currentTime > value.expires) {
+            deleteKeyPair(value);
+        } else {
+            keyPair = value
         }
     }
 
-    getTokenFromCookie(cookie) {
-        let token = null;
-        if (cookie) {
-            cookie.split(';').forEach((c) => {
-                try {
-                    var parts = c.split('=')
-                    if (parts[0].trim() == 'token') {
-                        token = decodeURI(parts[1].trim());
-                    }
-                } catch (err) {
-                    console.log(err)
-                }
-            })
-        }
-        return token;
+    if (!keyPair) {
+        keyPair = createKeyPair();
     }
 
-    async wsCheck(req) {
-        const headers = req.headers
-        let token = headers['sec-websocket-protocol'];
-        // let token = this.getTokenFromCookie(headers.cookie);
-        // if (!token) {
-        //     token = headers['sec-websocket-protocol'];
-        // }
-
-        let result = null;
-        if (token && token !== 'null') {
-            result = await this.verifiyToken(token);
-        }
+    // TODO: payload could have previous user ip and device information which we could use to comapre to current ip and device information 
 
-        return result;
-    }
+    const token = jwt.sign(payload, keyPair.privateKey, { expiresIn: tokenExpiration * 60 });
+    users.set(token, { _id: payload.user._id, expires: new Date().getTime() + tokenExpiration * 60 * 1000 })
+    return token;
+}
 
-    async httpCheck(req) {
+// Verify and decode a token using the available keys
+function decodeToken(req) {
+    const headers = req.headers;
+    const token = headers['sec-websocket-protocol'];
+    const currentTime = new Date().getTime();
 
-    }
+    let user = users.get(token)
+    if (user && currentTime < user.expires)
+        return user._id;
 
-    async verifiyToken(token) {
-        try {
-            let decoded = await jwt.verify(token, this.config.key)
-            return decoded;
-        } catch (err) {
-            if (err.message === 'jwt expired') {
-                console.log('Expired Token')
-                return null
-            } else if (err.message === 'invalid token') {
-                console.log('Invalid Token')
-                return null
-            } else {
-                console.log('Invalid token', token)
-                return null;
-            }
-        }
+    users.delete(token)
+    return null
 
-    }
 }
 
-module.exports = CoCreateAuthenticate;
+// readKeyPairs();
+
+module.exports = { encodeToken, decodeToken };