Skip to content

Commit 13a3309

Browse files
jeff-zuckerjeff-zucker
committed
make ess optional
1 parent 8871852 commit 13a3309

File tree

4 files changed

+45
-34
lines changed

4 files changed

+45
-34
lines changed

‎dist/cjs/index.js

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ var NoAuthSession_1 = require("./NoAuthSession");
160160
// TBD rename NssAuth -> UserAuth; EssAuth -> TokenAuth
161161
//
162162
var NssAuthSession_1 = require("./NssAuthSession");
163-
var EssAuthSession_1 = require("./EssAuthSession");
164163
var file_1 = require("@solid-rest/file");
165164
var cross_fetch_1 = __importDefault(require("cross-fetch"));
166165
var UrlObj = __importStar(require("url"));
@@ -199,7 +198,7 @@ var SolidNodeClient = /** @class */function () {
199198
};
200199
SolidNodeClient.prototype.login = function () {
201200
return __awaiter(this, arguments, void 0, function (credentials, protocol) {
202-
var session, _a;
201+
var EssAuthSession, session, _a;
203202
if (credentials === void 0) {
204203
credentials = {};
205204
}
@@ -214,22 +213,31 @@ var SolidNodeClient = /** @class */function () {
214213
credentials.username = process.env.SOLID_USERNAME;
215214
credentials.password = process.env.SOLID_PASSWORD;
216215
}
217-
if (this.handlers.userHttps) {
218-
this.handlers.https = this.handlers.userHttps;
219-
} else if (credentials.username && credentials.password && credentials.idp) {
220-
this.handlers.https = new NssAuthSession_1.NssAuthSession();
221-
} else {
222-
this.handlers.https = new EssAuthSession_1.EssAuthSession();
223-
}
224-
if (!this.handlers[protocol]) return [3 /*break*/, 2];
225-
return [4 /*yield*/, this.handlers[protocol].login(credentials, this.appUrl)];
216+
if (!this.handlers.userHttps) return [3 /*break*/, 1];
217+
this.handlers.https = this.handlers.userHttps;
218+
return [3 /*break*/, 4];
226219
case 1:
227-
_a = _b.sent();
228-
return [3 /*break*/, 3];
220+
if (!(credentials.username && credentials.password && credentials.idp)) return [3 /*break*/, 2];
221+
this.handlers.https = new NssAuthSession_1.NssAuthSession();
222+
return [3 /*break*/, 4];
229223
case 2:
230-
_a = this.handlers.file.session;
231-
_b.label = 3;
224+
return [4 /*yield*/, Promise.resolve().then(function () {
225+
return __importStar(require('./EssAuthSession'));
226+
})];
232227
case 3:
228+
EssAuthSession = _b.sent().EssAuthSession;
229+
this.handlers.https = new EssAuthSession();
230+
_b.label = 4;
231+
case 4:
232+
if (!this.handlers[protocol]) return [3 /*break*/, 6];
233+
return [4 /*yield*/, this.handlers[protocol].login(credentials, this.appUrl)];
234+
case 5:
235+
_a = _b.sent();
236+
return [3 /*break*/, 7];
237+
case 6:
238+
_a = this.handlers.file.session;
239+
_b.label = 7;
240+
case 7:
233241
session = _a;
234242
session || (session = this.handlers.file.session);
235243
return [2 /*return*/, session];

‎dist/esm/index.js

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ var NoAuthSession_1 = require("./NoAuthSession");
6868
// TBD rename NssAuth -> UserAuth; EssAuth -> TokenAuth
6969
//
7070
var NssAuthSession_1 = require("./NssAuthSession");
71-
var EssAuthSession_1 = require("./EssAuthSession");
7271
var file_1 = require("@solid-rest/file");
7372
var cross_fetch_1 = __importDefault(require("cross-fetch"));
7473
var UrlObj = __importStar(require("url"));
@@ -107,7 +106,7 @@ var SolidNodeClient = /** @class */ (function () {
107106
};
108107
SolidNodeClient.prototype.login = function () {
109108
return __awaiter(this, arguments, void 0, function (credentials, protocol) {
110-
var session, _a;
109+
var EssAuthSession, session, _a;
111110
if (credentials === void 0) { credentials = {}; }
112111
if (protocol === void 0) { protocol = "https"; }
113112
return __generator(this, function (_b) {
@@ -118,24 +117,28 @@ var SolidNodeClient = /** @class */ (function () {
118117
credentials.username = process.env.SOLID_USERNAME;
119118
credentials.password = process.env.SOLID_PASSWORD;
120119
}
121-
if (this.handlers.userHttps) {
122-
this.handlers.https = this.handlers.userHttps;
123-
}
124-
else if (credentials.username && credentials.password && credentials.idp) {
125-
this.handlers.https = new NssAuthSession_1.NssAuthSession();
126-
}
127-
else {
128-
this.handlers.https = new EssAuthSession_1.EssAuthSession();
129-
}
130-
if (!this.handlers[protocol]) return [3 /*break*/, 2];
131-
return [4 /*yield*/, this.handlers[protocol].login(credentials, this.appUrl)];
120+
if (!this.handlers.userHttps) return [3 /*break*/, 1];
121+
this.handlers.https = this.handlers.userHttps;
122+
return [3 /*break*/, 4];
132123
case 1:
124+
if (!(credentials.username && credentials.password && credentials.idp)) return [3 /*break*/, 2];
125+
this.handlers.https = new NssAuthSession_1.NssAuthSession();
126+
return [3 /*break*/, 4];
127+
case 2: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('./EssAuthSession')); })];
128+
case 3:
129+
EssAuthSession = (_b.sent()).EssAuthSession;
130+
this.handlers.https = new EssAuthSession();
131+
_b.label = 4;
132+
case 4:
133+
if (!this.handlers[protocol]) return [3 /*break*/, 6];
134+
return [4 /*yield*/, this.handlers[protocol].login(credentials, this.appUrl)];
135+
case 5:
133136
_a = _b.sent();
134-
return [3 /*break*/, 3];
135-
case 2:
137+
return [3 /*break*/, 7];
138+
case 6:
136139
_a = this.handlers.file.session;
137-
_b.label = 3;
138-
case 3:
140+
_b.label = 7;
141+
case 7:
139142
session = _a;
140143
session || (session = this.handlers.file.session);
141144
return [2 /*return*/, session];

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "solid-node-client",
3-
"version": "2.1.18",
3+
"version": "2.1.19",
44
"description": "a client for nodejs access to Solid",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",

‎src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {NoAuthSession} from './NoAuthSession'
44
// TBD rename NssAuth -> UserAuth; EssAuth -> TokenAuth
55
//
66
import {NssAuthSession} from './NssAuthSession'
7-
import {EssAuthSession} from './EssAuthSession'
87
import {SolidRestFile} from '@solid-rest/file';
98
import fetch from "cross-fetch";
109
import * as UrlObj from 'url';
@@ -50,6 +49,7 @@ export class SolidNodeClient {
5049
this.handlers.https = new NssAuthSession();
5150
}
5251
else {
52+
const {EssAuthSession} = await import('./EssAuthSession');
5353
this.handlers.https = new EssAuthSession();
5454
}
5555
let session = this.handlers[protocol] ?await this.handlers[protocol].login(credentials, this.appUrl) :this.handlers.file.session;

0 commit comments

Comments
 (0)