feat: load from env (#363)

* feat: load from env

* fix: tests

* feat: add var

Author: eruizgar91

.env.sample

@@ -1,7 +1,7 @@
 JWT_SECRET_KEY="secret"
 NODE_ENV="development"
 
-PROVIDER_KEYFILE=accounts/provider.json
+#PROVIDER_KEYFILE=accounts/provider.json
 RSA_PRIVKEY_FILE=accounts/rsa_priv_key.pem
 RSA_PUBKEY_FILE=accounts/rsa_pub_key.pem
 AUTHLIB_INSECURE_TRANSPORT=true

.github/workflows/testing-integration.yml

@@ -37,13 +37,16 @@ jobs:
         env:
           IPFS_PROJECT_ID: ${{ secrets.IPFS_PROJECT_ID }}
           IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }}
+          PROVIDER_KEYFILE: ${{ secrets.PROVIDER_KEYFILE }}
         run: |
           yarn setup:dev
           yarn start &
 
           # wait for node to start
           wget --retry-connrefused --tries=20 http://localhost:8030
       - name: Run tests
+        env:
+          PROVIDER_KEYFILE: ${{ secrets.PROVIDER_KEYFILE }}
         run: |
           # HDWalletProvider keeps jest from exiting
           yarn integration --detectOpenHandles

.github/workflows/testing-nightly.yml

@@ -37,7 +37,7 @@ jobs:
           ./scripts/wait-nevermined.sh
       - name: Start node
         env:
-          PROVIDER_KEYFILE: accounts/provider.json
+          PROVIDER_KEYFILE: ${{ secrets.PROVIDER_KEYFILE }}
           RSA_PRIVKEY_FILE: accounts/rsa_priv_key.pem
           RSA_PUBKEY_FILE: accounts/rsa_pub_key.pem
           PROVIDER_BABYJUB_SECRET: ${{ secrets.PROVIDER_BABYJUB_SECRET }}

.github/workflows/testing.yml

@@ -21,6 +21,8 @@ jobs:
       - name: Check code formatting
         run: yarn format:check
       - name: Run tests
+        env:
+          PROVIDER_KEYFILE: ${{ secrets.PROVIDER_KEYFILE }}
         run: |
           yarn setup:dev
           yarn test --detectOpenHandles

config/nevermined.js

@@ -19,8 +19,12 @@ const configBase = {
 configBase.accounts = []
 
 if (process.env.PROVIDER_KEYFILE) {
-  const str = fs.readFileSync(process.env.PROVIDER_KEYFILE).toString()
-  configBase.accounts = [ethers.Wallet.fromEncryptedJsonSync(str, process.env.PROVIDER_PASSWORD)]
+  configBase.accounts = [
+    ethers.Wallet.fromEncryptedJsonSync(
+      process.env.PROVIDER_KEYFILE,
+      process.env.PROVIDER_PASSWORD,
+    ),
+  ]
 }
 
 const config = configBase

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-ts",
-  "version": "3.0.20",
+  "version": "3.0.21",
   "description": "Nevermined Node",
   "main": "main.ts",
   "scripts": {

src/encrypt/encrypt.controller.spec.ts

@@ -6,7 +6,7 @@ import { EncryptController } from './encrypt.controller'
 import request from 'supertest'
 import { ConfigModule } from '../shared/config/config.module'
 import { ConfigService } from '../shared/config/config.service'
-import { accountFromCredentialsFile, decrypt } from '../common/helpers/encryption.helper'
+import { accountFromCredentialsData, decrypt } from '../common/helpers/encryption.helper'
 
 /* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-argument */
 
@@ -47,8 +47,8 @@ describe('Info', () => {
     expect(await decrypt(config.cryptoConfig(), result, 'PSK-RSA')).toBe('msg')
   })
 
-  it('load NvmAccount from credentials file', async () => {
-    const account = await accountFromCredentialsFile(
+  it('load NvmAccount from credentials data', async () => {
+    const account = await accountFromCredentialsData(
       process.env.PROVIDER_KEYFILE as string,
       process.env.PROVIDER_PASSWORD as string,
     )

src/shared/config/config.service.ts

@@ -154,7 +154,7 @@ export class ConfigService {
     this.envConfig = this.validateInput(configProfile)
     this.crypto = {
       provider_password: this.get('PROVIDER_PASSWORD') || '',
-      provider_key: readFileSync(this.get('PROVIDER_KEYFILE') || '').toString(),
+      provider_key: this.get('PROVIDER_KEYFILE') || '',
       provider_rsa_public: readFileSync(this.get('RSA_PUBKEY_FILE') || '').toString(),
       provider_rsa_private: readFileSync(this.get('RSA_PRIVKEY_FILE') || '').toString(),
     }