zenstack 0.1.22 → 0.1.24
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.
|
@@ -31,9 +31,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
31
31
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
34
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
38
|
const ts_morph_1 = require("ts-morph");
|
|
36
39
|
const path = __importStar(require("path"));
|
|
40
|
+
const colors_1 = __importDefault(require("colors"));
|
|
37
41
|
class NextAuthGenerator {
|
|
38
42
|
generate(context) {
|
|
39
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -42,6 +46,7 @@ class NextAuthGenerator {
|
|
|
42
46
|
this.generateAdapter(project, context);
|
|
43
47
|
this.generateAuthorize(project, context);
|
|
44
48
|
yield project.save();
|
|
49
|
+
console.log(colors_1.default.blue(` ✔️ Next-auth adapter generated`));
|
|
45
50
|
});
|
|
46
51
|
}
|
|
47
52
|
generateIndex(project, context) {
|
|
@@ -135,6 +140,10 @@ class NextAuthGenerator {
|
|
|
135
140
|
return async (
|
|
136
141
|
credentials: Record<'email' | 'password', string> | undefined
|
|
137
142
|
) => {
|
|
143
|
+
if (!credentials) {
|
|
144
|
+
throw new Error('Missing credentials');
|
|
145
|
+
}
|
|
146
|
+
|
|
138
147
|
try {
|
|
139
148
|
let maybeUser = await service.db.user.findFirst({
|
|
140
149
|
where: {
|
|
@@ -149,14 +158,14 @@ class NextAuthGenerator {
|
|
|
149
158
|
});
|
|
150
159
|
|
|
151
160
|
if (!maybeUser) {
|
|
152
|
-
if (!credentials
|
|
161
|
+
if (!credentials.password || !credentials.email) {
|
|
153
162
|
throw new Error('Invalid Credentials');
|
|
154
163
|
}
|
|
155
164
|
|
|
156
165
|
maybeUser = await service.db.user.create({
|
|
157
166
|
data: {
|
|
158
|
-
email: credentials
|
|
159
|
-
password: await hashPassword(credentials
|
|
167
|
+
email: credentials.email,
|
|
168
|
+
password: await hashPassword(credentials.password),
|
|
160
169
|
},
|
|
161
170
|
select: {
|
|
162
171
|
id: true,
|
|
@@ -166,8 +175,12 @@ class NextAuthGenerator {
|
|
|
166
175
|
},
|
|
167
176
|
});
|
|
168
177
|
} else {
|
|
178
|
+
if (!maybeUser.password) {
|
|
179
|
+
throw new Error('Invalid User Record');
|
|
180
|
+
}
|
|
181
|
+
|
|
169
182
|
const isValid = await verifyPassword(
|
|
170
|
-
credentials
|
|
183
|
+
credentials.password,
|
|
171
184
|
maybeUser.password
|
|
172
185
|
);
|
|
173
186
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generator/next-auth/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generator/next-auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAmC;AACnC,2CAA6B;AAC7B,oDAA4B;AAE5B,MAAqB,iBAAiB;IAC5B,QAAQ,CAAC,OAAgB;;YAC3B,MAAM,OAAO,GAAG,IAAI,kBAAO,EAAE,CAAC;YAE9B,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACrC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACvC,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAEzC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YAErB,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC,CAAC;QACjE,CAAC;KAAA;IAED,aAAa,CAAC,OAAgB,EAAE,OAAgB;QAC5C,MAAM,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAC9C,SAAS,EACT,EAAE,SAAS,EAAE,IAAI,EAAE,CACtB,CAAC;QAEF,EAAE,CAAC,aAAa,CAAC;YACb,sCAAsC;YACtC,8BAA8B;SACjC,CAAC,CAAC;QAEH,EAAE,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAED,eAAe,CAAC,OAAgB,EAAE,OAAgB;QAC9C,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA2Df,CAAC;QAEF,MAAM,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,+BAA+B,CAAC,EAC1D,OAAO,EACP,EAAE,SAAS,EAAE,IAAI,EAAE,CACtB,CAAC;QAEF,EAAE,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAED,iBAAiB,CAAC,OAAgB,EAAE,OAAgB;QAChD,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA8Ef,CAAC;QAEF,MAAM,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAC/B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAClD,OAAO,EACP,EAAE,SAAS,EAAE,IAAI,EAAE,CACtB,CAAC;QAEF,EAAE,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;CACJ;AA5LD,oCA4LC"}
|
|
@@ -25,7 +25,7 @@ class PrismaGenerator {
|
|
|
25
25
|
yield this.generatePrismaClient(schemaFile);
|
|
26
26
|
// generate prisma query guard
|
|
27
27
|
yield new query_gard_generator_1.default(context).generate();
|
|
28
|
-
console.log(colors_1.default.blue(` ✔️ Prisma schema and query
|
|
28
|
+
console.log(colors_1.default.blue(` ✔️ Prisma schema and query guard generated`));
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
31
|
generatePrismaClient(schemaFile) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generator/prisma/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA4B;AAE5B,iDAAyC;AACzC,0EAAuD;AACvD,kFAAyD;AAEzD,MAAqB,eAAe;IAC1B,QAAQ,CAAC,OAAgB;;YAC3B,yBAAyB;YACzB,MAAM,UAAU,GAAG,MAAM,IAAI,0BAAqB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEvE,iDAAiD;YACjD,MAAM,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAE5C,8BAA8B;YAC9B,MAAM,IAAI,8BAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;YAElD,OAAO,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/generator/prisma/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA4B;AAE5B,iDAAyC;AACzC,0EAAuD;AACvD,kFAAyD;AAEzD,MAAqB,eAAe;IAC1B,QAAQ,CAAC,OAAgB;;YAC3B,yBAAyB;YACzB,MAAM,UAAU,GAAG,MAAM,IAAI,0BAAqB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEvE,iDAAiD;YACjD,MAAM,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAE5C,8BAA8B;YAC9B,MAAM,IAAI,8BAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;YAElD,OAAO,CAAC,GAAG,CACP,gBAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAC9D,CAAC;QACN,CAAC;KAAA;IAEK,oBAAoB,CAAC,UAAkB;;YACzC,IAAA,wBAAQ,EAAC,iCAAiC,UAAU,GAAG,CAAC,CAAC;QAC7D,CAAC;KAAA;CACJ;AAnBD,kCAmBC"}
|
|
@@ -72,7 +72,7 @@ class ReactHooksGenerator {
|
|
|
72
72
|
};
|
|
73
73
|
|
|
74
74
|
function makeUrl(url: string, args: unknown) {
|
|
75
|
-
return args ? url +
|
|
75
|
+
return args ? url + \`?q=\${encodeURIComponent(JSON.stringify(args))}\` : url;
|
|
76
76
|
}
|
|
77
77
|
|
|
78
78
|
export function get<Data, Error = any>(url: string, args?: unknown) {
|