Fix Cherry Pick Conflict

.env.tmp

@@ -8,10 +8,11 @@ VITE_STRIPE_PUBLIC_KEY=''
 VITE_APP_URL=https://app.socious.io/
 VITE_ACCOUNT_CENTER_URL=https://dev-id.socious.io/
 VITE_FUND_URL=https://devfund.socious.org/
-VITE_VERIFY_URL=https://wallet.socious.io/
+VITE_VERIFY_URL=https://devapp.shinid.com/
 VITE_CLIENT_SECRET_TOKEN_CLIENT_ID=''
 VITE_CLIENT_SECRET_TOKEN_REDIRECT_URL=https://app.socious.io/jobIndexing
 STORYBOOK_FIGMA_ACCESS_TOKEN=''
 VITE_GOOGLE_RECAPTCHA_SITE_KEY=''
 VITE_BLOCKFROST_PROJECT_ID=''
-VITE_CARDANO_PAYOUT_ADERESS=''
+VITE_CARDANO_PAYOUT_ADERESS=''
+GEMINI_API_KEY=

.github/workflows/docker.yml

@@ -29,11 +29,14 @@ jobs:
           PORT: 3000
           VITE_ENV: development
           VITE_BASE_URL: https://dev.socious.io/api/v2
+          VITE_BASE_URL_V3: https://dev.socious.io/api/v3
           VITE_APP_URL: https://webapp2.socious.io/
           VITE_JP_STRIPE_PUBLIC_KEY: pk_test
           VITE_DAPP_ENV: testnet
           VITE_GOOGLE_OAUTH_CLIENT_ID: id
           VITE_GOOGLE_RECAPTCHA_SITE_KEY: secret
+          VITE_BLOCKFROST_PROJECT_ID: id
+          VITE_CARDANO_PAYOUT_ADERESS: address
 
       - name: Check Status
         if: failure()

.github/workflows/release-android.yml

@@ -65,6 +65,8 @@ jobs:
           VITE_ACCOUNT_CENTER_URL: ${{ vars.ACCOUNT_CENTER_URL }}
           VITE_FUND_URL: ${{ vars.FUND_URL }}
           VITE_VERIFY_URL: ${{ vars.VERIFY_URL }}
+          VITE_BLOCKFROST_PROJECT_ID: ${{ vars.BLOCKFROST_PROJECT_ID }}
+          VITE_CARDANO_PAYOUT_ADERESS: ${{ vars.CARDANO_PAYOUT_ADERESS }}
 
       - name: Get the latest version code using
         uses: Vacxe/google-play-cli-kt@0.4.8

.github/workflows/release-ios.yml

@@ -97,6 +97,8 @@ jobs:
           VITE_ACCOUNT_CENTER_URL: ${{ vars.ACCOUNT_CENTER_URL }}
           VITE_FUND_URL: ${{ vars.FUND_URL }}
           VITE_VERIFY_URL: ${{ vars.VERIFY_URL }}
+          VITE_BLOCKFROST_PROJECT_ID: ${{ vars.BLOCKFROST_PROJECT_ID }}
+          VITE_CARDANO_PAYOUT_ADERESS: ${{ vars.CARDANO_PAYOUT_ADERESS }}
 
       - name: Extracting Google Service plist
         run: |
@@ -108,7 +110,7 @@ jobs:
 
       - name: Extracting provisioning profile (Distribution)
         run: |
-          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          mkdir -p ${{env.MOBILE_PROVISIONING_PATH}}
           echo ${{ env.IOS_PROVISIONING_PROFILE_BASE64 }} | base64 --decode > ${{env.MOBILE_PROVISIONING_PATH}}/socious-provisioing-profile-distribution-appstore.mobileprovision
 
       - name: Extracting auth key file (Apple API)
@@ -122,7 +124,7 @@ jobs:
 
       - name: Extracting signing certificate
         run: |
-          echo ${{ env.IOS_DISTRIBUTION_CERT_BASE64 }} | base64 --decode > $SIGNING_CERTIFICATE_PATH
+          echo ${{ env.IOS_DISTRIBUTION_CERT_BASE64 }} | base64 --decode > ${{ env.SIGNING_CERTIFICATE_PATH }}
 
       - name: Extracting and Installing signing certificate (.p12)
         env:

cypress.config.ts

@@ -1,14 +1,8 @@
 import { defineConfig } from 'cypress';
-import dotenv from 'dotenv';
-
-dotenv.config();
 
 export default defineConfig({
   e2e: {
     setupNodeEvents(on, config) {
-      config.env.api_server = process.env.VITE_BASE_URL;
-      config.env.app_url = process.env.VITE_APP_URL;
-
       return config;
     },
   },

cypress.env.json

@@ -0,0 +1,6 @@
+{
+  "api_server": "https://dev.socious.io/api/v2",
+  "api_server_v3": "https://dev.socious.io/api/v3",
+  "app_url": "http://localhost:3000/",
+  "account_center_url": "https://dev-id.socious.io"
+}

cypress/e2e/authentication/constants.ts

@@ -1,6 +1,8 @@
 //Server
 export const API_SERVER = Cypress.env('api_server');
+export const API_SERVER_V3 = Cypress.env('api_server_v3');
 export const APP_URL = Cypress.env('app_url');
+export const ACCOUNT_CENTER_URL = Cypress.env('account_center_url');
 
 //Credentials
 export const VALID_EMAIL = 'valid_email@gmail.com';

cypress/e2e/authentication/login.cy.ts

@@ -0,0 +1,123 @@
+import { IDENTITIES, PROFILE, PROJECTS, SESSION } from './mocks';
+import {
+  ACCOUNT_CENTER_URL,
+  API_SERVER,
+  API_SERVER_V3,
+  APP_URL,
+  VALID_EMAIL,
+  VALID_PASSWORD,
+} from '../authentication/constants';
+
+describe('Login with Socious Id', () => {
+  let loginRequestCount = 0;
+  let identitiesRequestCount = 0;
+  beforeEach(() => {
+    cy.intercept('POST', `**/batch*`, req => req.reply(200, { message: 'success' })).as('postWallet');
+    cy.intercept('GET', `**/batch*`, req => req.reply(200, { message: 'success' })).as('getWallet');
+    cy.intercept('GET', `**/w3m/v1/getDesktopListings*`, req => req.reply(200, { message: 'success' })).as(
+      'getDesktopListings',
+    );
+    cy.intercept('GET', `**/w3m/v1/getMobileListings*`, req => req.reply(200, { message: 'success' })).as(
+      'getMobileListings',
+    );
+    cy.intercept('POST', '**/cdn-cgi/rum*', req => req.reply(200, { message: 'success' })).as('getrum');
+    cy.intercept('GET', '**/chats/unreads/counts*', req => req.reply(200, { count: 0 })).as('getUnreadCounts');
+    cy.intercept('POST', '**/cdn-cgi/zaraz/t*', req => req.reply(200, { message: 'success' })).as('postT');
+    cy.intercept('POST', 'https://pulse.walletconnect.org/e?projectId=*&st=*&sv=*', req => {
+      req.reply(200);
+    });
+    cy.intercept('GET', 'https://api.web3modal.org/getAnalyticsConfig?projectId=*&st=*&sv=*', req => {
+      req.reply(200);
+    });
+    cy.intercept('GET', `${API_SERVER}/identities?t=*`, req => {
+      identitiesRequestCount++;
+      if (identitiesRequestCount <= 1) {
+        req.reply(401);
+      } else {
+        req.reply(200, IDENTITIES);
+      }
+    }).as('getIdentities');
+    cy.fixture('login.html').then(htmlContent => {
+      cy.intercept('POST', 'https://dev-id.socious.io/auth/login', req => {
+        loginRequestCount++;
+
+        if (loginRequestCount === 1) {
+          req.reply({
+            statusCode: 302,
+            headers: {
+              'Content-Type': 'text/html',
+            },
+            body: htmlContent,
+          });
+        } else {
+          req.redirect(`${APP_URL}oauth/socious?code=*&identity_id=*&session=*&status=success`);
+        }
+      }).as('postLogin');
+    });
+    cy.intercept('GET', 'https://dev-id.socious.io/auth/confirm', req => {
+      cy.fixture('confirm.html').then(htmlContent => {
+        req.reply({
+          statusCode: 200,
+          headers: {
+            'Content-Type': 'text/html',
+          },
+          body: htmlContent,
+        });
+      });
+    }).as('authConfirm');
+
+    cy.intercept('POST', `${API_SERVER_V3}/auth/session`, req => {
+      req.reply(200, SESSION);
+    });
+    cy.intercept('GET', `${API_SERVER}/user/profile?t=*`, req => {
+      req.reply(200, PROFILE);
+    });
+
+    cy.intercept('GET', `${API_SERVER}/projects*`, req => req.reply(200, PROJECTS)).as('getProjects');
+    cy.intercept('GET', `${API_SERVER}/skills*`, req => req.reply(200, { message: 'success' })).as('getSkills');
+    cy.intercept('GET', `${API_SERVER}/notifications*`, req => req.reply(200, { message: 'success' })).as(
+      'getNotifications',
+    );
+  });
+  Cypress.on('uncaught:exception', err => {
+    if (err.message.includes('WebAssembly.instantiate(): Out of memory')) {
+      return false;
+    }
+  });
+
+  it('should log in user from the intro page using Socious ID', () => {
+    cy.visit(APP_URL + 'intro');
+
+    cy.contains('Get Started').should('be.visible');
+    cy.contains('button', 'Continue').should('be.visible');
+    cy.contains('button', 'Continue').click();
+
+    cy.origin(
+      `${ACCOUNT_CENTER_URL}`,
+      {
+        args: {
+          email: VALID_EMAIL,
+          password: VALID_PASSWORD,
+        },
+      },
+      ({ email, password }) => {
+        cy.get('input[type="email"]', { timeout: 10000 }).should('be.visible');
+        cy.location('pathname').should('include', '/auth/login');
+
+        cy.get('input[type="email"]').type(email);
+        cy.get('input[type="password"]').should('be.visible');
+        cy.get('input[type="password"]').type(password);
+
+        cy.contains('button', 'Sign in').should('be.enabled');
+        cy.contains('button', 'Sign in').click();
+
+        cy.contains('Your individual profile').should('be.visible');
+        cy.contains('Your organization profiles').should('be.visible');
+
+        cy.get('button.consent-account').should('be.visible');
+        cy.wait('@postLogin');
+        cy.get('button.consent-account').first().click();
+      },
+    );
+  });
+});