Fix login with CAS #165

Signed-off-by: Ajay Bura <ajbura@gmail.com>

diff --git a/package-lock.json b/package-lock.json
index 00b66223a7a4ab31e75d4b95ff5878179b1e4b97..60d520e46effdaa403763fbcd2c61e1e268c06b3 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cinny",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "cinny",
-      "version": "1.5.0",
+      "version": "1.5.1",
       "license": "MIT",
       "dependencies": {
         "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz",

diff --git a/package.json b/package.json
index b0b6324f359a3c320b6d3fa4fd9d9564b49c8777..59a01cc8504f4f5299a87773b73dd5970e58acb6 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cinny",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Yet another matrix client",
   "main": "index.js",
   "engines": {

diff --git a/src/app/templates/auth/Auth.jsx b/src/app/templates/auth/Auth.jsx
index 9465a86b7d4bdbf7765bdd02ef1dcb213ac901d9..184d7024925440dd57c8faeae138ab4185d1a68d 100644 (file)
--- a/src/app/templates/auth/Auth.jsx
+++ b/src/app/templates/auth/Auth.jsx
@@ -156,7 +156,7 @@ function Login({ loginFlow, baseUrl }) {
   const [typeIndex, setTypeIndex] = useState(0);
   const loginTypes = ['Username', 'Email'];
   const isPassword = loginFlow?.filter((flow) => flow.type === 'm.login.password')[0];
-  const ssoProviders = loginFlow?.filter((flow) => flow.type.match(/^m.login.(sso|cas)$/))[0];
+  const ssoProviders = loginFlow?.filter((flow) => flow.type === 'm.login.sso')[0];
 
   const initialValues = {
     username: '', password: '', email: '', other: '',
@@ -248,7 +248,7 @@ function Login({ loginFlow, baseUrl }) {
       {ssoProviders && isPassword && <Text className="sso__divider">OR</Text>}
       {ssoProviders && (
         <SSOButtons
-          type={ssoProviders.type.match(/^m.login.(sso|cas)$/)[1]}
+          type="sso"
           identityProviders={ssoProviders.identity_providers}
           baseUrl={baseUrl}
         />
@@ -269,7 +269,7 @@ function Register({ registerInfo, loginFlow, baseUrl }) {
   const [process, setProcess] = useState({});
   const formRef = useRef();
 
-  const ssoProviders = loginFlow?.filter((flow) => flow.type.match(/^m.login.(sso|cas)$/))[0];
+  const ssoProviders = loginFlow?.filter((flow) => flow.type === 'm.login.sso')[0];
   const isDisabled = registerInfo.errcode !== undefined;
   const { flows, params, session } = registerInfo;
 
@@ -452,7 +452,7 @@ function Register({ registerInfo, loginFlow, baseUrl }) {
       )}
       {isDisabled && ssoProviders && (
         <SSOButtons
-          type={ssoProviders.type.match(/^m.login.(sso|cas)$/)[1]}
+          type="sso"
           identityProviders={ssoProviders.identity_providers}
           baseUrl={baseUrl}
         />

diff --git a/src/client/state/cons.js b/src/client/state/cons.js
index b5822bbc45c19c7fbcc6dccc740c2b2a2b225a99..c02bfa288ea2b329e578a895994d3a50fcdffb08 100644 (file)
--- a/src/client/state/cons.js
+++ b/src/client/state/cons.js
@@ -1,5 +1,5 @@
 const cons = {
-  version: '1.5.0',
+  version: '1.5.1',
   secretKey: {
     ACCESS_TOKEN: 'cinny_access_token',
     DEVICE_ID: 'cinny_device_id',

diff --git a/src/index.scss b/src/index.scss
index 387b0cdc4221b3d58037fda9b96634117cb42829..2aea8d733979547d6a758a6544ff658956bdd40e 100644 (file)
--- a/src/index.scss
+++ b/src/index.scss
@@ -292,9 +292,10 @@ button {
 }
 textarea,
 input,
-input[type=text]
-input[type=username]
-input[type=password]
+input[type],
+input[type=text],
+input[type=username],
+input[type=password],
 input[type=email] {
   -webkit-appearance: none;
   -moz-appearance: none;