samanbayaka 0.0.21 → 0.0.22

package/commit-hash.mjs

@@ -1 +1 @@
-export const COMMIT_HASH = '85a1def';
+export const COMMIT_HASH = '02c6744';

package/config-manager.mjs

@@ -0,0 +1,21 @@
+import { Etcd3 } from "etcd3"
+import YAML from 'yaml'
+
+const [user, pass] = (process.env.SBK_CONFIG_URPW || "ur:pa").split(":")
+
+const client = new Etcd3({
+  hosts: "http://etcd:12379",
+  auth: {
+    username: user,
+    password: pass
+  }
+})
+
+try {
+  const yamlText = await client.get("/config/yaml/telemetry")
+  const obj = YAML.parse(yamlText);
+
+  console.log(obj);
+} catch (err) {
+  console.error("Configuration reading error: ", err.message)
+}

package/helper/file/esm-loading.mjs

@@ -7,13 +7,24 @@ import os from "os"
 import { createRequire } from 'module'
 
 import chokidar from "chokidar"
-
+import { Etcd3 } from "etcd3"
+import YAML from 'yaml'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 const require = createRequire(import.meta.url)
 
 
+const [user, pass] = (process.env.SBK_CONFIG_URPW || "ur:pa").split(":")
+
+const client = new Etcd3({
+  hosts: "http://etcd:12379",
+  auth: {
+    username: user,
+    password: pass
+  }
+})
+
 /**
  * Configuration path
  * @type {string}
@@ -47,42 +58,51 @@ const SERVICES_DIR = __dirname.split('node_modules')[0]
  * @return {object}
  */
 export const getConfig = async (fileName) => {
-	const configFile = path.
-		join(
-			CONFIG_PATH,
-			`${fileName}.mjs`
-		)
-
-  // /**
-  //  * Validate Configuration 
-  //  */
-  // if(process.env.NODE_ENV){
-  //   console.error("NODE_ENV must be 'production', 'testing', or 'development'")
-  //   process.exit(0)
-  // }
+	// const configFile = path
+	// 	.join(
+	// 		CONFIG_PATH,
+	// 		`${fileName}.mjs`
+	// 	)
+
+  // // /**
+  // //  * Validate Configuration 
+  // //  */
+  // // if(process.env.NODE_ENV){
+  // //   console.error("NODE_ENV must be 'production', 'testing', or 'development'")
+  // //   process.exit(0)
+  // // }
   
 
-	return (await import(pathToFileURL(configFile).href)).default
+	// return (await import(pathToFileURL(configFile).href)).default
+
+  // try {
+    const yamlText = await client.get(`/config/yaml/${fileName}`)
+    return Object.freeze(
+      YAML.parse(yamlText)
+    )
+  // } catch (err) {
+  //   throw new Error(`Configuration reading error: ${err.message}`)
+  // }
 }
 
 
-/**
- * Getting server configuration.
- * @type {string}
- */
-const CONFIG = await getConfig('server')
+// /**
+//  * Getting server configuration.
+//  * @type {string}
+//  */
+// const CONFIG = await getConfig('server')
 
 
-/**
- * Assets path
- */
-export const assetPath = {
-  rootFolder: path
-    .join(
-      ABSOLUTE_PATH,
-      CONFIG.assetPath,
-    ),
-}
+// /**
+//  * Assets path
+//  */
+// export const assetPath = {
+//   rootFolder: path
+//     .join(
+//       ABSOLUTE_PATH,
+//       CONFIG.assetPath,
+//     ),
+// }
 
 
 /**
@@ -139,18 +159,18 @@ export const pkgDtls = {
 }
 
 
-/**
- * OpenAPI configuration
- */
-export const openApiConfig = {
-  info: {
-    title: pkgDtls.name,
-    version: pkgDtls.version,
-    summary: CONFIG.openApiInfo[0].summary,
-    description: CONFIG.openApiInfo[0].description,
-  },
-  servers: CONFIG.openApiInfo[0].url,
-}
+// /**
+//  * OpenAPI configuration
+//  */
+// export const openApiConfig = {
+//   info: {
+//     title: pkgDtls.name,
+//     version: pkgDtls.version,
+//     summary: CONFIG.openApiInfo[0].summary,
+//     description: CONFIG.openApiInfo[0].description,
+//   },
+//   servers: CONFIG.openApiInfo[0].url,
+// }
 
 // /**
 //  * Load modules from path as moleculer-repl is only supports cjs files

package/helper/utility/access-token-validator.mjs

@@ -2,9 +2,25 @@ import ApiGateway from "moleculer-web"
 import jwt from "jsonwebtoken"
 import jwksClient from "jwks-rsa"
 
+// const OPENID_CONFIG = {
+//   url: "https://accounts.google.com/.well-known/openid-configuration",
+//   url: "",
+//   clientId: "184045176764-ugg28aegdro383pintufun14uubtt374.apps.googleusercontent.com",
+//   jwksClient: {
+//     cache: true,
+//     cacheMaxEntries: 5,
+//     cacheMaxAge: 10 * 60 * 1000,
+//     rateLimit: true,
+//     jwksRequestsPerMinute: 10,
+//   },
+//   jwtVerifyAlgo: ["RS256"],
+//   client: {},
+//   issuer: "",
+// }
+
 const OPENID_CONFIG = {
-  url: "https://accounts.google.com/.well-known/openid-configuration",
-  clientId: "184045176764-ugg28aegdro383pintufun14uubtt374.apps.googleusercontent.com",
+  url: "https://auth.wbsedcl.in/realms/redpanda/.well-known/openid-configuration",
+  clientId: "bff-client",
   jwksClient: {
     cache: true,
     cacheMaxEntries: 5,
@@ -159,7 +175,18 @@ export const authorize = async (ctx, route, req) => {
       })
 
     ctx.broker.logger.debug({message: "Decoded Token Object", token: decoded})
-    ctx.meta.user = { name: decoded?.name, email: decoded?.email }
+    ctx.meta.user = {
+      sessionId: decoded?.sid,
+      id: decoded?.sub,
+      userId: (decoded?.sub).split(":").at(-1),
+      username: decoded?.preferred_username,
+      firstName: decoded?.given_name,
+      lastName: decoded?.family_name,
+      fullName: [...new Set(decoded?.name.split(/\s+/))].join(" "),
+      emailIds: decoded?.email,
+      mobileNos: decoded?.mobile_no,
+      userRoles: decoded?.user_role,
+    }
     return decoded
 
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "samanbayaka",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Moleculer Gateway service with kafka transporter",
   "homepage": "https://gitlab.com/dalal.suvendu/samanbayaka#readme",
   "bugs": {
@@ -41,6 +41,7 @@
     "chokidar": "^5.0.0",
     "compression": "^1.8.1",
     "cookie-parser": "^1.4.7",
+    "etcd3": "^1.1.2",
     "helmet": "^8.1.0",
     "ioredis": "^5.10.1",
     "jsonwebtoken": "^9.0.3",
@@ -55,7 +56,8 @@
     "nats": "^2.29.3",
     "pino": "^10.3.1",
     "pnpm": "^10.32.1",
-    "sinon": "^21.1.2"
+    "sinon": "^21.1.2",
+    "yaml": "^2.9.0"
   },
   "devDependencies": {
     "chai": "^6.2.2",

package/services/about/index.mjs

@@ -41,7 +41,8 @@ export default {
       },
 
       handler: async(ctx) => {
-        return ctx.meta.user
+        const { sessionId, id, ...profile } = ctx.meta.user
+        return profile
       }
     }
   },

package/services/gateway/index.mjs

@@ -73,7 +73,7 @@ export default {
        */
       {
         path: "/api",
-        authorization: true,
+        authorization: false,
         whitelist: [
           /**
            * Access any actions except 'gateway' and 'system' service