Fix merging issue

Author: IsurangaPerera

.github/workflows/Deploy-to-azure-dev.yml

@@ -0,0 +1,28 @@
+name: "Dev Pipeline - Deploy to Azure Web App Service"
+on:
+  push:
+    branches: [ "User-Login" ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: azure/docker-login@v1
+      with:
+        login-server: ideal.azurecr.io
+        username: ${{ secrets.AZURE_REGISTRY_USERNAME }}
+        password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}
+
+    - name: Build the Docker image and Push to Azure Container Registry
+      working-directory: ./app
+      run: |
+        docker build . -t ideal.azurecr.io/ideals:${{ github.sha }}
+        docker push ideal.azurecr.io/ideals:${{ github.sha }}     
+
+    - uses: azure/webapps-deploy@v2
+      with:
+        app-name: 'ideals-dev'
+        publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
+        images: 'ideal.azurecr.io/ideals:${{ github.sha }}'

.github/workflows/development-pipeline.yml

@@ -30,8 +30,6 @@ jobs:
         run: bin/rails generate rspec:install
       - name: Run tests
         run: bin/rake
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
   build:
     runs-on: ubuntu-latest
     steps:

README.md

@@ -1,5 +1,37 @@
-# ideals
+# IDEALS [:anger:](https://idealmaps.xyz)
 
-[![CI Pipeline - DEV](https://github.com/Proj-IDEALS/ideals/actions/workflows/dev-pipeline.yml/badge.svg)](https://github.com/Proj-IDEALS/ideals/actions/workflows/dev-pipeline.yml)
+## _Highly-interactive concept map of relationships between learning theories_
+
+[![CI Pipeline - DEVELOPMENT](https://github.com/Proj-IDEALS/ideals/actions/workflows/development-pipeline.yml/badge.svg)](https://github.com/Proj-IDEALS/ideals/actions/workflows/development-pipeline.yml) [![CI/CD Pipeline - RELEASE](https://github.com/Proj-IDEALS/ideals/actions/workflows/release-pipeline.yml/badge.svg)](https://github.com/Proj-IDEALS/ideals/actions/workflows/release-pipeline.yml) [![Dev Pipeline - Deploy to Azure Web App Service](https://github.com/Proj-IDEALS/ideals/actions/workflows/Deploy-to-azure-dev.yml/badge.svg)](https://github.com/Proj-IDEALS/ideals/actions/workflows/Deploy-to-azure-dev.yml)
+
+
+## Usage
+
+#### With Docker-compose
+IDEALS uses Rails + Docker for fast development.
+Make a change in your file and instantaneously see your updates!
+
+Open your favourite Terminal and run these commands.
+
+```sh
+git clone https://github.com/Proj-IDEALS/ideals.git
+cd ideals
+docker-compose -f docker-compose.dev.yml up --build
+```
+
+#### Without Docker-compose
+##### Prerequisites
+Make sure you have installed all of the following prerequisites on your development machine:
+* Git - [Download & Install Git](https://git-scm.com/downloads). OSX and Linux machines typically have this already installed.
+* Ruby  - [Download & Install Ruby](https://www.ruby-lang.org/en/documentation/installation/). OSX machines typically have this already installed. 
+* Rails - [Download & Install Rails](https://guides.rubyonrails.org/v5.1/getting_started.html#installing-rails)
+* npm - [Download & Install npm](https://nodejs.org/en/download/)
+
+```sh
+git clone https://github.com/Proj-IDEALS/ideals.git
+cd ideals/app
+bundle install
+bundle exec rails server -b 0.0.0.0
+```
+> Note: `export NODE_OPTIONS=--openssl-legacy-provider` is required if the webpack fails with code: 'ERR_OSSL_EVP_UNSUPPORTED'.
 
-[![CI/CD Pipeline - RELEASE](https://github.com/Proj-IDEALS/ideals/actions/workflows/release-pipeline.yml/badge.svg)](https://github.com/Proj-IDEALS/ideals/actions/workflows/release-pipeline.yml)

app/Dockerfile

@@ -15,6 +15,7 @@ WORKDIR $INSTALL_PATH
 COPY . .
 RUN rm -rf node_modules vendor
 RUN gem install rails bundler
+RUN bundle update rack-protection
 RUN bundle install
 RUN yarn install
 

app/Gemfile

@@ -79,5 +79,10 @@ gem 'rubocop', require: false
 gem 'unicorn', '~> 6.1.0'
 gem 'sidekiq', '~> 6.4.2'
 gem 'redis-rails', '~> 5.0.2'
+
+#login
+gem 'omniauth-auth0', '~> 3.0'
+gem 'omniauth-rails_csrf_protection', '~> 1.0' # prevents forged authentication requests
+
 gem 'webpacker'
 gem 'react-rails'

app/Gemfile.lock

@@ -154,6 +154,10 @@ GEM
     erubi (1.12.0)
     eventmachine (1.2.7)
     execjs (2.8.1)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
     ffi (1.15.5)
     formatador (1.1.0)
     gem_update_checker (0.2.0)
@@ -175,6 +179,7 @@ GEM
       guard-compat (~> 1.0)
       multi_json (~> 1.8)
     hashdiff (1.0.1)
+    hashie (5.0.0)
     http_parser.rb (0.8.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
@@ -188,6 +193,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     json (2.6.3)
+    jwt (2.7.0)
     kgio (2.11.4)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -212,6 +218,7 @@ GEM
     msgpack (1.6.0)
     multi_json (1.15.0)
     multi_test (1.1.0)
+    multi_xml (0.6.0)
     nenv (0.3.0)
     net-imap (0.3.4)
       date
@@ -232,6 +239,26 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
+      jwt (>= 1.0, < 3.0)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    omniauth (2.1.1)
+      hashie (>= 3.4.6)
+      rack (>= 2.2.3)
+      rack-protection
+    omniauth-auth0 (3.1.0)
+      omniauth (~> 2)
+      omniauth-oauth2 (~> 1)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)
+    omniauth-rails_csrf_protection (1.0.1)
+      actionpack (>= 4.2)
+      omniauth (~> 2.0)
     os (1.1.4)
     parallel (1.22.1)
     parser (3.2.1.0)
@@ -248,6 +275,8 @@ GEM
     rack (2.2.6.2)
     rack-livereload (0.3.17)
       rack
+    rack-protection (3.0.5)
+      rack
     rack-proxy (0.7.6)
       rack
     rack-test (2.0.2)
@@ -346,6 +375,7 @@ GEM
     rubocop-ast (1.26.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     selenium-webdriver (4.8.1)
       rexml (~> 3.2, >= 3.2.5)
@@ -357,6 +387,9 @@ GEM
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -386,6 +419,7 @@ GEM
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
+    version_gem (1.1.1)
     web-console (4.2.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
@@ -426,6 +460,8 @@ DEPENDENCIES
   guard-livereload (~> 2.5)
   importmap-rails
   jbuilder
+  omniauth-auth0 (~> 3.0)
+  omniauth-rails_csrf_protection (~> 1.0)
   puma (~> 5.0)
   rack-livereload (~> 0.3.16)
   rails (~> 7.0.4, >= 7.0.4.2)

app/app/assets/config/manifest.js

@@ -11,3 +11,4 @@
 //= link boxicons.css
 //= link_tree ../../javascript .js
 //= link_tree ../../../vendor/javascript .js
+

app/app/controllers/auth0_controller.rb

@@ -0,0 +1,41 @@
+class Auth0Controller < ApplicationController
+  def callback
+    # OmniAuth stores the informatin returned from
+    # Auth0 and the IdP in request.env['omniauth.auth'].
+    # In this code, you will pull the raw_info supplied 
+    # from the id_token and assign it to the session.
+    # Refer to https://github.com/auth0/omniauth-auth0/blob/master/EXAMPLES.md#example-of-the-resulting-authentication-hash 
+    # for complete information on 'omniauth.auth' contents.
+    auth_info = request.env['omniauth.auth']
+    session[:userinfo] = auth_info['extra']['raw_info']
+
+    # Redirect to the URL you want after successful auth
+    redirect_to '/newobjects'
+  end
+
+  def failure
+    # Handles failed authentication
+    @error_msg = request.params['message']
+  end
+
+  def logout
+    reset_session
+    redirect_to logout_url, allow_other_host: true
+  end
+
+  private
+  AUTH0_CONFIG = Rails.application.config_for(:auth0)
+
+  def logout_url
+    request_params = {
+      returnTo: "https://idealmaps.xyz",
+      client_id: AUTH0_CONFIG['auth0_client_id']
+    }
+
+    URI::HTTPS.build(host: AUTH0_CONFIG['auth0_domain'], path: '/v2/logout', query: to_query(request_params)).to_s
+  end
+
+  def to_query(hash)
+    hash.map { |k, v| "#{k}=#{CGI.escape(v)}" unless v.nil? }.reject(&:nil?).join('&')
+  end
+end

app/app/controllers/concerns/secured.rb

@@ -0,0 +1,11 @@
+module Secured
+    extend ActiveSupport::Concern
+  
+    included do
+      before_action :logged_in_using_omniauth?
+    end
+  
+    def logged_in_using_omniauth?
+      redirect_to '/' unless session[:userinfo].present?
+    end
+  end

app/app/views/newobjects/index.html.erb

@@ -1,9 +1,17 @@
 <p style="color: green"><%= notice %></p>
 
+<!-- Place a login button anywhere on your application -->
+  <%= button_to 'Login', '/auth/auth0', method: :post, data: { turbo: false } %>
+  <!-- Place a logout button anywhere on your application -->
+  <%= button_to 'Logout', 'auth/logout', method: :get, data: { turbo: false } %>
+
+
 <h1>List of Objects</h1>
 
 <%= link_to "Create New Object", new_newobject_path %>
 
+
+
 <div id="newobjects">
   <% @newobjects.each do |newobject| %>
     <%= render newobject %>

app/config/auth0.yml

@@ -0,0 +1,10 @@
+development:
+  auth0_domain: ideals.us.auth0.com
+  auth0_client_id: zVt9TW2CvNPKc6tVavCcpov9pIuOtRxW
+  auth0_client_secret: 6HFPxe7fKC-oM2FImZcp8FM0YxNfcJwj6-Jr_5KVGI7EHCKfrhpqb78bgyjWSbCW
+test:
+  auth0_domain:
+  auth0_client_id:
+  auth0_client_secret:
+#Use Duo
+#Duo API Endpoint:api-35bcf667.duosecurity.com

app/config/boot.rb

@@ -1,4 +1,4 @@
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
 require "bundler/setup" # Set up gems listed in the Gemfile.
-require "bootsnap/setup" # Speed up boot time by caching expensive operations.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.

app/config/environments/development.rb

@@ -68,4 +68,7 @@
   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true
   config.hosts << "idealmaps.xyz"
+  config.hosts << "xytom-cuddly-chainsaw-6p9w7qv79jqc477g-3000.preview.app.github.dev"
+  config.hosts << "ideals-dev.azurewebsites.net"
+
 end

app/config/initializers/auth0.rb

@@ -0,0 +1,15 @@
+# ./config/initializers/auth0.rb
+AUTH0_CONFIG = Rails.application.config_for(:auth0)
+
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider(
+    :auth0,
+    AUTH0_CONFIG['auth0_client_id'],
+    AUTH0_CONFIG['auth0_client_secret'],
+    AUTH0_CONFIG['auth0_domain'],
+    callback_path: '/auth/auth0/callback',
+    authorize_params: {
+      scope: 'openid profile'
+    }
+  )
+end

app/config/routes.rb

@@ -1,5 +1,17 @@
 Rails.application.routes.draw do
   root :to => 'application#index'
   resources :newobjects
+
+  # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
+
+  # Defines the root path route ("/")
+  # root "articles#index"
+
+  #User Login
+  get '/auth/auth0/callback' => 'auth0#callback'
+  get '/auth/failure' => 'auth0#failure'
+  get '/auth/logout' => 'auth0#logout'
+
   resources :map
+
 end