@jd-data-limited/easy-fm 1.1.2-alpha1 → 1.1.3-alpha2
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/index.js +9 -9
- package/index.ts +9 -9
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -63,14 +63,14 @@ export default class FileMakerConnection {
|
|
|
63
63
|
return new Promise((resolve, reject) => {
|
|
64
64
|
if (this.token)
|
|
65
65
|
throw new Error("Already logged in. Run logout() first");
|
|
66
|
-
if (this.databaseConDetails
|
|
66
|
+
if (this.databaseConDetails.database.method === "filemaker") {
|
|
67
67
|
fetch(`${this.endpoint}/sessions`, {
|
|
68
68
|
hostname: this.hostname,
|
|
69
69
|
port: 443,
|
|
70
70
|
method: "POST",
|
|
71
71
|
headers: {
|
|
72
72
|
"Content-Type": "application/json",
|
|
73
|
-
"Authorization": "Basic " + Buffer.from(this.databaseConDetails
|
|
73
|
+
"Authorization": "Basic " + Buffer.from(this.databaseConDetails.database.username + ":" + this.databaseConDetails.database.password).toString("base64")
|
|
74
74
|
},
|
|
75
75
|
body: JSON.stringify({
|
|
76
76
|
fmDataSource: this.databaseConDetails.externalSources.map(i => {
|
|
@@ -92,17 +92,17 @@ export default class FileMakerConnection {
|
|
|
92
92
|
reject(e);
|
|
93
93
|
});
|
|
94
94
|
}
|
|
95
|
-
else if (this.databaseConDetails
|
|
96
|
-
this._token = this.databaseConDetails
|
|
95
|
+
else if (this.databaseConDetails.database.method === "token") {
|
|
96
|
+
this._token = this.databaseConDetails.database.token;
|
|
97
97
|
resolve(this.token);
|
|
98
98
|
}
|
|
99
|
-
else if (this.databaseConDetails
|
|
99
|
+
else if (this.databaseConDetails.database.method === "oauth") {
|
|
100
100
|
fetch(`${this.endpoint}/sessions`, {
|
|
101
101
|
method: "POST",
|
|
102
102
|
headers: {
|
|
103
103
|
"Content-Type": "application/json",
|
|
104
|
-
"X-FM-Data-OAuth-RequestId": this.databaseConDetails
|
|
105
|
-
"X-FM-Data-OAuth-Identifier": this.databaseConDetails
|
|
104
|
+
"X-FM-Data-OAuth-RequestId": this.databaseConDetails.database.oauth.requestId,
|
|
105
|
+
"X-FM-Data-OAuth-Identifier": this.databaseConDetails.database.oauth.requestIdentifier
|
|
106
106
|
},
|
|
107
107
|
body: JSON.stringify({
|
|
108
108
|
fmDataSource: this.databaseConDetails.externalSources.map(i => {
|
|
@@ -118,12 +118,12 @@ export default class FileMakerConnection {
|
|
|
118
118
|
resolve(this.token);
|
|
119
119
|
});
|
|
120
120
|
}
|
|
121
|
-
else if (this.databaseConDetails
|
|
121
|
+
else if (this.databaseConDetails.database.method === "claris") {
|
|
122
122
|
fetch(`${this.endpoint}/sessions`, {
|
|
123
123
|
method: "POST",
|
|
124
124
|
headers: {
|
|
125
125
|
"Content-Type": "application/json",
|
|
126
|
-
"Authorization": this.databaseConDetails
|
|
126
|
+
"Authorization": this.databaseConDetails.database.claris.fmid,
|
|
127
127
|
},
|
|
128
128
|
body: "{}"
|
|
129
129
|
})
|
package/index.ts
CHANGED
|
@@ -137,14 +137,14 @@ export default class FileMakerConnection {
|
|
|
137
137
|
return new Promise<string>((resolve, reject) => {
|
|
138
138
|
if (this.token) throw new Error("Already logged in. Run logout() first")
|
|
139
139
|
|
|
140
|
-
if (this.databaseConDetails
|
|
140
|
+
if (this.databaseConDetails.database.method === "filemaker") {
|
|
141
141
|
fetch(`${this.endpoint}/sessions`, {
|
|
142
142
|
hostname: this.hostname,
|
|
143
143
|
port: 443,
|
|
144
144
|
method: "POST",
|
|
145
145
|
headers: {
|
|
146
146
|
"Content-Type": "application/json",
|
|
147
|
-
"Authorization": "Basic " + Buffer.from((<loginOptionsFileMaker>this.databaseConDetails
|
|
147
|
+
"Authorization": "Basic " + Buffer.from((<loginOptionsFileMaker>this.databaseConDetails.database).username + ":" + (<loginOptionsFileMaker>this.databaseConDetails.database).password).toString("base64")
|
|
148
148
|
},
|
|
149
149
|
body: JSON.stringify({
|
|
150
150
|
fmDataSource: this.databaseConDetails.externalSources.map(i => {
|
|
@@ -164,16 +164,16 @@ export default class FileMakerConnection {
|
|
|
164
164
|
.catch(e => {
|
|
165
165
|
reject(e)
|
|
166
166
|
})
|
|
167
|
-
} else if (this.databaseConDetails
|
|
168
|
-
this._token = (<loginOptionsToken>this.databaseConDetails
|
|
167
|
+
} else if (this.databaseConDetails.database.method === "token") {
|
|
168
|
+
this._token = (<loginOptionsToken>this.databaseConDetails.database).token
|
|
169
169
|
resolve(this.token)
|
|
170
|
-
} else if (this.databaseConDetails
|
|
170
|
+
} else if (this.databaseConDetails.database.method === "oauth") {
|
|
171
171
|
fetch(`${this.endpoint}/sessions`, {
|
|
172
172
|
method: "POST",
|
|
173
173
|
headers: {
|
|
174
174
|
"Content-Type": "application/json",
|
|
175
|
-
"X-FM-Data-OAuth-RequestId": (<loginOptionsOAuth>this.databaseConDetails
|
|
176
|
-
"X-FM-Data-OAuth-Identifier": (<loginOptionsOAuth>this.databaseConDetails
|
|
175
|
+
"X-FM-Data-OAuth-RequestId": (<loginOptionsOAuth>this.databaseConDetails.database).oauth.requestId,
|
|
176
|
+
"X-FM-Data-OAuth-Identifier": (<loginOptionsOAuth>this.databaseConDetails.database).oauth.requestIdentifier
|
|
177
177
|
},
|
|
178
178
|
body: JSON.stringify({
|
|
179
179
|
fmDataSource: this.databaseConDetails.externalSources.map(i => {
|
|
@@ -188,12 +188,12 @@ export default class FileMakerConnection {
|
|
|
188
188
|
this._token = _res.headers["x-fm-data-access-token"]
|
|
189
189
|
resolve(this.token)
|
|
190
190
|
})
|
|
191
|
-
} else if (this.databaseConDetails
|
|
191
|
+
} else if (this.databaseConDetails.database.method === "claris") {
|
|
192
192
|
fetch(`${this.endpoint}/sessions`, {
|
|
193
193
|
method: "POST",
|
|
194
194
|
headers: {
|
|
195
195
|
"Content-Type": "application/json",
|
|
196
|
-
"Authorization": (<loginOptionsClaris>this.databaseConDetails
|
|
196
|
+
"Authorization": (<loginOptionsClaris>this.databaseConDetails.database).claris.fmid,
|
|
197
197
|
},
|
|
198
198
|
body: "{}"
|
|
199
199
|
})
|