diff --git a/tools/cldr-apps/js/src/esm/cldrAuth.mjs b/tools/cldr-apps/js/src/esm/cldrAuth.mjs
new file mode 100644
index 00000000000..94329d7be3f
--- /dev/null
+++ b/tools/cldr-apps/js/src/esm/cldrAuth.mjs
@@ -0,0 +1,45 @@
+import * as cldrClient from "../esm/cldrClient.mjs";
+import * as cldrStatus from "../esm/cldrStatus.mjs";
+
+/**
+ * Get the oauth login URL. See GithubLoginFactory#getLoginUrl()
+ * @param {object} o options bag
+ * @param {string} o.service which service, currently only 'github' is accepted
+ * @param {string} o.intent what the login URL is used for, currently only 'cla'
+ * @param {boolean} o.relogin if true, attempt re-login
+ */
+export async function getLoginUrl(o) {
+ const { service, intent, relogin } = o;
+ if (service !== "github")
+ throw Error(`only support service='github' but got ${service}`);
+ if (intent !== "cla")
+ throw Error(`only support intent='cla' but got ${intent}`);
+ const client = await cldrClient.getClient();
+ const { url } = (await client.apis.auth.oauthUrl()).body;
+ const u = new URL(url);
+ const redir = new URL(window.location);
+ redir.search = "";
+ redir.hash = "";
+ redir.pathname = cldrStatus.getContextPath() + "/github-login";
+ u.searchParams.set("redirect_uri", redir);
+ if (relogin) {
+ u.searchParams.set("prompt", "select_account");
+ }
+ return u;
+}
+
+/**
+ * If a valid github ID is in the session, return it, otherwise falsy
+ * @returns github ID or falsy
+ */
+export async function getGithubIdFromSession() {
+ try {
+ const client = await cldrClient.getClient();
+ const { id } = (await client.apis.auth.oauthSession()).body;
+ return id;
+ } catch (e) {
+ console.error(e);
+ console.error("getGithubIdFromSession() failed");
+ }
+ return null;
+}
diff --git a/tools/cldr-apps/js/src/esm/cldrCla.mjs b/tools/cldr-apps/js/src/esm/cldrCla.mjs
index 90ce7eac47a..c52f9ed7c0a 100644
--- a/tools/cldr-apps/js/src/esm/cldrCla.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrCla.mjs
@@ -4,6 +4,7 @@ import * as cldrNotify from "../esm/cldrNotify.mjs";
* see ClaSignature.java
* @typedef {Object} ClaSignature
* @property {boolean} corporate true if a corporate signature
+ * @property {boolean} noRights true if employer asserts no rights
* @property {string} email
* @property {string} employer
* @property {string} name
diff --git a/tools/cldr-apps/js/src/esm/cldrComponents.mjs b/tools/cldr-apps/js/src/esm/cldrComponents.mjs
index 7fd83745174..2d379d0cb09 100644
--- a/tools/cldr-apps/js/src/esm/cldrComponents.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrComponents.mjs
@@ -24,6 +24,7 @@ import {
Button,
Card,
Checkbox,
+ Col,
Collapse,
CollapsePanel,
Form,
@@ -33,6 +34,7 @@ import {
Popover,
Progress,
Radio,
+ Row,
Select,
Spin,
Steps,
@@ -62,6 +64,7 @@ function setup(app) {
app.component("a-button", Button);
app.component("a-card", Card);
app.component("a-checkbox", Checkbox);
+ app.component("a-col", Col);
app.component("a-collapse-panel", CollapsePanel);
app.component("a-collapse", Collapse);
app.component("a-form-item", Form.Item);
@@ -77,6 +80,7 @@ function setup(app) {
app.component("a-progress", Progress);
app.component("a-radio-group", Radio.Group);
app.component("a-radio", Radio);
+ app.component("a-row", Row);
app.component("a-select", Select);
app.component("a-spin", Spin);
app.component("a-step", Steps.Step);
diff --git a/tools/cldr-apps/js/src/md/cla.md b/tools/cldr-apps/js/src/md/cla.md
index c1b478aef8b..e222b17eefb 100644
--- a/tools/cldr-apps/js/src/md/cla.md
+++ b/tools/cldr-apps/js/src/md/cla.md
@@ -1,7 +1,5 @@
# Contributor License Agreement (CLA)
-Hello. We need your permission to use the data and information that you submit to the Unicode CLDR Survey Tool. To do this, we need a contributor license agreement (CLA) on file for you or your employer so that Unicode has the required permissions to use your contributions in our products and services. If you are seeing this message, it means we do not have such a CLA on file. If you believe you are already under a Unicode CLA (either your own or your employer’s) and are seeing this message in error, or if you have further questions, please contact [`cldr-cla@unicode.org`](mailto:cldr-cla@unicode.org).
-
If you would like to sign Unicode’s standard CLA so that you may contribute to other Unicode projects as well as Survey Tool, please refer to our [IP Policies](https://www.unicode.org/policies/licensing_policy.html) to find out how to get a standard CLA in place.
*Alternatively*, if you do not wish to sign Unicode’s standard CLA and you wish to contribute only to the CLDR Survey Tool, you may agree to the following terms for your Survey Tool contributions:
diff --git a/tools/cldr-apps/js/src/views/MainMenu.vue b/tools/cldr-apps/js/src/views/MainMenu.vue
index 2621f4b3ff6..ba2fe275e20 100644
--- a/tools/cldr-apps/js/src/views/MainMenu.vue
+++ b/tools/cldr-apps/js/src/views/MainMenu.vue
@@ -9,7 +9,9 @@
-
-
-
+
-
-
-
+
+ Hello. We need your permission to use the data and information that you
+ submit to the Unicode CLDR Survey Tool. To do this, we need a contributor
+ license agreement (CLA) on file for you or your employer so that Unicode
+ has the required permissions to use your contributions in our products and
+ services. If you are seeing this message, it means we do not have such a
+ CLA on file. If you believe you are already under a Unicode CLA (either
+ your own or your employer’s) and are seeing this message in error, or if
+ you have further questions, please contact
+ cldr-cla@unicode.org
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
CLA Signature Not Found
-
- Please check the applicable box below (only one) to indicate your
- agreement.
+ Your GitHub account, @{{ githubSessionId }}, was not detected as signing
+ the CLA.
+
+
+
+ Note that it is possible that you have signed, but that our records are
+ out of date.
+
+ Have you already
+ signed the CLA
+ with your GitHub account?
+ If so, simply click this button so we can check it:
+
+ Log in with GitHub
+
+
+
+ Don't have a GitHub account or want to sign the CLA manually?
+ Click this button instead:
+
+ Sign Survey Tool only CLA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- I am contributing as an individual because I am self-employed or
- unemployed. I have read and agree to the foregoing terms.
-
-
- I am contributing as an individual because, even though I am
- employed, my employer has no rights and claims no rights to my
- contributions. I have read and agree to the foregoing terms.
-
-
- I am employed and my employer has or may have rights in my
- contributions under my employment agreement and/or the work for hire
- doctrine or similar legal principles.
-
-
- My employer has already signed the CLA and is listed on Unicode’s
- List of Corporate CLAs.
-
-
-
-
-
-
+
+
+ To view the CLA signed via GitHub, click
+ here and
+ choose the Login with GitHub button at the bottom.
+
+
+
+
+
+
+ I am contributing as an individual because I am self-employed or
+ unemployed. I have read and agree to the foregoing terms.
+
+
+ I am contributing as an individual because, even though I am
+ employed, my employer has no rights and claims no rights to my
+ contributions. I have read and agree to the foregoing terms.
+
+
+ I am employed and my employer has or may have rights in my
+ contributions under my employment agreement and/or the work for
+ hire doctrine or similar legal principles.
+
+
+ My employer has already signed the CLA and is listed on Unicode’s
+ List of Corporate CLAs.
+
+
+
+
+
+