Merge pull request #112 from bitovi/TR-42-Make-login-work-again

update oauth build
bitovi · Sep 19, 2024 · b34da18 · b34da18
2 parents 71ccdc1 + b54bfcd
commit b34da18
Show file tree

Hide file tree

Showing 21 changed files with 147 additions and 662 deletions.
diff --git a/pages/oauth-callback.html.js b/pages/oauth-callback.html.js
@@ -16,10 +16,9 @@ module.exports = function () {
 		<p>You will be redirected in one moment.</p>
 		<div id="mainElement">Loading ... </div>
 		<script type="module">
-			import JiraOIDCHelpers from "./dist/jira-oidc-helpers.js";
-			import oauthCallback from "./oauth-callback.js";
-			const jiraHelpers = JiraOIDCHelpers(${JSON.stringify(getSafeEnv())});
-			oauthCallback(jiraHelpers);
+			import oauthCallback from "./dist/oauth-callback.js";
+			
+			oauthCallback(${JSON.stringify(getSafeEnv())});
 		</script>
 </body>
 </html>`

diff --git a/public/dist/connect-main.min.js.map b/public/dist/connect-main.min.js.map
diff --git a/public/dist/hosted-main.js.map b/public/dist/hosted-main.js.map
diff --git a/public/dist/hosted-main.min.js.map b/public/dist/hosted-main.min.js.map
diff --git a/public/dist/src/jira-oidc-helpers.js → public/dist/oauth-callback.js b/public/dist/src/jira-oidc-helpers.js → public/dist/oauth-callback.js
diff --git a/public/dist/oauth-callback.js.map b/public/dist/oauth-callback.js.map
diff --git a/public/dist/production.css b/public/dist/production.css
diff --git a/public/dist/src/JiraHelpers.js b/public/dist/src/JiraHelpers.js
diff --git a/public/dist/src/jira-oidc-helpers.js.map b/public/dist/src/jira-oidc-helpers.js.map
diff --git a/public/dist/src/shared/chunk-array.js b/public/dist/src/shared/chunk-array.js
diff --git a/public/dist/src/shared/chunk-array.js.map b/public/dist/src/shared/chunk-array.js.map
diff --git a/public/dist/src/shared/map-ids-to-names.js b/public/dist/src/shared/map-ids-to-names.js
diff --git a/public/dist/src/shared/map-ids-to-names.js.map b/public/dist/src/shared/map-ids-to-names.js.map
diff --git a/public/dist/src/shared/response-to-json.js b/public/dist/src/shared/response-to-json.js
diff --git a/public/dist/src/shared/response-to-json.js.map b/public/dist/src/shared/response-to-json.js.map
diff --git a/public/dist/src/shared/types.js b/public/dist/src/shared/types.js
diff --git a/public/dist/src/shared/types.js.map b/public/dist/src/shared/types.js.map
diff --git a/public/oauth-callback.js b/public/oauth-callback.js
@@ -1,4 +1,7 @@
-export default function oauthCallback(jiraHelpers) {
+import jiraOIDCHelpers from "./jira-oidc-helpers.ts";
+
+export default function oauthCallback(environment) {
+	const jiraHelpers = jiraOIDCHelpers(environment);
 
 	const queryParams = new URLSearchParams(window.location.search)
 	const queryCode = queryParams.get('code')
@@ -10,4 +13,4 @@ export default function oauthCallback(jiraHelpers) {
 		jiraHelpers.fetchAccessTokenWithAuthCode(queryCode);
 	}
 
-}
+}
diff --git a/public/shared/main-helper.js b/public/shared/main-helper.js
@@ -6,7 +6,7 @@ import "../shared/select-cloud.js";
 import "../shared/velocities-from-issue.js"
 
 import JiraLogin from "../shared/jira-login.js";
-import JiraOIDCHelpers from "../jira-oidc-helpers.js";
+import JiraOIDCHelpers from "../jira-oidc-helpers.ts";
 import { getHostedRequestHelper } from "../request-helpers/hosted-request-helper.js";
 import { getConnectRequestHelper } from "../request-helpers/connect-request-helper.js";
 

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -4,6 +4,18 @@ import commonjs from '@rollup/plugin-commonjs';
 import typescript from 'rollup-plugin-typescript2';
 
 export default [
+  {
+    input: './public/oauth-callback.js',
+    output: {
+      file: "./public/dist/oauth-callback.js",
+      format: 'esm'
+    },
+    plugins: [
+      nodeResolve(),
+      commonjs(),
+      typescript()
+    ]
+  },
     {
       input: './public/hosted-main.js',
       output: {

diff --git a/tsconfig.json b/tsconfig.json
@@ -20,8 +20,7 @@
     "sourceMap": true
   },
   "include": [
-    "public/**/*.ts",
-    "public/jira-oidc-helpers.ts"
+    "public/**/*.ts"
   ],
   "exclude": [
     "node_modules",