swallowkit 1.0.0-beta.46 → 1.0.0-beta.47
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/commands/add-auth.d.ts +2 -0
- package/dist/cli/commands/add-auth.d.ts.map +1 -1
- package/dist/cli/commands/add-auth.js +214 -16
- package/dist/cli/commands/add-auth.js.map +1 -1
- package/dist/cli/commands/dev.d.ts +4 -0
- package/dist/cli/commands/dev.d.ts.map +1 -1
- package/dist/cli/commands/dev.js +100 -12
- package/dist/cli/commands/dev.js.map +1 -1
- package/dist/cli/commands/init.d.ts +2 -0
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +56 -30
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/scaffold.d.ts.map +1 -1
- package/dist/cli/commands/scaffold.js +37 -5
- package/dist/cli/commands/scaffold.js.map +1 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +3 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/core/scaffold/auth-generator.d.ts +20 -2
- package/dist/core/scaffold/auth-generator.d.ts.map +1 -1
- package/dist/core/scaffold/auth-generator.js +265 -12
- package/dist/core/scaffold/auth-generator.js.map +1 -1
- package/dist/core/scaffold/connector-functions-generator.d.ts +3 -3
- package/dist/core/scaffold/connector-functions-generator.d.ts.map +1 -1
- package/dist/core/scaffold/connector-functions-generator.js +19 -19
- package/dist/core/scaffold/connector-functions-generator.js.map +1 -1
- package/dist/core/scaffold/functions-generator.d.ts +2 -2
- package/dist/core/scaffold/functions-generator.d.ts.map +1 -1
- package/dist/core/scaffold/functions-generator.js +16 -16
- package/dist/core/scaffold/functions-generator.js.map +1 -1
- package/dist/core/scaffold/nextjs-generator.d.ts.map +1 -1
- package/dist/core/scaffold/nextjs-generator.js +13 -1
- package/dist/core/scaffold/nextjs-generator.js.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/__tests__/__snapshots__/functions-generator.test.ts.snap +20 -20
- package/src/__tests__/__snapshots__/nextjs-generator.test.ts.snap +13 -1
- package/src/__tests__/auth.test.ts +103 -0
- package/src/__tests__/dev.test.ts +27 -0
- package/src/__tests__/init.test.ts +19 -0
- package/src/__tests__/nextjs-generator.test.ts +8 -0
- package/src/cli/commands/add-auth.ts +239 -16
- package/src/cli/commands/dev.ts +111 -14
- package/src/cli/commands/init.ts +56 -30
- package/src/cli/commands/scaffold.ts +37 -5
- package/src/cli/index.ts +3 -1
- package/src/core/scaffold/auth-generator.ts +267 -13
- package/src/core/scaffold/connector-functions-generator.ts +22 -19
- package/src/core/scaffold/functions-generator.ts +17 -17
- package/src/core/scaffold/nextjs-generator.ts +13 -1
- package/src/types/index.ts +1 -1
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
interface AddAuthOptions {
|
|
6
6
|
provider?: string;
|
|
7
7
|
}
|
|
8
|
+
export declare function generateSwaAuthContext(): string;
|
|
9
|
+
export declare function addAuthProviderToRootLayout(layout: string): string;
|
|
8
10
|
export declare function addAuthCommand(options: AddAuthOptions): Promise<void>;
|
|
9
11
|
export {};
|
|
10
12
|
//# sourceMappingURL=add-auth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-auth.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/add-auth.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"add-auth.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/add-auth.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA0CH,UAAU,cAAc;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAuGD,wBAAgB,sBAAsB,IAAI,MAAM,CAwC/C;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAclE;AAuBD,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,iBAuI3D"}
|
|
@@ -37,6 +37,8 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
37
37
|
};
|
|
38
38
|
})();
|
|
39
39
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
40
|
+
exports.generateSwaAuthContext = generateSwaAuthContext;
|
|
41
|
+
exports.addAuthProviderToRootLayout = addAuthProviderToRootLayout;
|
|
40
42
|
exports.addAuthCommand = addAuthCommand;
|
|
41
43
|
const fs = __importStar(require("fs"));
|
|
42
44
|
const path = __importStar(require("path"));
|
|
@@ -44,17 +46,214 @@ const config_1 = require("../../core/config");
|
|
|
44
46
|
const auth_generator_1 = require("../../core/scaffold/auth-generator");
|
|
45
47
|
const manifest_1 = require("../../core/project/manifest");
|
|
46
48
|
const init_1 = require("./init");
|
|
49
|
+
function writeIfMissing(filePath, content) {
|
|
50
|
+
if (fs.existsSync(filePath))
|
|
51
|
+
return;
|
|
52
|
+
fs.mkdirSync(path.dirname(filePath), { recursive: true });
|
|
53
|
+
fs.writeFileSync(filePath, content, "utf-8");
|
|
54
|
+
}
|
|
55
|
+
function defaultCustomJwtConfig() {
|
|
56
|
+
return {
|
|
57
|
+
userConnector: "mysql",
|
|
58
|
+
userTable: "users",
|
|
59
|
+
loginIdColumn: "login_id",
|
|
60
|
+
passwordHashColumn: "password_hash",
|
|
61
|
+
rolesColumn: "roles",
|
|
62
|
+
jwtSecretEnv: "JWT_SECRET",
|
|
63
|
+
tokenExpiry: "24h",
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
function setupSwaAuth(cwd, backendLanguage) {
|
|
67
|
+
const helperPath = backendLanguage === "typescript"
|
|
68
|
+
? path.join(cwd, "functions", "src", "auth", "jwt-helper.ts")
|
|
69
|
+
: backendLanguage === "csharp"
|
|
70
|
+
? path.join(cwd, "functions", "Auth", "JwtHelper.cs")
|
|
71
|
+
: path.join(cwd, "functions", "auth", "jwt_helper.py");
|
|
72
|
+
fs.mkdirSync(path.dirname(helperPath), { recursive: true });
|
|
73
|
+
const helper = backendLanguage === "typescript"
|
|
74
|
+
? (0, auth_generator_1.generateSwaAuthHelperTS)()
|
|
75
|
+
: backendLanguage === "csharp"
|
|
76
|
+
? (0, auth_generator_1.generateSwaAuthHelperCSharp)()
|
|
77
|
+
: (0, auth_generator_1.generateSwaAuthHelperPython)();
|
|
78
|
+
fs.writeFileSync(helperPath, helper, "utf-8");
|
|
79
|
+
const callFnPath = path.join(cwd, "lib", "api", "call-function.ts");
|
|
80
|
+
fs.mkdirSync(path.dirname(callFnPath), { recursive: true });
|
|
81
|
+
fs.writeFileSync(callFnPath, (0, auth_generator_1.generateBFFCallFunctionWithSwaAuth)(), "utf-8");
|
|
82
|
+
const authDir = path.join(cwd, "lib", "auth");
|
|
83
|
+
fs.mkdirSync(authDir, { recursive: true });
|
|
84
|
+
fs.writeFileSync(path.join(authDir, "auth-context.tsx"), generateSwaAuthContext(), "utf-8");
|
|
85
|
+
updateRootLayoutWithAuthProvider(cwd);
|
|
86
|
+
const loginDir = path.join(cwd, "app", "login");
|
|
87
|
+
fs.mkdirSync(loginDir, { recursive: true });
|
|
88
|
+
fs.writeFileSync(path.join(loginDir, "page.tsx"), generateSwaLoginPage(), "utf-8");
|
|
89
|
+
updateSwaRouteConfig(cwd);
|
|
90
|
+
}
|
|
91
|
+
function setupExternalTokenAuth(cwd, backendLanguage) {
|
|
92
|
+
const authDir = path.join(cwd, "lib", "auth");
|
|
93
|
+
fs.mkdirSync(authDir, { recursive: true });
|
|
94
|
+
writeIfMissing(path.join(authDir, "external-token-adapter.ts"), (0, auth_generator_1.generateExternalTokenAdapter)());
|
|
95
|
+
fs.writeFileSync(path.join(authDir, "authenticated-fetch.ts"), (0, auth_generator_1.generateAuthenticatedFetch)(), "utf-8");
|
|
96
|
+
fs.writeFileSync(path.join(authDir, "auth-context.tsx"), (0, auth_generator_1.generateExternalTokenAuthContext)(), "utf-8");
|
|
97
|
+
fs.writeFileSync(path.join(cwd, "lib", "api", "call-function.ts"), (0, auth_generator_1.generateBFFCallFunctionWithAuth)(), "utf-8");
|
|
98
|
+
const meDir = path.join(cwd, "app", "api", "auth", "me");
|
|
99
|
+
fs.mkdirSync(meDir, { recursive: true });
|
|
100
|
+
fs.writeFileSync(path.join(meDir, "route.ts"), (0, auth_generator_1.generateExternalTokenBFFMeRoute)(), "utf-8");
|
|
101
|
+
updateRootLayoutWithAuthProvider(cwd);
|
|
102
|
+
if (backendLanguage === "typescript") {
|
|
103
|
+
const verifier = path.join(cwd, "functions", "src", "auth", "external-token-verifier.ts");
|
|
104
|
+
writeIfMissing(verifier, (0, auth_generator_1.generateExternalTokenVerifierTS)());
|
|
105
|
+
fs.writeFileSync(path.join(cwd, "functions", "src", "auth", "jwt-helper.ts"), (0, auth_generator_1.generateExternalTokenHelperTS)(), "utf-8");
|
|
106
|
+
fs.writeFileSync(path.join(cwd, "functions", "src", "auth-me.ts"), (0, auth_generator_1.generateExternalAuthMeTS)(), "utf-8");
|
|
107
|
+
}
|
|
108
|
+
else if (backendLanguage === "csharp") {
|
|
109
|
+
const verifier = path.join(cwd, "functions", "Auth", "ExternalTokenVerifier.cs");
|
|
110
|
+
writeIfMissing(verifier, (0, auth_generator_1.generateExternalTokenVerifierCSharp)());
|
|
111
|
+
fs.writeFileSync(path.join(cwd, "functions", "Auth", "JwtHelper.cs"), (0, auth_generator_1.generateExternalTokenHelperCSharp)(), "utf-8");
|
|
112
|
+
fs.writeFileSync(path.join(cwd, "functions", "Auth", "ExternalAuthMe.cs"), (0, auth_generator_1.generateExternalAuthMeCSharp)(), "utf-8");
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
const verifier = path.join(cwd, "functions", "auth", "external_token_verifier.py");
|
|
116
|
+
writeIfMissing(verifier, (0, auth_generator_1.generateExternalTokenVerifierPython)());
|
|
117
|
+
fs.writeFileSync(path.join(cwd, "functions", "auth", "jwt_helper.py"), (0, auth_generator_1.generateExternalTokenHelperPython)(), "utf-8");
|
|
118
|
+
const authMePath = path.join(cwd, "functions", "blueprints", "auth_me.py");
|
|
119
|
+
fs.mkdirSync(path.dirname(authMePath), { recursive: true });
|
|
120
|
+
fs.writeFileSync(authMePath, (0, auth_generator_1.generateExternalAuthMePython)(), "utf-8");
|
|
121
|
+
updatePythonAuthMeRegistration(cwd);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
function updatePythonAuthMeRegistration(cwd) {
|
|
125
|
+
const appPath = path.join(cwd, "functions", "function_app.py");
|
|
126
|
+
if (!fs.existsSync(appPath))
|
|
127
|
+
return;
|
|
128
|
+
const importLine = "from blueprints.auth_me import bp as external_auth_me_bp";
|
|
129
|
+
const registerLine = "app.register_blueprint(external_auth_me_bp)";
|
|
130
|
+
let content = fs.readFileSync(appPath, "utf-8");
|
|
131
|
+
if (content.includes(importLine))
|
|
132
|
+
return;
|
|
133
|
+
const marker = "# SwallowKit scaffold registrations";
|
|
134
|
+
content = content.includes(marker)
|
|
135
|
+
? content.replace(marker, `${importLine}\n${registerLine}\n${marker}`)
|
|
136
|
+
: `${content.trimEnd()}\n${importLine}\n${registerLine}\n`;
|
|
137
|
+
fs.writeFileSync(appPath, content, "utf-8");
|
|
138
|
+
}
|
|
139
|
+
function generateSwaLoginPage() {
|
|
140
|
+
return `'use client';
|
|
141
|
+
export default function LoginPage() {
|
|
142
|
+
return <main><h1>Sign in</h1><a href="/.auth/login/aad?post_login_redirect_uri=/">Sign in with Microsoft</a></main>;
|
|
143
|
+
}
|
|
144
|
+
`;
|
|
145
|
+
}
|
|
146
|
+
function generateSwaAuthContext() {
|
|
147
|
+
return `'use client';
|
|
148
|
+
import { createContext, useContext, useEffect, useState, type ReactNode } from 'react';
|
|
149
|
+
|
|
150
|
+
export interface AuthUser { id: string; loginId: string; name: string; email: string; roles: string[]; }
|
|
151
|
+
interface AuthContextValue { user: AuthUser | null; loading: boolean; login: () => void; logout: () => void; hasRole: (role: string) => boolean; hasAnyRole: (roles: string[]) => boolean; }
|
|
152
|
+
const AuthContext = createContext<AuthContextValue | null>(null);
|
|
153
|
+
|
|
154
|
+
export function AuthProvider({ children }: { children: ReactNode }) {
|
|
155
|
+
const [user, setUser] = useState<AuthUser | null>(null);
|
|
156
|
+
const [loading, setLoading] = useState(true);
|
|
157
|
+
useEffect(() => {
|
|
158
|
+
fetch('/.auth/me')
|
|
159
|
+
.then(async response => {
|
|
160
|
+
if (!response.ok) throw new Error('SWA authentication is unavailable');
|
|
161
|
+
const body: unknown = await response.json();
|
|
162
|
+
if (!body || typeof body !== 'object' || !('clientPrincipal' in body)) return null;
|
|
163
|
+
const principal = body.clientPrincipal;
|
|
164
|
+
if (!principal || typeof principal !== 'object') return null;
|
|
165
|
+
const value = principal as Record<string, unknown>;
|
|
166
|
+
if (typeof value.userId !== 'string') return null;
|
|
167
|
+
return {
|
|
168
|
+
id: value.userId,
|
|
169
|
+
loginId: typeof value.userDetails === 'string' ? value.userDetails : '',
|
|
170
|
+
name: typeof value.userDetails === 'string' ? value.userDetails : '',
|
|
171
|
+
email: typeof value.userDetails === 'string' ? value.userDetails : '',
|
|
172
|
+
roles: Array.isArray(value.userRoles) ? value.userRoles.filter((role): role is string => typeof role === 'string') : [],
|
|
173
|
+
} satisfies AuthUser;
|
|
174
|
+
})
|
|
175
|
+
.then(setUser)
|
|
176
|
+
.catch(() => setUser(null))
|
|
177
|
+
.finally(() => setLoading(false));
|
|
178
|
+
}, []);
|
|
179
|
+
const login = () => { window.location.href = '/.auth/login/aad?post_login_redirect_uri=/'; };
|
|
180
|
+
const logout = () => { window.location.href = '/.auth/logout?post_logout_redirect_uri=/'; };
|
|
181
|
+
const hasRole = (role: string) => user?.roles.includes(role) ?? false;
|
|
182
|
+
return <AuthContext.Provider value={{ user, loading, login, logout, hasRole, hasAnyRole: roles => roles.some(hasRole) }}>{children}</AuthContext.Provider>;
|
|
183
|
+
}
|
|
184
|
+
export function useAuth() { const value = useContext(AuthContext); if (!value) throw new Error('useAuth must be used within an AuthProvider'); return value; }
|
|
185
|
+
`;
|
|
186
|
+
}
|
|
187
|
+
function addAuthProviderToRootLayout(layout) {
|
|
188
|
+
let updated = layout;
|
|
189
|
+
if (!/import\s*\{[^}]*\bAuthProvider\b[^}]*\}\s*from\s*['"]@\/lib\/auth\/auth-context['"]/.test(updated)) {
|
|
190
|
+
const directive = updated.match(/^(?:\s*['"]use (?:client|server)['"];?\s*\r?\n)/)?.[0] ?? "";
|
|
191
|
+
updated = `${directive}import { AuthProvider } from '@/lib/auth/auth-context';\n${updated.slice(directive.length)}`;
|
|
192
|
+
}
|
|
193
|
+
if (!/<AuthProvider(?:\s|>)/.test(updated)) {
|
|
194
|
+
const childrenIndex = updated.lastIndexOf("{children}");
|
|
195
|
+
if (childrenIndex === -1) {
|
|
196
|
+
throw new Error("Could not find {children} in app/layout.tsx");
|
|
197
|
+
}
|
|
198
|
+
updated = `${updated.slice(0, childrenIndex)}<AuthProvider>{children}</AuthProvider>${updated.slice(childrenIndex + "{children}".length)}`;
|
|
199
|
+
}
|
|
200
|
+
return updated;
|
|
201
|
+
}
|
|
202
|
+
function updateRootLayoutWithAuthProvider(cwd) {
|
|
203
|
+
const layoutPath = path.join(cwd, "app", "layout.tsx");
|
|
204
|
+
if (!fs.existsSync(layoutPath)) {
|
|
205
|
+
throw new Error("app/layout.tsx was not found; cannot install AuthProvider");
|
|
206
|
+
}
|
|
207
|
+
const layout = fs.readFileSync(layoutPath, "utf-8");
|
|
208
|
+
const updated = addAuthProviderToRootLayout(layout);
|
|
209
|
+
if (updated !== layout)
|
|
210
|
+
fs.writeFileSync(layoutPath, updated, "utf-8");
|
|
211
|
+
}
|
|
212
|
+
function updateSwaRouteConfig(cwd) {
|
|
213
|
+
const configPath = path.join(cwd, "staticwebapp.config.json");
|
|
214
|
+
const config = fs.existsSync(configPath) ? JSON.parse(fs.readFileSync(configPath, "utf-8")) : {};
|
|
215
|
+
config.routes = Array.isArray(config.routes)
|
|
216
|
+
? config.routes.filter((route) => route.route !== "/api/*")
|
|
217
|
+
: [];
|
|
218
|
+
config.routes.unshift({ route: "/api/*", allowedRoles: ["authenticated"] });
|
|
219
|
+
config.responseOverrides = { ...(config.responseOverrides || {}), "401": { statusCode: 302, redirect: "/.auth/login/aad?post_login_redirect_uri=.referrer" } };
|
|
220
|
+
fs.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
|
|
221
|
+
}
|
|
47
222
|
async function addAuthCommand(options) {
|
|
48
223
|
(0, config_1.ensureSwallowKitProject)("add-auth");
|
|
49
224
|
console.log(" SwallowKit Add-Auth: Setting up authentication...\n");
|
|
50
225
|
const provider = (options.provider || "custom-jwt");
|
|
51
|
-
if (!["custom-jwt", "swa", "swa-custom", "none"].includes(provider)) {
|
|
52
|
-
console.error(` Unknown provider: ${provider}. Use: custom-jwt | swa | swa-custom | none`);
|
|
226
|
+
if (!["custom-jwt", "swa", "external-token", "swa-custom", "none"].includes(provider)) {
|
|
227
|
+
console.error(` Unknown provider: ${provider}. Use: custom-jwt | swa | external-token | swa-custom | none`);
|
|
53
228
|
process.exit(1);
|
|
54
229
|
}
|
|
55
230
|
const backendLanguage = (0, config_1.getBackendLanguage)();
|
|
56
231
|
const config = (0, config_1.getFullConfig)();
|
|
57
232
|
const cwd = process.cwd();
|
|
233
|
+
if (provider === "swa-custom") {
|
|
234
|
+
throw new Error("The swa-custom provider is not implemented. Use --provider swa or --provider custom-jwt.");
|
|
235
|
+
}
|
|
236
|
+
if (provider === "none") {
|
|
237
|
+
updateConfigWithAuth(cwd, provider, config.auth?.customJwt || defaultCustomJwtConfig());
|
|
238
|
+
await (0, manifest_1.syncProjectManifest)();
|
|
239
|
+
console.log(" Authentication disabled in swallowkit.config.js");
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
242
|
+
if (provider === "swa") {
|
|
243
|
+
setupSwaAuth(cwd, backendLanguage);
|
|
244
|
+
updateConfigWithAuth(cwd, provider, config.auth?.customJwt || defaultCustomJwtConfig());
|
|
245
|
+
await (0, manifest_1.syncProjectManifest)();
|
|
246
|
+
console.log("\n SWA built-in authentication setup complete!");
|
|
247
|
+
return;
|
|
248
|
+
}
|
|
249
|
+
if (provider === "external-token") {
|
|
250
|
+
setupExternalTokenAuth(cwd, backendLanguage);
|
|
251
|
+
updateConfigWithAuth(cwd, provider, config.auth?.customJwt || defaultCustomJwtConfig());
|
|
252
|
+
await (0, manifest_1.syncProjectManifest)();
|
|
253
|
+
console.log("\n External token authentication setup complete!");
|
|
254
|
+
console.log(" Implement the generated frontend adapter and backend verifier before use.");
|
|
255
|
+
return;
|
|
256
|
+
}
|
|
58
257
|
// Read project name from package.json
|
|
59
258
|
const pkgPath = path.join(cwd, "package.json");
|
|
60
259
|
const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
|
|
@@ -67,15 +266,8 @@ async function addAuthCommand(options) {
|
|
|
67
266
|
sharedPackageName = sharedPkg.name || sharedPackageName;
|
|
68
267
|
}
|
|
69
268
|
// Default custom-jwt config
|
|
70
|
-
const customJwtConfig = config.auth?.customJwt ||
|
|
71
|
-
|
|
72
|
-
userTable: "users",
|
|
73
|
-
loginIdColumn: "login_id",
|
|
74
|
-
passwordHashColumn: "password_hash",
|
|
75
|
-
rolesColumn: "roles",
|
|
76
|
-
jwtSecretEnv: "JWT_SECRET",
|
|
77
|
-
tokenExpiry: "24h",
|
|
78
|
-
};
|
|
269
|
+
const customJwtConfig = config.auth?.customJwt || defaultCustomJwtConfig();
|
|
270
|
+
// custom-jwt setup continues below.
|
|
79
271
|
// 1. Generate shared/models/auth.ts
|
|
80
272
|
console.log(" Generating auth models...");
|
|
81
273
|
const modelsDir = path.join(cwd, "shared", "models");
|
|
@@ -290,10 +482,7 @@ function updateConfigWithAuth(cwd, provider, config) {
|
|
|
290
482
|
}
|
|
291
483
|
const beforeClosing = content.substring(0, closingBraceIdx).trimEnd();
|
|
292
484
|
const needsComma = !beforeClosing.endsWith(",") && !beforeClosing.endsWith("{");
|
|
293
|
-
const
|
|
294
|
-
// 認証認可設定
|
|
295
|
-
auth: {
|
|
296
|
-
provider: '${provider}',
|
|
485
|
+
const providerSettings = provider === "custom-jwt" ? `
|
|
297
486
|
customJwt: {
|
|
298
487
|
userConnector: '${config.userConnector}',
|
|
299
488
|
userTable: '${config.userTable}',
|
|
@@ -302,7 +491,16 @@ function updateConfigWithAuth(cwd, provider, config) {
|
|
|
302
491
|
rolesColumn: '${config.rolesColumn}',
|
|
303
492
|
jwtSecretEnv: '${config.jwtSecretEnv || "JWT_SECRET"}',
|
|
304
493
|
tokenExpiry: '${config.tokenExpiry || "24h"}',
|
|
305
|
-
}
|
|
494
|
+
},` : provider === "swa" ? `
|
|
495
|
+
swa: {
|
|
496
|
+
allowedProviders: ['aad'],
|
|
497
|
+
roleSource: 'swa-roles',
|
|
498
|
+
},` : "";
|
|
499
|
+
const authBlock = `${needsComma ? "," : ""}
|
|
500
|
+
// 認証認可設定
|
|
501
|
+
auth: {
|
|
502
|
+
provider: '${provider}',
|
|
503
|
+
${providerSettings}
|
|
306
504
|
authorization: {
|
|
307
505
|
defaultPolicy: 'authenticated',
|
|
308
506
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-auth.js","sourceRoot":"","sources":["../../../src/cli/commands/add-auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"add-auth.js","sourceRoot":"","sources":["../../../src/cli/commands/add-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,8 @@ export interface DevOptions {
|
|
|
9
9
|
noFunctions?: boolean;
|
|
10
10
|
seedEnv?: string;
|
|
11
11
|
mockConnectors?: boolean;
|
|
12
|
+
swaPort?: string;
|
|
13
|
+
noSwa?: boolean;
|
|
12
14
|
}
|
|
13
15
|
interface FunctionsCoreToolsCommand {
|
|
14
16
|
command: string;
|
|
@@ -21,6 +23,8 @@ export declare function compareVersionNumbers(left: string, right: string): numb
|
|
|
21
23
|
export declare function buildFunctionsCoreToolsCommand(backendLanguage: BackendLanguage, installedVersion: string | null): FunctionsCoreToolsCommand;
|
|
22
24
|
export declare function buildNextDevArgs(pm: string, port: string): string[];
|
|
23
25
|
export declare function buildFunctionsBaseUrl(host: string | undefined, functionsPort: string): string;
|
|
26
|
+
export declare function buildSwaStartArgs(host: string | undefined, nextPort: string, swaPort: string): string[];
|
|
27
|
+
export declare function getSwaCliInstallCommand(pm: string): string;
|
|
24
28
|
export declare function getFunctionsReadinessTimeoutMs(backendLanguage: BackendLanguage): number;
|
|
25
29
|
export declare function waitForHttpServerReady(url: string, timeoutMs?: number, intervalMs?: number): Promise<boolean>;
|
|
26
30
|
export declare function getPythonVirtualEnvPaths(functionsDir: string): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/dev.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBpC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAa9C,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/dev.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBpC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAa9C,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAOD,UAAU,yBAAyB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf;AAaD,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,CAEvE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGnE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAezE;AAED,wBAAgB,8BAA8B,CAC5C,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAC9B,yBAAyB,CAqB3B;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAGnE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAE7F;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CASvG;AAED,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAI1D;AAED,wBAAgB,8BAA8B,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,CAEvF;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,MAAM,EACX,SAAS,SAAS,EAClB,UAAU,SAAM,GACf,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,MAAM,GAAG;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAUA;AAED,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAKnF;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,CAW3G;AAsTD,wBAAgB,eAAe,CAC7B,iBAAiB,GAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAuB,EAC/E,aAAa,GAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,KAAK,IAA8B,GAC3F,OAAO,CA2BT;AAED,eAAO,MAAM,UAAU,SAAoB,CAAC"}
|
package/dist/cli/commands/dev.js
CHANGED
|
@@ -40,6 +40,8 @@ exports.compareVersionNumbers = compareVersionNumbers;
|
|
|
40
40
|
exports.buildFunctionsCoreToolsCommand = buildFunctionsCoreToolsCommand;
|
|
41
41
|
exports.buildNextDevArgs = buildNextDevArgs;
|
|
42
42
|
exports.buildFunctionsBaseUrl = buildFunctionsBaseUrl;
|
|
43
|
+
exports.buildSwaStartArgs = buildSwaStartArgs;
|
|
44
|
+
exports.getSwaCliInstallCommand = getSwaCliInstallCommand;
|
|
43
45
|
exports.getFunctionsReadinessTimeoutMs = getFunctionsReadinessTimeoutMs;
|
|
44
46
|
exports.waitForHttpServerReady = waitForHttpServerReady;
|
|
45
47
|
exports.getPythonVirtualEnvPaths = getPythonVirtualEnvPaths;
|
|
@@ -66,6 +68,7 @@ function normalizeParsedDevOptions(options) {
|
|
|
66
68
|
return {
|
|
67
69
|
...options,
|
|
68
70
|
noFunctions: options.noFunctions ?? options.functions === false,
|
|
71
|
+
noSwa: options.noSwa ?? options.swa === false,
|
|
69
72
|
};
|
|
70
73
|
}
|
|
71
74
|
function buildFunctionsStartArgs(functionsPort) {
|
|
@@ -113,6 +116,21 @@ function buildNextDevArgs(pm, port) {
|
|
|
113
116
|
function buildFunctionsBaseUrl(host, functionsPort) {
|
|
114
117
|
return `http://${host || 'localhost'}:${functionsPort}`;
|
|
115
118
|
}
|
|
119
|
+
function buildSwaStartArgs(host, nextPort, swaPort) {
|
|
120
|
+
return [
|
|
121
|
+
'start',
|
|
122
|
+
`http://${host || 'localhost'}:${nextPort}`,
|
|
123
|
+
'--swa-config-location',
|
|
124
|
+
'.',
|
|
125
|
+
'--port',
|
|
126
|
+
swaPort,
|
|
127
|
+
];
|
|
128
|
+
}
|
|
129
|
+
function getSwaCliInstallCommand(pm) {
|
|
130
|
+
return pm === 'pnpm'
|
|
131
|
+
? 'pnpm add -Dw @azure/static-web-apps-cli'
|
|
132
|
+
: 'npm install -D @azure/static-web-apps-cli';
|
|
133
|
+
}
|
|
116
134
|
function getFunctionsReadinessTimeoutMs(backendLanguage) {
|
|
117
135
|
return backendLanguage === 'csharp' ? 90000 : 30000;
|
|
118
136
|
}
|
|
@@ -385,6 +403,8 @@ function buildDevCommand(runDevEnvironment = startDevEnvironment, verifyProject
|
|
|
385
403
|
.option('--no-functions', 'Skip Azure Functions startup')
|
|
386
404
|
.option('--seed-env <environment>', 'Replace Cosmos DB Emulator data from dev-seeds/<environment> before startup')
|
|
387
405
|
.option('--mock-connectors', 'Start mock server for connector models (serves Zod-generated data)', false)
|
|
406
|
+
.option('--swa-port <port>', 'SWA authentication emulator port', '4280')
|
|
407
|
+
.option('--no-swa', 'Skip the SWA authentication emulator')
|
|
388
408
|
.action(async (options) => {
|
|
389
409
|
const normalizedOptions = normalizeParsedDevOptions(options);
|
|
390
410
|
// SwallowKit プロジェクトディレクトリかどうかを検証
|
|
@@ -480,10 +500,22 @@ async function initializeCosmosDB(databaseName) {
|
|
|
480
500
|
async function startDevEnvironment(options) {
|
|
481
501
|
const port = options.port || '3000';
|
|
482
502
|
const functionsPort = options.functionsPort || '7071';
|
|
503
|
+
const swaPort = options.swaPort || '4280';
|
|
483
504
|
// Detect package manager from project lockfile
|
|
484
505
|
const pm = (0, package_manager_1.detectFromProject)();
|
|
485
506
|
const pmCmd = (0, package_manager_1.getCommands)(pm);
|
|
486
507
|
const backendLanguage = (0, config_1.getBackendLanguage)();
|
|
508
|
+
const authConfig = (0, config_1.getAuthConfig)();
|
|
509
|
+
const useSwaEmulator = authConfig?.provider === 'swa' && !options.noSwa;
|
|
510
|
+
const swaCommand = useSwaEmulator ? await resolveSwaCliCommand(process.cwd()) : null;
|
|
511
|
+
if (useSwaEmulator && !swaCommand) {
|
|
512
|
+
const installCommand = getSwaCliInstallCommand(pm);
|
|
513
|
+
console.error('❌ SWA authentication requires Azure Static Web Apps CLI for local development.');
|
|
514
|
+
console.error(' Install it in this project and retry:');
|
|
515
|
+
console.error(`\n ${installCommand}\n`);
|
|
516
|
+
process.exitCode = 1;
|
|
517
|
+
return;
|
|
518
|
+
}
|
|
487
519
|
// プロセスを管理する配列
|
|
488
520
|
const processes = [];
|
|
489
521
|
let functionsEnv = process.env;
|
|
@@ -753,7 +785,6 @@ async function startDevEnvironment(options) {
|
|
|
753
785
|
const allModels = await (0, dev_seeds_1.loadProjectModels)();
|
|
754
786
|
const connectorModels = allModels.filter((m) => m.connectorConfig);
|
|
755
787
|
// Resolve auth config — auth functions use RDB connectors, mocked alongside other models
|
|
756
|
-
const authConfig = (0, config_1.getAuthConfig)();
|
|
757
788
|
let mockAuthConfig;
|
|
758
789
|
if (authConfig?.provider === 'custom-jwt' && authConfig.customJwt) {
|
|
759
790
|
// Read JWT_SECRET from functions/local.settings.json if available
|
|
@@ -810,16 +841,6 @@ async function startDevEnvironment(options) {
|
|
|
810
841
|
}
|
|
811
842
|
// 5. Start Next.js development server
|
|
812
843
|
const nextArgs = buildNextDevArgs(pm, port);
|
|
813
|
-
if (options.open) {
|
|
814
|
-
// Next.js 14+ deprecated --open option, so we open browser manually
|
|
815
|
-
setTimeout(() => {
|
|
816
|
-
const url = `http://${options.host || 'localhost'}:${port}`;
|
|
817
|
-
console.log(`\n🌐 Opening browser: ${url}`);
|
|
818
|
-
const start = process.platform === 'darwin' ? 'open' :
|
|
819
|
-
process.platform === 'win32' ? 'start' : 'xdg-open';
|
|
820
|
-
(0, child_process_1.spawn)(start, [url], { shell: true });
|
|
821
|
-
}, 3000);
|
|
822
|
-
}
|
|
823
844
|
// Ensure .env.local points to bffTargetPort so Next.js reads the correct backend URL.
|
|
824
845
|
// When --mock-connectors is active, bffTargetPort = mock port (7072); otherwise = Functions port (7071).
|
|
825
846
|
// Next.js may load .env.local values that override spawn env vars, so we must keep them in sync.
|
|
@@ -878,10 +899,50 @@ async function startDevEnvironment(options) {
|
|
|
878
899
|
console.log(`⚠️ Azure Functions is still starting: ${functionsBaseUrl}`);
|
|
879
900
|
}
|
|
880
901
|
}
|
|
902
|
+
let swaReady = false;
|
|
903
|
+
if (useSwaEmulator && swaCommand) {
|
|
904
|
+
const nextUrl = `http://${options.host || 'localhost'}:${port}`;
|
|
905
|
+
console.log(`⏳ Waiting for Next.js before starting the SWA emulator at ${nextUrl}...`);
|
|
906
|
+
const nextReady = await waitForHttpServerReady(nextUrl);
|
|
907
|
+
if (!nextReady) {
|
|
908
|
+
throw new Error(`Next.js did not become ready at ${nextUrl}`);
|
|
909
|
+
}
|
|
910
|
+
console.log(`🔐 Starting SWA authentication emulator (port: ${swaPort})...`);
|
|
911
|
+
const swaProcess = (0, child_process_1.spawn)(swaCommand, buildSwaStartArgs(options.host, port, swaPort), {
|
|
912
|
+
cwd: process.cwd(),
|
|
913
|
+
shell: true,
|
|
914
|
+
stdio: 'inherit',
|
|
915
|
+
env: process.env,
|
|
916
|
+
});
|
|
917
|
+
processes.push(swaProcess);
|
|
918
|
+
swaProcess.on('error', (error) => {
|
|
919
|
+
console.error('❌ SWA CLI startup error:', error.message);
|
|
920
|
+
});
|
|
921
|
+
const swaUrl = `http://${options.host || 'localhost'}:${swaPort}`;
|
|
922
|
+
swaReady = await waitForHttpServerReady(swaUrl);
|
|
923
|
+
if (!swaReady) {
|
|
924
|
+
throw new Error(`SWA authentication emulator did not become ready at ${swaUrl}`);
|
|
925
|
+
}
|
|
926
|
+
}
|
|
881
927
|
console.log('');
|
|
882
928
|
console.log('✅ SwallowKit development environment is running!');
|
|
883
929
|
console.log('');
|
|
884
|
-
|
|
930
|
+
if (useSwaEmulator) {
|
|
931
|
+
const swaUrl = `http://${options.host || 'localhost'}:${swaPort}`;
|
|
932
|
+
console.log('🔐 SWA authenticated app:');
|
|
933
|
+
console.log(` ${swaUrl}`);
|
|
934
|
+
console.log('');
|
|
935
|
+
console.log('🔑 Local sign-in:');
|
|
936
|
+
console.log(` ${swaUrl}/.auth/login/aad`);
|
|
937
|
+
console.log(' Enter any username and select Login.');
|
|
938
|
+
console.log(' The "authenticated" role is added automatically.');
|
|
939
|
+
console.log('');
|
|
940
|
+
console.log('📱 Next.js direct access (authentication is not emulated):');
|
|
941
|
+
console.log(` http://${options.host || 'localhost'}:${port}`);
|
|
942
|
+
}
|
|
943
|
+
else {
|
|
944
|
+
console.log(`📱 Next.js: http://${options.host || 'localhost'}:${port}`);
|
|
945
|
+
}
|
|
885
946
|
if (hasFunctions && !options.noFunctions) {
|
|
886
947
|
console.log(`${functionsReady ? '⚡ Azure Functions' : '⏳ Azure Functions (starting)'}: ${functionsBaseUrl}`);
|
|
887
948
|
}
|
|
@@ -898,7 +959,20 @@ async function startDevEnvironment(options) {
|
|
|
898
959
|
if (mockServer) {
|
|
899
960
|
console.log('💡 Connector models served from mock server (Zod-generated data)');
|
|
900
961
|
}
|
|
962
|
+
if (swaReady) {
|
|
963
|
+
console.log('💡 Open the app through the SWA port when testing authenticated pages and CRUD APIs.');
|
|
964
|
+
}
|
|
901
965
|
console.log('');
|
|
966
|
+
if (options.open) {
|
|
967
|
+
const url = useSwaEmulator
|
|
968
|
+
? `http://${options.host || 'localhost'}:${swaPort}`
|
|
969
|
+
: `http://${options.host || 'localhost'}:${port}`;
|
|
970
|
+
console.log(`🌐 Opening browser: ${url}`);
|
|
971
|
+
const start = process.platform === 'darwin' ? 'open' :
|
|
972
|
+
process.platform === 'win32' ? 'start' : 'xdg-open';
|
|
973
|
+
(0, child_process_1.spawn)(start, [url], { shell: true });
|
|
974
|
+
console.log('');
|
|
975
|
+
}
|
|
902
976
|
console.log('🛑 Press Ctrl+C to stop');
|
|
903
977
|
console.log('');
|
|
904
978
|
}
|
|
@@ -912,6 +986,20 @@ async function startDevEnvironment(options) {
|
|
|
912
986
|
process.exit(1);
|
|
913
987
|
}
|
|
914
988
|
}
|
|
989
|
+
async function resolveSwaCliCommand(projectRoot) {
|
|
990
|
+
const binaryName = process.platform === 'win32' ? 'swa.cmd' : 'swa';
|
|
991
|
+
const localCommand = path.join(projectRoot, 'node_modules', '.bin', binaryName);
|
|
992
|
+
if (fs.existsSync(localCommand) && await checkCommand(localCommand, ['--version'], {
|
|
993
|
+
cwd: projectRoot,
|
|
994
|
+
shell: process.platform === 'win32',
|
|
995
|
+
})) {
|
|
996
|
+
return localCommand;
|
|
997
|
+
}
|
|
998
|
+
if (await checkCommand('swa', ['--version'], { cwd: projectRoot })) {
|
|
999
|
+
return 'swa';
|
|
1000
|
+
}
|
|
1001
|
+
return null;
|
|
1002
|
+
}
|
|
915
1003
|
async function runCommand(command, args, cwd, label, env, shell = true) {
|
|
916
1004
|
await new Promise((resolve, reject) => {
|
|
917
1005
|
const child = (0, child_process_1.spawn)(command, args, {
|