Merge pull request #99 from open-template-hub/develop

Release/mq

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+
+updates:
+  - package-ecosystem: 'npm'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+      day: 'monday'
+      time: '08:00'
+      timezone: 'Etc/GMT'
+    target-branch: 'workflow/dependency-update'
+    labels:
+      - 'workflow'
+    milestone: 1

.github/workflows/cron-dependency-checker-workflow.yml

@@ -0,0 +1,34 @@
+name: Cron Dependency Checker Workflow
+
+on:
+  schedule:
+    - cron: '0 4 * * 1'
+
+jobs:
+  cron-dependency-checker:
+    name: 'Cron Dependency Checker'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}
+
+      - name: Install Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - name: NPM Install
+        run: npm i
+      - name: Npm Outdated
+        run: npm run outdated
+      - name: Build
+        run: npm run buildProd
+
+      - name: Git Commit and Push
+        run: |
+          git config --global user.email "furknyavuz@gmail.com"
+          git config --global user.name "Furkan Yavuz"
+          git commit -am "Workflow/dependency check"
+          git push

.github/workflows/issue-assigned-workflows.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   automate-project-columns:
-    name: "Automate Project Columns"
+    name: 'Automate Project Columns'
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/on-push-tags.yml

@@ -7,12 +7,12 @@ on:
 
 jobs:
   tagged-release:
-    name: "Tagged Release"
-    runs-on: "ubuntu-latest"
+    name: 'Tagged Release'
+    runs-on: 'ubuntu-latest'
 
     steps:
       - name: Generate Release From Tag
-        uses: "marvinpinto/action-automatic-releases@latest"
+        uses: 'marvinpinto/action-automatic-releases@latest'
         with:
-          repo_token: "${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}"
+          repo_token: '${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}'
           prerelease: false

.github/workflows/on-version-update.yml

@@ -5,11 +5,11 @@ on:
     paths-ignore:
       - 'package.json'
     branches:
-      - "master"
+      - 'master'
 
 jobs:
   bump-version:
-    name: "Update Version"
+    name: 'Update Version'
     runs-on: ubuntu-latest
 
     steps:
@@ -30,7 +30,7 @@ jobs:
           token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}
 
   create-version-update-pr:
-    name: "Create Version Update PR"
+    name: 'Create Version Update PR'
     runs-on: ubuntu-latest
     needs: bump-version
 

.github/workflows/pr-labeled-at-develop-workflows.yml

@@ -9,14 +9,14 @@ on:
 
 jobs:
   auto-merge:
-    name: "Auto Merge"
+    name: 'Auto Merge'
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.14.3"
+        uses: 'pascalgn/automerge-action@v0.14.3'
         env:
-          GITHUB_TOKEN: "${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}"
-          MERGE_LABELS: "workflow"
-          MERGE_COMMIT_MESSAGE: "Auto merge for PR with workflow label"
-          MERGE_FORKS: "false"
-          MERGE_RETRY_SLEEP: "60000"
+          GITHUB_TOKEN: '${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}'
+          MERGE_LABELS: 'workflow'
+          MERGE_COMMIT_MESSAGE: 'Auto merge for PR with workflow label'
+          MERGE_FORKS: 'false'
+          MERGE_RETRY_SLEEP: '60000'

.github/workflows/pr-open-to-demos.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   reset-demo-from-develop:
-    name: "Reset Demo From Develop"
+    name: 'Reset Demo From Develop'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
@@ -19,5 +19,5 @@ jobs:
       - name: Hard Reset Demo From Develop
         run: |
           git fetch origin develop:develop
-          git reset --hard develop
+          git reset --hard origin/develop
           git push -f

.github/workflows/pr-open-workflows.yml

@@ -3,10 +3,11 @@ name: PR Open Workflows
 on:
   pull_request:
     types: [ opened ]
+    branches-ignore: [ 'workflow/dependency-update' ]
 
 jobs:
   pr-labeler:
-    name: "Add Label to PR"
+    name: 'Add Label to PR'
     runs-on: ubuntu-latest
 
     steps:
@@ -16,7 +17,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}
 
   automate-project-columns:
-    name: "Automate Project Columns"
+    name: 'Automate Project Columns'
     runs-on: ubuntu-latest
 
     steps:
@@ -28,7 +29,7 @@ jobs:
           repo-token: ${{ secrets.MASTER_BRANCH_ACCESS_TOKEN }}
 
   milestone-binder:
-    name: "Milestone Binder"
+    name: 'Milestone Binder'
     runs-on: ubuntu-latest
 
     steps:

.run/env.run.xml

@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="env" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/env.sh" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="true" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

.run/outdated.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="outdated" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="outdated" />
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

.run/update.run.xml

@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="update" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="update" />
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

README.md

@@ -57,39 +57,39 @@ Check project's current **nodejs** and **npm** version from **[package.json](pac
 If you don't give **RESPONSE_ENCRYPTION_SECRET**, response encryption mechanism will be disabled automatically.
 
 ```applescript
-PORT={Port}
+PORT=4001
 
-ACCESS_TOKEN_EXPIRE=1hour
-ACCESS_TOKEN_SECRET={Access Token Secret}
+PROJECT=OTH
+MODULE=AuthServer
+ENVIRONMENT=Local
 
-CLIENT_RESET_PASSWORD_URL=/reset-password
 CLIENT_URL=http://localhost:4200
-CLIENT_VERIFICATION_SUCCESS_URL=/verify-account
+CLIENT_RESET_PASSWORD_URL=http://localhost:4200/reset-password
+CLIENT_VERIFICATION_SUCCESS_URL=http://localhost:4200/verify-account
 
 DATABASE_URL={Database Connection Url}
+POSTGRESQL_CONNECTION_LIMIT={Postgresql Connection Limit}
 
-MAIL_HOST={SMTP Host}
-MAIL_PASSWORD={Mail Password}
-MAIL_PORT={SMTP Port}
-MAIL_USERNAME={Mail Address}
+CLOUDAMQP_APIKEY={MQ Api Key}
+CLOUDAMQP_URL={MQ Connection Url}
 
-REFRESH_TOKEN_EXPIRE=30days
-REFRESH_TOKEN_SECRET={Refresh Token Secret}
+AUTH_SERVER_QUEUE_CHANNEL=oth_auth_queue
+ORCHESTRATION_SERVER_QUEUE_CHANNEL=oth_orchestration_queue
 
-RESET_PASSWORD_TOKEN_EXPIRE=1day
-RESET_PASSWORD_TOKEN_SECRET={Reset Password Token Secret}
-
-RESPONSE_ENCRYPTION_SECRET={Response Encryption Secret}
+AUTO_VERIFY=false
 
-VERIFICATION_TOKEN_SECRET={Verification Token Secret}
+ACCESS_TOKEN_EXPIRE=1hour
+ACCESS_TOKEN_SECRET={Access Token Secret}
 
-AUTO_VERIFY={Set true If Auto Verify On SignUp}
+REFRESH_TOKEN_EXPIRE=30days
+REFRESH_TOKEN_SECRET={Refresh Token Secret}
 
-POSTGRESQL_CONNECTION_LIMIT={PostgreSQL Connection Limit In Pool}
+RESET_PASSWORD_TOKEN_EXPIRE=1day
+RESET_PASSWORD_TOKEN_SECRET={Reset Token Secret}
 
-MAIL_SERVER_DISABLED={Set true If Mail server disabled}
+VERIFICATION_TOKEN_SECRET={Verification Token Secret
 
-ORCHESTRATION_SERVER_QUEUE_CHANNEL= {Orchestration Server MQ Channel Name}
+RESPONSE_ENCRYPTION_SECRET={Response Encryption Secret}
 ```
 
 ## Social Login Configurations

app/consumer/auth-queue.consumer.ts

@@ -0,0 +1,56 @@
+import { AuthActionType } from '@open-template-hub/common';
+
+export class AuthQueueConsumer {
+  constructor(private channel: any) {}
+
+  onMessage = async (msg: any) => {
+    if (msg !== null) {
+      const msgStr = msg.content.toString();
+      const msgObj = JSON.parse(msgStr);
+
+      const message: AuthActionType = msgObj.message;
+
+      // Decide requeue in the error handling
+      let requeue = false;
+
+      if (message.example) {
+        var exampleHook = async () => {
+          console.log('Auth server example');
+        };
+
+        await this.operate(msg, msgObj, requeue, exampleHook);
+      } else {
+        console.log('Message will be rejected: ', msgObj);
+        this.channel.reject(msg, false);
+      }
+    }
+  };
+
+  private operate = async (
+    msg: any,
+    msgObj: any,
+    requeue: boolean,
+    hook: Function
+  ) => {
+    try {
+      console.log(
+        'Message Received with deliveryTag: ' + msg.fields.deliveryTag,
+        msgObj
+      );
+      await hook();
+      await this.channel.ack(msg);
+      console.log(
+        'Message Processed with deliveryTag: ' + msg.fields.deliveryTag,
+        msgObj
+      );
+    } catch (e) {
+      console.log(
+        'Error with processing deliveryTag: ' + msg.fields.deliveryTag,
+        msgObj,
+        e
+      );
+
+      this.channel.nack(msg, false, requeue);
+    }
+  };
+}