@kaapi/server 0.0.10 → 0.0.11
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/lib/index.js +42 -24
- package/lib/index.js.map +1 -1
- package/package.json +1 -1
package/lib/index.js
CHANGED
|
@@ -11,15 +11,8 @@ class KaapiServer {
|
|
|
11
11
|
return tslib_1.__classPrivateFieldGet(this, _KaapiServer_server, "f");
|
|
12
12
|
}
|
|
13
13
|
constructor(opts) {
|
|
14
|
-
var _a;
|
|
15
14
|
_KaapiServer_server.set(this, void 0);
|
|
16
|
-
const
|
|
17
|
-
if (((_a = serverOpts.routes) === null || _a === void 0 ? void 0 : _a.auth) &&
|
|
18
|
-
typeof serverOpts.routes.auth === 'object' &&
|
|
19
|
-
!serverOpts.routes.auth.strategies &&
|
|
20
|
-
!serverOpts.routes.auth.strategy) {
|
|
21
|
-
serverOpts.routes.auth.strategy = 'kaapi';
|
|
22
|
-
}
|
|
15
|
+
const _a = opts || {}, { auth: authOpts } = _a, serverOpts = tslib_1.__rest(_a, ["auth"]);
|
|
23
16
|
tslib_1.__classPrivateFieldSet(this, _KaapiServer_server, hapi_1.default.server(serverOpts), "f");
|
|
24
17
|
// register the auth scheme
|
|
25
18
|
tslib_1.__classPrivateFieldGet(this, _KaapiServer_server, "f").auth.scheme('kaapi-auth', (_server, options) => {
|
|
@@ -36,7 +29,7 @@ class KaapiServer {
|
|
|
36
29
|
let token = authSplit[1];
|
|
37
30
|
if (tokenType.toLowerCase() !== ((_a = settings.tokenType) === null || _a === void 0 ? void 0 : _a.toLowerCase())) {
|
|
38
31
|
token = '';
|
|
39
|
-
return boom_1.default.unauthorized(null, tokenType);
|
|
32
|
+
return boom_1.default.unauthorized(null, settings.tokenType || '');
|
|
40
33
|
}
|
|
41
34
|
if (settings.validate) {
|
|
42
35
|
try {
|
|
@@ -61,7 +54,7 @@ class KaapiServer {
|
|
|
61
54
|
return boom_1.default.internal(err instanceof Error ? err : `${err}`);
|
|
62
55
|
}
|
|
63
56
|
}
|
|
64
|
-
return
|
|
57
|
+
return boom_1.default.unauthorized(null, settings.tokenType || '');
|
|
65
58
|
});
|
|
66
59
|
},
|
|
67
60
|
};
|
|
@@ -76,25 +69,50 @@ class KaapiServer {
|
|
|
76
69
|
if (!serverRoute.path)
|
|
77
70
|
serverRoute.path = '/{any*}';
|
|
78
71
|
const { auth } = serverRoute, route = tslib_1.__rest(serverRoute, ["auth"]);
|
|
79
|
-
if (auth
|
|
80
|
-
(
|
|
81
|
-
typeof route.options != 'function' &&
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
route.options = {};
|
|
72
|
+
if (auth === false) {
|
|
73
|
+
if (route.options &&
|
|
74
|
+
typeof route.options != 'function' &&
|
|
75
|
+
typeof route.options.auth != 'undefined' &&
|
|
76
|
+
(typeof route.options.auth != 'boolean' ||
|
|
77
|
+
route.options.auth !== false)) {
|
|
78
|
+
throw new Error(`Ambiguous auth configuration. It cannot be "${auth}" and "${route.options.auth}" simultaneously: "${route.method}: ${route.path}".`);
|
|
87
79
|
}
|
|
88
|
-
if (!route.options
|
|
89
|
-
route.options
|
|
80
|
+
else if (!route.options ||
|
|
81
|
+
typeof route.options != 'function') {
|
|
82
|
+
if (!route.options) {
|
|
83
|
+
route.options = {};
|
|
84
|
+
}
|
|
85
|
+
if (!route.options.auth) {
|
|
86
|
+
route.options.auth = false;
|
|
87
|
+
}
|
|
90
88
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
89
|
+
}
|
|
90
|
+
if (auth) {
|
|
91
|
+
if (route.options &&
|
|
92
|
+
typeof route.options != 'function' &&
|
|
93
|
+
route.options.auth === false) {
|
|
94
|
+
throw new Error(`Ambiguous auth configuration. It cannot be "${auth}" and "${route.options.auth}" simultaneously: "${route.method}: ${route.path}".`);
|
|
95
|
+
}
|
|
96
|
+
else if (!route.options ||
|
|
97
|
+
typeof route.options != 'function' && (!route.options.auth ||
|
|
98
|
+
typeof route.options.auth === 'object')) {
|
|
99
|
+
if (!route.options) {
|
|
100
|
+
route.options = {};
|
|
101
|
+
}
|
|
102
|
+
if (!route.options.auth) {
|
|
103
|
+
route.options.auth = {};
|
|
104
|
+
}
|
|
105
|
+
if (typeof route.options.auth === 'object') {
|
|
106
|
+
if (!route.options.auth.mode || route.options.auth.mode === 'required') {
|
|
107
|
+
route.options.auth.mode = 'required';
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
throw new Error(`Ambiguous auth configuration. It cannot be "${auth}" and "${route.options.auth.mode}" simultaneously: "${route.method}: ${route.path}".`);
|
|
111
|
+
}
|
|
95
112
|
}
|
|
96
113
|
}
|
|
97
114
|
}
|
|
115
|
+
// override handler
|
|
98
116
|
if (handler)
|
|
99
117
|
route.handler = handler;
|
|
100
118
|
tslib_1.__classPrivateFieldGet(this, _KaapiServer_server, "f").route(route);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAAA,8DAA8B;AAC9B,8DAA6B;AAC7B,8DAA6B;AAqB7B,MAAa,WAAW;IAIpB,IAAI,MAAM;QACN,OAAO,+BAAA,IAAI,2BAAQ,CAAA;IACvB,CAAC;IAED,YAAY,IAAqC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|