cabloy 5.1.183 → 5.1.185

package/.cabloy-version

@@ -1 +1 @@
-5.1.183
+5.1.185

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 5.1.185
+
+### Features
+
+- Add GitHub authentication support.
+
+## 5.1.184
+
+### Improvements
+
+- Update guard demonstration examples.
+
 ## 5.1.183
 
 ### Improvements

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.183",
+  "version": "5.1.185",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

package/vona/env/.env

@@ -11,13 +11,13 @@ CORS_WHITE_LIST =
 SERVER_KEYS = vona__1596889047267_3245
 SERVER_GLOBALPREFIX = /api
 SERVER_PUBLICDIR =
-SERVER_SUBDOMAINOFFSET = 2
 SERVER_WORKERS =
 SERVER_LISTEN_HOSTNAME = 0.0.0.0
 SERVER_LISTEN_PORT = 7102
 SERVER_LISTEN_DISABLE =
 SERVER_SERVE_PROTOCOL =
 SERVER_SERVE_HOST =
+SERVER_SUBDOMAINOFFSET = 2
 
 # project
 
@@ -92,6 +92,11 @@ HOME_USER_DISABLE_USER_ADMIN = false
 HOME_USER_BUILTIN_ROLE_REGISTERED_USER_SITE_IDS = *
 HOME_USER_BUILTIN_ROLE_SYSTEM_ADMIN_SITE_IDS = *
 
+# auth
+
+AUTH_GITHUB_CLIENTID =
+AUTH_GITHUB_CLIENTSECRET =
+
 # payment
 
 PAY_MOCK_DEFAULT_CREDENTIAL = pay-mock-dev-credential

package/vona/packages-vona/vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona",
-  "version": "5.1.95",
+  "version": "5.1.96",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "keywords": [

package/vona/src/suite/a-demo/modules/demo-demonstration/src/bean/guard.demonstration.ts

@@ -1,7 +1,7 @@
 import type { Next } from 'vona';
 import type { IDecoratorGuardOptionsGlobal, IGuardExecute } from 'vona-module-a-aspect';
 
-import { BeanBase, Global, useApp } from 'vona';
+import { $protocolKey, BeanBase, Global, useApp } from 'vona';
 import { Guard } from 'vona-module-a-aspect';
 
 const app = useApp();
@@ -40,12 +40,19 @@ export interface IGuardOptionsDemonstration extends IDecoratorGuardOptionsGlobal
     '/home/user/passport/createPassportJwtFromOauthCode',
     '/home/user/passport/createTempAuthToken',
     '/auth/passport/callback',
+    '/auth/mock/authorize',
+    '/captcha/create',
+    '/image/upload-policy',
+    '/file/upload-policy',
   ],
   dependencies: 'a-user:passport',
 })
 @Global()
 export class GuardDemonstration extends BeanBase implements IGuardExecute {
   async execute(options: IGuardOptionsDemonstration, next: Next): Promise<boolean> {
+    const headerOpenapiSchema = this.ctx.headers[$protocolKey('x-vona-openapi-schema')];
+    if (headerOpenapiSchema?.toString() === 'true') return next();
+
     const method = this.ctx.method.toUpperCase();
     if (!options.methodsForWrite.some(item => item.toUpperCase() === method)) {
       return next();

package/vona/src/suite-vendor/a-auth/modules/auth-oauth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-auth-oauth",
-  "version": "5.0.10",
+  "version": "5.0.11",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-auth/modules/auth-oauth/src/bean/authProvider.oauth.ts

@@ -7,6 +7,7 @@ import type {
 } from 'vona-module-a-auth';
 
 import StrategyGithub from 'passport-github';
+import { useApp } from 'vona';
 import { AuthProvider, BeanAuthProviderOauth2Base } from 'vona-module-a-auth';
 
 export interface IAuthProviderOauthClientOptionsGithub extends IAuthProviderOauthClientOptions {
@@ -27,6 +28,8 @@ export interface IAuthProviderOptionsOauth extends IDecoratorAuthProviderOptions
   IAuthProviderOauthClientOptions
 > {}
 
+const app = useApp();
+
 @AuthProvider<IAuthProviderOptionsOauth>({
   base: {
     confirmed: true,
@@ -36,6 +39,8 @@ export interface IAuthProviderOptionsOauth extends IDecoratorAuthProviderOptions
   clients: {
     github: {
       Strategy: StrategyGithub,
+      clientID: app.meta.env.AUTH_GITHUB_CLIENTID,
+      clientSecret: app.meta.env.AUTH_GITHUB_CLIENTSECRET,
     },
   },
 })

package/vona/src/suite-vendor/a-auth/modules/auth-oauth/src/index.ts

@@ -1 +1,2 @@
+export * from './types/index.ts';
 export * from './.metadata/index.ts';

package/vona/src/suite-vendor/a-auth/modules/auth-oauth/src/types/index.ts

@@ -0,0 +1,8 @@
+declare module 'vona' {
+  export interface VonaConfigEnv {
+    AUTH_GITHUB_CLIENTID: string | undefined;
+    AUTH_GITHUB_CLIENTSECRET: string | undefined;
+  }
+}
+
+export {};

package/vona/src/suite-vendor/a-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-auth",
-  "version": "5.1.24",
+  "version": "5.1.25",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -8,7 +8,7 @@
   "type": "module",
   "dependencies": {
     "vona-module-a-auth": "workspace:^",
-    "vona-module-auth-oauth": "^5.0.10",
+    "vona-module-auth-oauth": "^5.0.11",
     "vona-module-auth-simple": "workspace:^"
   },
   "title": "a-auth"