Merge pull request 'Automatic and manual license collection 📖' (#62) from feature/59-license_collection into dev
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	continuous-integration/drone/push Build is passing
				
			Reviewed-on: #62 closes #59
This commit was merged in pull request #62.
	This commit is contained in:
		
							
								
								
									
										22
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								.drone.yml
									
									
									
									
									
								
							@@ -37,11 +37,23 @@ steps:
 | 
			
		||||
      tags:
 | 
			
		||||
        - dev
 | 
			
		||||
      registry: registry.odit.services
 | 
			
		||||
    when:
 | 
			
		||||
      branch:
 | 
			
		||||
        - dev
 | 
			
		||||
      event:
 | 
			
		||||
        - push
 | 
			
		||||
  - name: run full license export
 | 
			
		||||
    depends_on: ["clone"]
 | 
			
		||||
    image: node:alpine
 | 
			
		||||
    commands:
 | 
			
		||||
      - yarn
 | 
			
		||||
      - yarn licenses:export
 | 
			
		||||
  - name: push new licenses file to repo
 | 
			
		||||
    depends_on: ["run full license export"]
 | 
			
		||||
    image: appleboy/drone-git-push
 | 
			
		||||
    settings:
 | 
			
		||||
      branch: dev
 | 
			
		||||
      commit: true
 | 
			
		||||
      commit_message: new license file version [CI SKIP]
 | 
			
		||||
      author_email: bot@odit.services
 | 
			
		||||
      remote: git@git.odit.services:lfk/backend.git
 | 
			
		||||
      ssh_key:
 | 
			
		||||
        from_secret: GITLAB_SSHKEY
 | 
			
		||||
 | 
			
		||||
trigger:
 | 
			
		||||
  branch:
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -133,4 +133,5 @@ build
 | 
			
		||||
*.sqlite
 | 
			
		||||
*.sqlite-jurnal
 | 
			
		||||
/docs
 | 
			
		||||
lib
 | 
			
		||||
lib
 | 
			
		||||
/oss-attribution
 | 
			
		||||
							
								
								
									
										8288
									
								
								LICENSES.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8288
									
								
								LICENSES.txt
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -48,6 +48,7 @@
 | 
			
		||||
    "validator": "^13.5.2"
 | 
			
		||||
  },
 | 
			
		||||
  "devDependencies": {
 | 
			
		||||
    "@odit/license-exporter": "^0.0.6",
 | 
			
		||||
    "@types/cors": "^2.8.8",
 | 
			
		||||
    "@types/csvtojson": "^1.1.5",
 | 
			
		||||
    "@types/express": "^4.17.9",
 | 
			
		||||
@@ -74,7 +75,8 @@
 | 
			
		||||
    "test:watch": "jest --watchAll",
 | 
			
		||||
    "test:ci": "start-server-and-test dev http://localhost:4010/api/docs/openapi.json test",
 | 
			
		||||
    "seed": "ts-node ./node_modules/typeorm/cli.js schema:sync && ts-node ./node_modules/typeorm-seeding/dist/cli.js seed",
 | 
			
		||||
    "openapi:export": "ts-node src/openapi_export.ts"
 | 
			
		||||
    "openapi:export": "node scripts/openapi_export.js",
 | 
			
		||||
    "licenses:export": "license-exporter --md"
 | 
			
		||||
  },
 | 
			
		||||
  "nodemonConfig": {
 | 
			
		||||
    "ignore": [
 | 
			
		||||
 
 | 
			
		||||
@@ -4,9 +4,9 @@ import fs from "fs";
 | 
			
		||||
import "reflect-metadata";
 | 
			
		||||
import { createExpressServer, getMetadataArgsStorage } from "routing-controllers";
 | 
			
		||||
import { routingControllersToSpec } from 'routing-controllers-openapi';
 | 
			
		||||
import { config } from './config';
 | 
			
		||||
import authchecker from "./middlewares/authchecker";
 | 
			
		||||
import { ErrorHandler } from './middlewares/ErrorHandler';
 | 
			
		||||
import { config } from '../src/config';
 | 
			
		||||
import authchecker from "../src/middlewares/authchecker";
 | 
			
		||||
import { ErrorHandler } from '../src/middlewares/ErrorHandler';
 | 
			
		||||
 | 
			
		||||
const CONTROLLERS_FILE_EXTENSION = process.env.NODE_ENV === 'production' ? 'js' : 'ts';
 | 
			
		||||
createExpressServer({
 | 
			
		||||
		Reference in New Issue
	
	Block a user