Created libraries from code that was in app

.eslintrc.json

@@ -13,7 +13,7 @@
 						"depConstraints": [
 							{
 								"sourceTag": "scope:app",
-								"onlyDependOnLibsWithTags": ["scope:lib-shared"]
+								"onlyDependOnLibsWithTags": ["scope:lib-shared", "scope:lib-config", "scope:lib-auth", "scope:lib-prisma", "scope:lib-users"]
 							}
 						]
 					}

.github/workflows/ci.yml

@@ -42,13 +42,19 @@ jobs:
             - uses: nrwl/nx-set-shas@v4
 
             - name: ===== Generate Prisma client =====
-              run: ./node_modules/.bin/prisma generate --schema=./apps/api/prisma/schema.prisma
+              run: ./node_modules/.bin/prisma generate --schema=./libs/prisma/src/lib/schema.prisma
+
+            - name: ===== Compile generated Prisma client =====
+              run: npx tsc -p libs/prisma/tsconfig.generated.json
+
+            - name: ===== List generate Prisma client files =====
+              run: ls -la libs/prisma/generated/prisma/client
 
             # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
             # - run: yarn nx-cloud record -- echo Hello World
             # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
             - name: ===== Lint and build =====
-              run: yarn run affected
+              run: yarn run affected --verbose
 
             - name: ===== Run ui e2e tests =====
-              run: yarn run e2e:ui
+              run: yarn run e2e:ui --verbose

.gitignore

@@ -46,6 +46,7 @@ Thumbs.db
 # Production .env files
 /apps/api/.env.prod
 /apps/api/generated
+/libs/prisma/generated
 
 # .env copied to root before deploying the BE
 .env

apps/api/src/modules/auth/auth.controller.ts

@@ -1,16 +1,13 @@
+import { AuthService, GoogleAuthGuard, JwtAuthGuard, LocalAuthGuard } from '@gh/auth';
+import { globalConfig } from '@gh/config';
+import { User as PrismaUser } from '@gh/prisma';
 import { AuthKeys } from '@gh/shared/models';
 import { loggedMethod } from '@gh/shared/utils';
 import { Body, Controller, Get, HttpCode, HttpStatus, Inject, Post, Req, Res, UnauthorizedException, UseGuards } from '@nestjs/common';
 import { ConfigType } from '@nestjs/config';
 import { ApiBody } from '@nestjs/swagger';
-import { globalConfig } from 'config/config';
 import { Request, Response } from 'express';
-import { User as PrismaUser } from '../../../generated/prisma/client';
-import { AuthService } from './auth.service';
 import { LoginDto } from './dtos';
-import { GoogleAuthGuard } from './google-auth.guard';
-import { JwtAuthGuard } from './jwt-auth.guard';
-import { LocalAuthGuard } from './local-auth.guard';
 
 @Controller('auth')
 export class AuthController {

apps/api/src/modules/auth/auth.module.ts

@@ -1,21 +1,17 @@
+import { AuthService, GoogleStrategy, JwtStrategy, LocalStrategy } from '@gh/auth';
+import { PrismaService } from '@gh/prisma';
+import { UsersService } from '@gh/users';
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
 import { PassportModule } from '@nestjs/passport';
-import { UsersModule } from '../users/users.module';
 import { AuthController } from './auth.controller';
-import { AuthService } from './auth.service';
-import { GoogleStrategy } from './google.strategy';
-import { JwtStrategy } from './jwt.strategy';
-import { LocalStrategy } from './local.strategy';
 
 @Module({
 	imports: [
-		UsersModule,
 		PassportModule,
 		JwtModule,
 	],
-	providers: [AuthService, LocalStrategy, JwtStrategy, GoogleStrategy],
-	exports: [AuthService],
+	providers: [AuthService, LocalStrategy, JwtStrategy, GoogleStrategy, PrismaService, UsersService],
 	controllers: [AuthController],
 })
 export class AuthModule {}

apps/api/src/modules/github/github.controller.ts

@@ -1,5 +1,5 @@
+import { JwtAuthGuard } from '@gh/auth';
 import { Controller, Get, Param, Query, UseGuards } from '@nestjs/common';
-import { JwtAuthGuard } from '../auth/jwt-auth.guard';
 import { GithubService } from './github.service';
 
 @Controller('github')

apps/api/src/modules/github/github.module.ts

@@ -1,7 +1,7 @@
+import { globalConfig } from '@gh/config';
 import { HttpModule } from '@nestjs/axios';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { globalConfig } from 'config/config';
 import { AuthModule } from '../auth/auth.module';
 import { GithubController } from './github.controller';
 import { GithubService } from './github.service';

apps/api/src/modules/users/users.controller.ts

@@ -1,7 +1,7 @@
+import { JwtAuthGuard } from '@gh/auth';
+import { UsersService } from '@gh/users';
 import { Body, Controller, Delete, Get, Param, ParseIntPipe, Patch, Post, UseGuards } from '@nestjs/common';
-import { JwtAuthGuard } from '../auth/jwt-auth.guard';
 import { CreateUserDto, UpdateUserDto } from './dtos';
-import { UsersService } from './users.service';
 
 @Controller('auth-users')
 export class UsersController {

apps/api/src/modules/users/users.module.ts

@@ -1,7 +1,7 @@
+import { PrismaService } from '@gh/prisma';
+import { UsersService } from '@gh/users';
 import { Module } from '@nestjs/common';
-import { PrismaService } from 'api-prisma/prisma.service';
 import { UsersController } from './users.controller';
-import { UsersService } from './users.service';
 
 @Module({
 	providers: [UsersService, PrismaService],

apps/api/tsconfig.json

@@ -20,11 +20,5 @@
 		"noFallthroughCasesInSwitch": true,
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
-		"paths": {
-			"@gh/shared/*": ["libs/shared/src/lib/*"],
-			"config/*": [ "apps/api/src/config/*" ],
-			"api-prisma/*": [ "apps/api/src/prisma/*" ],
-			"utils/*": [ "apps/api/src/utils/*" ]
-		},
 	}
 }

apps/ui-e2e/tsconfig.json

@@ -4,5 +4,10 @@
 		{
 			"path": "./tsconfig.editor.json"
 		}
-	]
+	],
+	"compilerOptions": {
+		"paths": {
+			"@gh/shared/*": ["libs/shared/src/lib/*"]
+		}
+	}
 }

copy-files-prisma-generated.json

@@ -0,0 +1,11 @@
+{
+	"copyFiles": [
+		{
+			"from": "./libs/prisma/generated/**/*.*",
+			"to": "./dist/libs/prisma/generated"
+		}
+	],
+	"copyFilesSettings": {
+		"whenFileExists": "overwrite"
+	}
+}

eslint.config.mjs

@@ -34,7 +34,13 @@ export default [
 					depConstraints: [
 						{
 							sourceTag: 'scope:app',
-							onlyDependOnLibsWithTags: ['scope:lib-shared'],
+							onlyDependOnLibsWithTags: [
+								'scope:lib-shared',
+								'scope:lib-config',
+								'scope:lib-auth',
+								'scope:lib-prisma',
+								'scope:lib-users',
+							],
 						},
 					],
 				},

libs/auth/README.md

@@ -0,0 +1,7 @@
+# auth
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test auth` to execute the unit tests via [Jest](https://jestjs.io).

libs/auth/eslint.config.mjs

@@ -0,0 +1,40 @@
+import baseConfig from '../../eslint.config.mjs';
+
+export default [
+	...baseConfig,
+	{
+		ignores: ['!**/*', '**/generated/*'],
+	},
+	{
+		files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
+		rules: {},
+	},
+	{
+		files: ['**/*.ts', '**/*.tsx'],
+		rules: {
+			'@nx/enforce-module-boundaries': [
+				'error',
+				{
+					enforceBuildableLibDependency: true,
+					allow: [],
+
+					depConstraints: [
+						{
+							sourceTag: 'scope:lib-auth',
+							onlyDependOnLibsWithTags: [
+								'scope:lib-config',
+								'scope:lib-prisma',
+								'scope:lib-shared',
+								'scope:lib-users',
+							]
+						},
+					],
+				},
+			],
+		},
+	},
+	{
+		files: ['**/*.js', '**/*.jsx'],
+		rules: {},
+	},
+];

libs/auth/jest.config.ts

@@ -0,0 +1,10 @@
+export default {
+	displayName: 'auth',
+	preset: '../../jest.preset.js',
+	testEnvironment: 'node',
+	transform: {
+		'^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+	},
+	moduleFileExtensions: ['ts', 'js', 'html'],
+	coverageDirectory: '../../coverage/libs/auth',
+};

libs/auth/package.json

@@ -0,0 +1,15 @@
+{
+	"name": "@gh/auth",
+	"version": "0.0.1",
+	"dependencies": {
+		"bcrypt": "^6.0.0",
+		"rxjs": "^7.8.2",
+		"tslib": "^2.8.1"
+	},
+	"devDependencies": {
+		"@types/bcrypt": "^6.0.0"
+	},
+	"type": "commonjs",
+	"main": "./src/index.js",
+	"typings": "./src/index.d.ts"
+}

libs/auth/project.json

@@ -0,0 +1,30 @@
+{
+	"name": "auth",
+	"$schema": "../../node_modules/nx/schemas/project-schema.json",
+	"sourceRoot": "libs/auth/src",
+	"projectType": "library",
+	"tags": ["scope:lib-auth"],
+	"targets": {
+		"build": {
+			"executor": "@nx/js:tsc",
+			"outputs": ["{options.outputPath}"],
+			"options": {
+				"outputPath": "dist/libs/auth",
+				"main": "libs/auth/src/index.ts",
+				"tsConfig": "libs/auth/tsconfig.lib.json",
+				"assets": ["libs/auth/*.md"]
+			}
+		},
+		"lint": {
+			"executor": "@nx/eslint:lint",
+			"outputs": ["{options.outputFile}"]
+		},
+		"test": {
+			"executor": "@nx/jest:jest",
+			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+			"options": {
+				"jestConfig": "libs/auth/jest.config.ts"
+			}
+		}
+	}
+}

libs/auth/src/index.ts

@@ -0,0 +1 @@
+export * from './lib';

apps/api/src/modules/auth/auth.service.ts → libs/auth/src/lib/auth.service.ts

@@ -1,12 +1,12 @@
+import { globalConfig } from '@gh/config';
+import { User as PrismaUser } from '@gh/prisma';
 import { AuthProfile } from '@gh/shared/models';
+import { UsersService } from '@gh/users';
 import { Inject, Injectable, UnauthorizedException } from '@nestjs/common';
 import { ConfigType } from '@nestjs/config';
 import { JwtService } from '@nestjs/jwt';
 import axios from 'axios';
 import bcrypt from 'bcrypt';
-import { globalConfig } from 'config/config';
-import { User as PrismaUser } from '../../../generated/prisma/client';
-import { UsersService } from '../users/users.service';
 
 @Injectable()
 export class AuthService {
@@ -90,6 +90,7 @@ export class AuthService {
 			return axios.get(`https://www.googleapis.com/oauth2/v1/userinfo?alt=json&access_token=${token}`);
 		} catch (error) {
 			console.error('Failed to revoke the token:', error);
+			return null;
 		}
 	}
 
@@ -101,6 +102,8 @@ export class AuthService {
 			if (!expiresIn || expiresIn <= 0) {
 				return true;
 			}
+
+			return false;
 		} catch {
 			return true;
 		}

apps/api/src/modules/auth/google-auth.guard.ts → libs/auth/src/lib/google-auth.guard.ts

@@ -1,6 +1,5 @@
-import { ExecutionContext, Injectable, UnauthorizedException } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { AuthService } from './auth.service';
 
 @Injectable()
 export class GoogleAuthGuard extends AuthGuard('google') {

apps/api/src/modules/auth/google.strategy.ts → libs/auth/src/lib/google.strategy.ts

@@ -1,7 +1,7 @@
+import { globalConfig } from '@gh/config';
 import { Inject, Injectable } from '@nestjs/common';
 import { ConfigType } from '@nestjs/config';
 import { PassportStrategy } from '@nestjs/passport';
-import { globalConfig } from 'config/config';
 import { Strategy, VerifyCallback } from 'passport-google-oauth20';
 import { AuthService } from './auth.service';
 
@@ -21,7 +21,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy) {
 	}
 
 	// make sure to add this or else you won't get the refresh token
-	authorizationParams(): { [key: string]: string } {
+	override authorizationParams(): { [key: string]: string } {
 		return {
 			access_type: 'offline',
 			prompt: 'consent',

libs/auth/src/lib/index.ts

@@ -0,0 +1,7 @@
+export * from './auth.service'
+export * from './google-auth.guard';
+export * from './google.strategy';
+export * from './jwt-auth.guard';
+export * from './jwt.strategy'
+export * from './local-auth.guard';
+export * from './local.strategy'

apps/api/src/modules/auth/jwt-auth.guard.ts → libs/auth/src/lib/jwt-auth.guard.ts

@@ -3,7 +3,7 @@ import { AuthGuard } from '@nestjs/passport';
 
 @Injectable()
 export class JwtAuthGuard extends AuthGuard('jwt') {
-	canActivate(context: ExecutionContext) {
+	override canActivate(context: ExecutionContext) {
 		const request = context.switchToHttp().getRequest();
 
 		console.log('*** JwtAuthGuard / canActivate, endpoint called\n-----------------------------\nmethod:\t\t', request.method, '\nurl:\t\t', request.url, '\nauth header:\t', request.headers['authorization'], '\nbody:\t\t', request.body);

apps/api/src/modules/auth/jwt.strategy.ts → libs/auth/src/lib/jwt.strategy.ts

@@ -1,7 +1,7 @@
+import { globalConfig } from '@gh/config';
 import { Inject, Injectable } from '@nestjs/common';
 import { ConfigType } from '@nestjs/config';
 import { PassportStrategy } from '@nestjs/passport';
-import { globalConfig } from 'config/config';
 import { ExtractJwt, Strategy } from 'passport-jwt';
 
 @Injectable()