@budibase/backend-core 2.6.26 → 2.6.28-alpha.0
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/package.json +3 -3
- package/dist/src/events/publishers/user.d.ts +2 -0
- package/dist/src/events/publishers/user.js +10 -0
- package/dist/src/events/publishers/user.js.map +1 -1
- package/dist/src/middleware/passport/datasource/google.js +9 -22
- package/dist/src/middleware/passport/datasource/google.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/events/publishers/user.ts +11 -0
- package/src/middleware/passport/datasource/google.ts +14 -21
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.6.
|
|
3
|
+
"version": "2.6.28-alpha.0",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@budibase/nano": "10.1.2",
|
|
24
24
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
25
|
-
"@budibase/types": "2.6.
|
|
25
|
+
"@budibase/types": "2.6.28-alpha.0",
|
|
26
26
|
"@shopify/jest-koa-mocks": "5.0.1",
|
|
27
27
|
"@techpass/passport-openidconnect": "0.3.2",
|
|
28
28
|
"aws-cloudfront-sign": "2.2.0",
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "2598ba9e5338d7ea9094b31957f40407341bde47"
|
|
105
105
|
}
|
|
@@ -13,6 +13,7 @@ declare function passwordForceReset(user: User): Promise<void>;
|
|
|
13
13
|
declare function passwordUpdated(user: User): Promise<void>;
|
|
14
14
|
declare function passwordResetRequested(user: User): Promise<void>;
|
|
15
15
|
declare function passwordReset(user: User): Promise<void>;
|
|
16
|
+
declare function dataCollaboration(users: number): Promise<void>;
|
|
16
17
|
declare const _default: {
|
|
17
18
|
created: typeof created;
|
|
18
19
|
updated: typeof updated;
|
|
@@ -28,5 +29,6 @@ declare const _default: {
|
|
|
28
29
|
passwordUpdated: typeof passwordUpdated;
|
|
29
30
|
passwordResetRequested: typeof passwordResetRequested;
|
|
30
31
|
passwordReset: typeof passwordReset;
|
|
32
|
+
dataCollaboration: typeof dataCollaboration;
|
|
31
33
|
};
|
|
32
34
|
export default _default;
|
|
@@ -173,6 +173,15 @@ function passwordReset(user) {
|
|
|
173
173
|
yield (0, events_1.publishEvent)(types_1.Event.USER_PASSWORD_RESET, properties);
|
|
174
174
|
});
|
|
175
175
|
}
|
|
176
|
+
// COLLABORATION
|
|
177
|
+
function dataCollaboration(users) {
|
|
178
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
179
|
+
const properties = {
|
|
180
|
+
users,
|
|
181
|
+
};
|
|
182
|
+
yield (0, events_1.publishEvent)(types_1.Event.USER_DATA_COLLABORATION, properties);
|
|
183
|
+
});
|
|
184
|
+
}
|
|
176
185
|
exports.default = {
|
|
177
186
|
created,
|
|
178
187
|
updated,
|
|
@@ -188,5 +197,6 @@ exports.default = {
|
|
|
188
197
|
passwordUpdated,
|
|
189
198
|
passwordResetRequested,
|
|
190
199
|
passwordReset,
|
|
200
|
+
dataCollaboration,
|
|
191
201
|
};
|
|
192
202
|
//# sourceMappingURL=user.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../src/events/publishers/user.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../src/events/publishers/user.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,9 +36,9 @@ exports.postAuth = exports.preAuth = void 0;
|
|
|
36
36
|
const google = __importStar(require("../sso/google"));
|
|
37
37
|
const constants_1 = require("../../../constants");
|
|
38
38
|
const utils_1 = require("../../../utils");
|
|
39
|
-
const db_1 = require("../../../db");
|
|
40
39
|
const configs = __importStar(require("../../../configs"));
|
|
41
40
|
const sso_1 = require("../sso/sso");
|
|
41
|
+
const __1 = require("../../../");
|
|
42
42
|
const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy;
|
|
43
43
|
function fetchGoogleCreds() {
|
|
44
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -56,8 +56,8 @@ function preAuth(passport, ctx, next) {
|
|
|
56
56
|
const platformUrl = yield configs.getPlatformUrl({ tenantAware: false });
|
|
57
57
|
let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback`;
|
|
58
58
|
const strategy = yield google.strategyFactory(googleConfig, callbackUrl, sso_1.ssoSaveUserNoOp);
|
|
59
|
-
if (!ctx.query.appId
|
|
60
|
-
ctx.throw(400, "appId
|
|
59
|
+
if (!ctx.query.appId) {
|
|
60
|
+
ctx.throw(400, "appId query param not present.");
|
|
61
61
|
}
|
|
62
62
|
return passport.authenticate(strategy, {
|
|
63
63
|
scope: ["profile", "email", "https://www.googleapis.com/auth/spreadsheets"],
|
|
@@ -78,29 +78,16 @@ function postAuth(passport, ctx, next) {
|
|
|
78
78
|
clientID: config.clientID,
|
|
79
79
|
clientSecret: config.clientSecret,
|
|
80
80
|
callbackURL: callbackUrl,
|
|
81
|
-
}, (accessToken, refreshToken,
|
|
81
|
+
}, (accessToken, refreshToken, _profile, done) => {
|
|
82
82
|
(0, utils_1.clearCookie)(ctx, constants_1.Cookie.DatasourceAuth);
|
|
83
83
|
done(null, { accessToken, refreshToken });
|
|
84
84
|
}), { successRedirect: "/", failureRedirect: "/error" }, (err, tokens) => __awaiter(this, void 0, void 0, function* () {
|
|
85
85
|
const baseUrl = `/builder/app/${authStateCookie.appId}/data`;
|
|
86
|
-
|
|
87
|
-
yield
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}
|
|
92
|
-
catch (err) {
|
|
93
|
-
if (err.status === 404) {
|
|
94
|
-
ctx.redirect(baseUrl);
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
if (!datasource.config) {
|
|
98
|
-
datasource.config = {};
|
|
99
|
-
}
|
|
100
|
-
datasource.config.auth = Object.assign({ type: "google" }, tokens);
|
|
101
|
-
yield db.put(datasource);
|
|
102
|
-
ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`);
|
|
103
|
-
}));
|
|
86
|
+
const id = __1.utils.newid();
|
|
87
|
+
yield __1.cache.store(`datasource:creation:${authStateCookie.appId}:google:${id}`, {
|
|
88
|
+
tokens,
|
|
89
|
+
});
|
|
90
|
+
ctx.redirect(`${baseUrl}/new?continue_google_setup=${id}`);
|
|
104
91
|
}))(ctx, next);
|
|
105
92
|
});
|
|
106
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../../../../src/middleware/passport/datasource/google.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAuC;AACvC,kDAA2C;AAC3C,0CAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../../../../src/middleware/passport/datasource/google.ts"],"names":[],"mappings":"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"}
|