Merge branch 'main' into dev

frontend/app/components/Login/Login.js

@@ -144,7 +144,7 @@ export default class Login extends React.Component {
               <div className={cn(stl.sso, "py-2 flex flex-col items-center")}>
                 <div className="mb-4">or</div>
                 <a href="/api/sso/saml2" rel="noopener noreferrer">
-                  <Button type="button" outline type="submit" primary >{ 'Login with SSO (Okta)' }</Button>
+                  <Button type="button" outline type="submit" primary >{ `Login with SSO (${authDetails.ssoProvider})` }</Button>
                 </a>
               </div>
             )}

frontend/app/types/integrations/elasticsearchConfig.js

@@ -1,5 +1,5 @@
 import Record from 'Types/Record';
-import { validateIP } from 'App/validate'
+import { validateURL } from 'App/validate'
 
 export const API_KEY_ID_LENGTH = 20;
 export const API_KEY_LENGTH = 22;
@@ -20,7 +20,7 @@ export default Record({
   }),
   methods: {
     validateKeys() {
-      return this.apiKeyId.length === API_KEY_ID_LENGTH && this.apiKey.length === API_KEY_LENGTH && validateIP(this.host);
+      return this.apiKeyId.length === API_KEY_ID_LENGTH && this.apiKey.length === API_KEY_LENGTH && validateURL(this.host);
     },
     validate() {
       return this.host !== '' && this.apiKeyId !== '' && this.apiKey !== '' && this.indexes !== '' && !!this.port && 

scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml

@@ -60,6 +60,7 @@ spec:
             {{- else }}
               value: {{ (split "://" .Values.global.s3.endpoint)._0 }}://{{.Values.global.s3.assetsBucket}}.{{ (split "://" .Values.global.s3.endpoint)._1 }}
             {{- end }}
+              value: {{ (split "://" .Values.global.s3.endpoint)._0 }}://{{.Values.global.s3.assetsBucket}}.{{ (split "://" .Values.global.s3.endpoint)._1 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'

scripts/helmcharts/vars.yaml

@@ -16,7 +16,7 @@ postgresql: &postgres
   #     memory: 3000Mi
   #     cpu: 2
 
-clickhouse: &clickhouse
+clickhouse:
   # For enterpriseEdition
   enabled: false
 

third-party.md

@@ -1,4 +1,4 @@
-## Licenses (as of January 21, 2022)
+## Licenses (as of February 8, 2022)
 
 Below is the list of dependencies used in OpenReplay software. Licenses may change between versions, so please keep this up to date with every new library you use.
 
@@ -84,9 +84,13 @@ Below is the list of dependencies used in OpenReplay software. Licenses may chan
 | redux-immutable | BSD3 | JavaScript |
 | redux-thunk | MIT | JavaScript |
 | semantic-ui-react | MIT | JavaScript |
-| socketio | MIT | JavaScript |
+| socket.io | MIT | JavaScript |
+| socket.io-client | MIT | JavaScript |
 | source-map | BSD3 | JavaScript |
 | aws-sdk | Apache2 | JavaScript |
 | serverless | MIT | JavaScript |
 | lib/pq | MIT | Go |
 | peerjs | MIT | JavaScript |
+| geoip-lite | Apache2 | JavaScript |
+| ua-parser-js | MIT | JavaScript |
+| express | MIT | JavaScript |