Merge branch '7.17' into backport-7-17-2

okta · Apr 25, 2024 · d511d09 · d511d09
2 parents 2b69f97 + 8088ed0
commit d511d09
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -257,9 +257,9 @@ To embed the Sign-in Widget via CDN, include links to the JS and CSS files in yo
 
 ```html
 <!-- Latest CDN production Javascript and CSS -->
-<script src="https://global.oktacdn.com/okta-signin-widget/7.17.1/js/okta-sign-in.min.js" type="text/javascript" integrity="sha384-02YeOcJMJ8dTrgCSquLGS4ZKcJ1FhgV66YlvL9a3UHxHwBzSRbPhtWC1k7b6fNAg" crossorigin="anonymous"></script>
+<script src="https://global.oktacdn.com/okta-signin-widget/7.17.2/js/okta-sign-in.min.js" type="text/javascript" integrity="sha384-02YeOcJMJ8dTrgCSquLGS4ZKcJ1FhgV66YlvL9a3UHxHwBzSRbPhtWC1k7b6fNAg" crossorigin="anonymous"></script>
 
-<link href="https://global.oktacdn.com/okta-signin-widget/7.17.1/css/okta-sign-in.min.css" type="text/css" rel="stylesheet" integrity="sha384-YtU89lM0fecOULmzvCevpy8Mwpfa2V1C9JG+K57ceTle0dj6yZKAQ/t6ZEmGlK7c" crossorigin="anonymous" />
+<link href="https://global.oktacdn.com/okta-signin-widget/7.17.2/css/okta-sign-in.min.css" type="text/css" rel="stylesheet" integrity="sha384-YtU89lM0fecOULmzvCevpy8Mwpfa2V1C9JG+K57ceTle0dj6yZKAQ/t6ZEmGlK7c" crossorigin="anonymous" />
 ```
 
 **NOTE:** The CDN URLs contain a version number. This number should be the same for both the Javascript and the CSS file and match a version on the [releases page](https://github.com/okta/okta-signin-widget/releases). We recommend using the latest widget version.
@@ -269,13 +269,13 @@ When using one of the bundles without the polyfill included, you may want to con
 
 ```html
 <!-- Polyfill for older browsers -->
-<script src="https://global.oktacdn.com/okta-signin-widget/7.17.1/js/okta-sign-in.polyfill.min.js" type="text/javascript" integrity="sha384-wJqq26Mh3D881mQ2Y8EyhHmQU2ovR3nf5+uV3atTdOwBtHelrBRHOmuk5OdgckqW" crossorigin="anonymous"></script>
+<script src="https://global.oktacdn.com/okta-signin-widget/7.17.2/js/okta-sign-in.polyfill.min.js" type="text/javascript" integrity="sha384-wJqq26Mh3D881mQ2Y8EyhHmQU2ovR3nf5+uV3atTdOwBtHelrBRHOmuk5OdgckqW" crossorigin="anonymous"></script>
 
 <!-- Widget bundle for Okta Identity Engine -->
-<script src="https://global.oktacdn.com/okta-signin-widget/7.17.1/js/okta-sign-in.oie.min.js" type="text/javascript" integrity="sha384-Qx25hpdEqMezj+YmiMfpjUq4YtvRDF7T2wiPNGFRT9bm26Ij1oliu9Rghf4vO2qb" crossorigin="anonymous"></script>
+<script src="https://global.oktacdn.com/okta-signin-widget/7.17.2/js/okta-sign-in.oie.min.js" type="text/javascript" integrity="sha384-Qx25hpdEqMezj+YmiMfpjUq4YtvRDF7T2wiPNGFRT9bm26Ij1oliu9Rghf4vO2qb" crossorigin="anonymous"></script>
 
 <!-- CSS for widget -->
-<link href="https://global.oktacdn.com/okta-signin-widget/7.17.1/css/okta-sign-in.min.css" type="text/css" rel="stylesheet" integrity="sha384-YtU89lM0fecOULmzvCevpy8Mwpfa2V1C9JG+K57ceTle0dj6yZKAQ/t6ZEmGlK7c" crossorigin="anonymous" />
+<link href="https://global.oktacdn.com/okta-signin-widget/7.17.2/css/okta-sign-in.min.css" type="text/css" rel="stylesheet" integrity="sha384-YtU89lM0fecOULmzvCevpy8Mwpfa2V1C9JG+K57ceTle0dj6yZKAQ/t6ZEmGlK7c" crossorigin="anonymous" />
 ```
 
 

diff --git a/polyfill/README.md b/polyfill/README.md
@@ -9,13 +9,13 @@ To embed the Sign-in Widget via CDN, include links to the JS and CSS files in yo
 
 ```html
 <!-- Polyfill for older browsers -->
-<script src="https://global.oktacdn.com/okta-signin-widget/7.17.1/js/okta-sign-in.polyfill.min.js" type="text/javascript" integrity="sha384-wJqq26Mh3D881mQ2Y8EyhHmQU2ovR3nf5+uV3atTdOwBtHelrBRHOmuk5OdgckqW" crossorigin="anonymous"></script>
+<script src="https://global.oktacdn.com/okta-signin-widget/7.17.2/js/okta-sign-in.polyfill.min.js" type="text/javascript" integrity="sha384-wJqq26Mh3D881mQ2Y8EyhHmQU2ovR3nf5+uV3atTdOwBtHelrBRHOmuk5OdgckqW" crossorigin="anonymous"></script>
 
 <!-- Widget bundle for Okta Identity Engine -->
-<script src="https://global.oktacdn.com/okta-signin-widget/7.17.1/js/okta-sign-in.oie.min.js" type="text/javascript" integrity="sha384-Qx25hpdEqMezj+YmiMfpjUq4YtvRDF7T2wiPNGFRT9bm26Ij1oliu9Rghf4vO2qb" crossorigin="anonymous"></script>
+<script src="https://global.oktacdn.com/okta-signin-widget/7.17.2/js/okta-sign-in.oie.min.js" type="text/javascript" integrity="sha384-Qx25hpdEqMezj+YmiMfpjUq4YtvRDF7T2wiPNGFRT9bm26Ij1oliu9Rghf4vO2qb" crossorigin="anonymous"></script>
 
 <!-- CSS for widget -->
-<link href="https://global.oktacdn.com/okta-signin-widget/7.17.1/css/okta-sign-in.min.css" type="text/css" rel="stylesheet" integrity="sha384-YtU89lM0fecOULmzvCevpy8Mwpfa2V1C9JG+K57ceTle0dj6yZKAQ/t6ZEmGlK7c" crossorigin="anonymous" />
+<link href="https://global.oktacdn.com/okta-signin-widget/7.17.2/css/okta-sign-in.min.css" type="text/css" rel="stylesheet" integrity="sha384-YtU89lM0fecOULmzvCevpy8Mwpfa2V1C9JG+K57ceTle0dj6yZKAQ/t6ZEmGlK7c" crossorigin="anonymous" />
 ```
 
 **NOTE:** The CDN URLs contain a version number. This number should be the same for both the Javascript and the CSS file and match a version on the [releases page](https://github.com/okta/okta-signin-widget/releases). We recommend using the latest widget version.

diff --git a/src/v1/util/RegistrationFormFactory.js b/src/v1/util/RegistrationFormFactory.js
@@ -17,7 +17,7 @@ let { SchemaFormFactory } = internal.views.forms.helpers;
 
 const getParts = function(username) {
   const usernameArr = username.split('');
-  const minPartsLength = 3;
+  const minPartsLength = 4;
   const userNameParts = [];
   const delimiters = [',', '.', '-', '_', '#', '@'];
   let userNamePart = '';

diff --git a/src/v3/src/components/Widget/style.scss b/src/v3/src/components/Widget/style.scss
@@ -178,8 +178,7 @@
   margin-block-end: map.get($ods-tokens, 'spacing', '2');
 }
 .okta-container .applogin-banner .applogin-app-logo img {
-  inline-size: map.get($ods-tokens, 'spacing', '8');
-  block-size: map.get($ods-tokens, 'spacing', '8');
+  max-block-size: map.get($ods-tokens, 'spacing', '8');
 }
 
 /* loginpage container styles */

diff --git a/test/unit/spec/v1/RegistrationFormFactory_spec.js b/test/unit/spec/v1/RegistrationFormFactory_spec.js
@@ -111,28 +111,28 @@ describe('RegistrationFormFactory', function() {
     it('gives the right username parts', function() {
       let result = RegistrationFormFactory.getUsernameParts('first-last.name@okta.com');
 
-      expect(result).toEqual(['first', 'last', 'name', 'okta', 'com']);
+      expect(result).toEqual(['first', 'last', 'name', 'okta']);
 
       result = RegistrationFormFactory.getUsernameParts('first-name@okta.com');
-      expect(result).toEqual(['first', 'name', 'okta', 'com']);
+      expect(result).toEqual(['first', 'name', 'okta']);
 
       result = RegistrationFormFactory.getUsernameParts('firstname@okta.com');
-      expect(result).toEqual(['firstname', 'okta', 'com']);
+      expect(result).toEqual(['firstname', 'okta']);
 
       result = RegistrationFormFactory.getUsernameParts('first_name@okta.com');
-      expect(result).toEqual(['first', 'name', 'okta', 'com']);
+      expect(result).toEqual(['first', 'name', 'okta']);
 
       result = RegistrationFormFactory.getUsernameParts('username');
       expect(result).toEqual(['username']);
 
       result = RegistrationFormFactory.getUsernameParts('user#name@okta.com');
-      expect(result).toEqual(['user', 'name', 'okta', 'com']);
+      expect(result).toEqual(['user', 'name', 'okta']);
 
       result = RegistrationFormFactory.getUsernameParts('user#name@okta#%com');
       expect(result).toEqual(['user', 'name', 'okta', '%com']);
 
       result = RegistrationFormFactory.getUsernameParts('#-name@okta.com');
-      expect(result).toEqual(['name', 'okta', 'com']);
+      expect(result).toEqual(['name', 'okta']);
 
       result = RegistrationFormFactory.getUsernameParts('first_name-@okta#');
       expect(result).toEqual(['first', 'name', 'okta']);
@@ -149,11 +149,12 @@ describe('RegistrationFormFactory', function() {
     it('returns false if password does not contain username or no username ', function() {
       expect(RegistrationFormFactory.passwordContainsFormField('administrator1', 'Abcd1234')).toEqual(false);
       expect(RegistrationFormFactory.passwordContainsFormField(null, 'Abcd1234')).toEqual(false);
+      expect(RegistrationFormFactory.passwordContainsFormField('abcd@okta.com', 'Welcome123')).toEqual(false);
+      expect(RegistrationFormFactory.passwordContainsFormField('abc', 'abc')).toEqual(false);
     });
     it('returns true if password does contain username ', function() {
       expect(RegistrationFormFactory.passwordContainsFormField('abcd@okta.com', 'Abcd1234')).toEqual(true);
-      expect(RegistrationFormFactory.passwordContainsFormField('abc', 'abc')).toEqual(true);
-      expect(RegistrationFormFactory.passwordContainsFormField('abc', 'abc@okta.com')).toEqual(true);
+      expect(RegistrationFormFactory.passwordContainsFormField('abcd', 'abcd@okta.com')).toEqual(true);
     });
   });
 });
diff --git a/test/unit/spec/v1/Registration_spec.js b/test/unit/spec/v1/Registration_spec.js
@@ -544,25 +544,25 @@ Expect.describe('Registration', function() {
         expect(test.form.passwordContainsUsernameError()).toBe(true);
       });
     });
-    itp('shows error if password contains part of the username:testing_123', function() {
+    itp('shows error if password contains part of the username:testing_1234', function() {
       return setup().then(function(test) {
-        test.form.setUserName('testing_123');
+        test.form.setUserName('testing_1234');
         test.form.setPassword('testing');
         test.form.focusOutPassword();
         expect(test.form.passwordContainsUsernameError()).toBe(true);
-        test.form.setPassword('testing123');
+        test.form.setPassword('testing1234');
         test.form.focusOutPassword();
         expect(test.form.passwordContainsUsernameError()).toBe(true);
-        test.form.setPassword('123Est123');
+        test.form.setPassword('1234Est123');
         test.form.focusOutPassword();
         expect(test.form.passwordContainsUsernameError()).toBe(true);
         test.form.setPassword('test_123');
         test.form.focusOutPassword();
-        expect(test.form.passwordContainsUsernameError()).toBe(true);
+        expect(test.form.passwordContainsUsernameError()).toBe(false);
         test.form.setPassword('te_12');
         test.form.focusOutPassword();
         expect(test.form.passwordContainsUsernameError()).toBe(false);
-        test.form.setPassword('_abc_123');
+        test.form.setPassword('_abc_1234');
         test.form.focusOutPassword();
         expect(test.form.passwordContainsUsernameError()).toBe(true);
       });