@cumulus/launchpad-auth 20.1.1 → 20.1.2
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.d.ts.map +1 -1
- package/index.js +12 -7
- package/index.js.map +1 -1
- package/package.json +4 -4
- package/src/index.ts +13 -8
- package/tsconfig.tsbuildinfo +1 -1
package/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAeH,OAAO,EACL,oBAAoB,EAGrB,MAAM,SAAS,CAAC;AA6DjB;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAeH,OAAO,EACL,oBAAoB,EAGrB,MAAM,SAAS,CAAC;AA6DjB;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6BrF"}
|
package/index.js
CHANGED
|
@@ -83,13 +83,18 @@ async function getLaunchpadToken(params) {
|
|
|
83
83
|
...tokenResponse,
|
|
84
84
|
session_starttime: (Date.now() / 1000) - (5 * 60),
|
|
85
85
|
};
|
|
86
|
-
|
|
87
|
-
await (
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
86
|
+
// check if the token in s3 has been updated before updating it with the new token
|
|
87
|
+
token = await getValidLaunchpadTokenFromS3();
|
|
88
|
+
if (!token) {
|
|
89
|
+
log.debug('getLaunchpadToken updating launchpad token in s3');
|
|
90
|
+
const s3location = launchpadTokenBucketKey();
|
|
91
|
+
await (0, S3_1.s3PutObject)({
|
|
92
|
+
Bucket: s3location.Bucket,
|
|
93
|
+
Key: s3location.Key,
|
|
94
|
+
Body: JSON.stringify(tokenObject),
|
|
95
|
+
});
|
|
96
|
+
token = tokenObject.sm_token;
|
|
97
|
+
}
|
|
93
98
|
}
|
|
94
99
|
return token;
|
|
95
100
|
}
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;AAEH,uDAA+B;AAC/B,mCAAkC;AAElC,2DAAkD;AAClD,+CAMgC;AAChC,6DAAqC;AAQrC,sEAA8C;AAC9C,mCAAoC;AAEpC,MAAM,GAAG,GAAG,IAAI,gBAAM,CAAC,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,CAAC;AAE9D;;;;;;GAMG;AACH,SAAS,uBAAuB;IAI9B,MAAM,MAAM,GAAG,IAAA,iBAAS,EAAC,eAAe,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,IAAA,iBAAS,EAAC,WAAW,CAAC,CAAC;IACzC,OAAO;QACL,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,IAAA,WAAM,EAAC,SAAS,EAAE,sBAAsB,CAAC;KAC/C,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,4BAA4B;IACzC,MAAM,UAAU,GAAG,uBAAuB,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAG,MAAM,IAAA,mBAAc,EAAC,UAAU,CAAC,CAAC;IAEnD,IAAI,KAAK,CAAC;IACV,IAAI,SAAS,EAAE;QACb,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAS,EAAC,IAAA,aAAE,GAAE,EAAE,UAAU,CAAC,CAAC;QACnD,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,YAAY,iBAAQ,EAAE;YACtD,MAAM,cAAc,GAAgB,IAAI,CAAC,KAAK,CAC5C,MAAM,IAAA,4BAAuB,EAAC,QAAQ,CAAC,IAAI,CAAC,CAC7C,CAAC;YACF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,mBAAmB,GAAG,CAC1B,cAAc,CAAC,kBAAkB,GAAG,cAAc,CAAC,iBAAiB,CACrE,GAAG,IAAI,CAAC;YAET,gCAAgC;YAChC,IAAI,GAAG,GAAG,mBAAmB,EAAE;gBAC7B,KAAK,GAAG,cAAc,CAAC,QAAQ,CAAC;aACjC;SACF;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,iBAAiB,CAAC,MAA4B;IAClE,IAAI,KAAK,GAAG,MAAM,4BAA4B,EAAE,CAAC;IAEjD,IAAI,CAAC,KAAK,EAAE;QACV,GAAG,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,IAAI,wBAAc,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;QACrD,6EAA6E;QAC7E,MAAM,WAAW,GAAgB;YAC/B,GAAG,aAAa;YAChB,iBAAiB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;SAClD,CAAC;QAEF,MAAM,UAAU,GAAG,uBAAuB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cumulus/launchpad-auth",
|
|
3
|
-
"version": "20.1.
|
|
3
|
+
"version": "20.1.2",
|
|
4
4
|
"description": "Utilities for authentication with Launchpad",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"CUMULUS",
|
|
@@ -40,11 +40,11 @@
|
|
|
40
40
|
"author": "Cumulus Authors",
|
|
41
41
|
"license": "Apache-2.0",
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@cumulus/aws-client": "20.1.
|
|
44
|
-
"@cumulus/logger": "20.1.
|
|
43
|
+
"@cumulus/aws-client": "20.1.2",
|
|
44
|
+
"@cumulus/logger": "20.1.2",
|
|
45
45
|
"got": "^11.8.5",
|
|
46
46
|
"lodash": "^4.17.21",
|
|
47
47
|
"uuid": "^3.2.1"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "051ef1428ac21105fd55370d15e26009f4b49f57"
|
|
50
50
|
}
|
package/src/index.ts
CHANGED
|
@@ -108,14 +108,19 @@ export async function getLaunchpadToken(params: LaunchpadTokenParams): Promise<s
|
|
|
108
108
|
session_starttime: (Date.now() / 1000) - (5 * 60),
|
|
109
109
|
};
|
|
110
110
|
|
|
111
|
-
|
|
112
|
-
await
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
111
|
+
// check if the token in s3 has been updated before updating it with the new token
|
|
112
|
+
token = await getValidLaunchpadTokenFromS3();
|
|
113
|
+
if (!token) {
|
|
114
|
+
log.debug('getLaunchpadToken updating launchpad token in s3');
|
|
115
|
+
const s3location = launchpadTokenBucketKey();
|
|
116
|
+
await s3PutObject({
|
|
117
|
+
Bucket: s3location.Bucket,
|
|
118
|
+
Key: s3location.Key,
|
|
119
|
+
Body: JSON.stringify(tokenObject),
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
token = tokenObject.sm_token;
|
|
123
|
+
}
|
|
119
124
|
}
|
|
120
125
|
|
|
121
126
|
return token;
|