Merge branch 'staging' of https://github.com/ActiveLearningStudio/ActiveLearningStudio-API into dev-to-stage-conflicts-06-03-23

AqibYounasAtTkxel · AqibYounasAtTkxel · commit 138e268986ac · 2023-03-06T22:19:00.000+05:00
diff --git a/app/Http/Controllers/Api/V1/MicroSoftTeamController.php b/app/Http/Controllers/Api/V1/MicroSoftTeamController.php
@@ -268,16 +268,16 @@ public function getUserPofile(GetUserProfileRequest $request)
         if ($accessToken && array_key_exists('access_token', $accessToken)) {
             $getProfile = $this->microsoftTeamRepository->getUserProfile($accessToken['access_token']);
 
-            return response([
-                'profile' => $getProfile,
-            ], 200);
-        } else {
-            return response([
-                'status_code' => 424,
-                'errors' => $accessToken['error'],
-                'message' => $accessToken['error_description']
-            ], 500);
+            if ($getProfile && array_key_exists('displayName', $getProfile)) {
+                return response([
+                    'profile' => $getProfile,
+                ], 200);
+            }
         }
+
+        return response([
+            'profile' => 'Something went wrong with the login code or token, unable to fetch user profile',
+        ], 400);
     }
 
     /**
diff --git a/app/Repositories/MicrosoftTeam/MicrosoftTeamRepository.php b/app/Repositories/MicrosoftTeam/MicrosoftTeamRepository.php
@@ -418,7 +418,7 @@ private function getUserDetails($token)
      */
     public function getUserProfile($token)
     {
-        $apiURL = $this->landingUrl . '/me';
+        $apiURL = $this->landingUrl . '/profile';
         $headers = [
             'Content-length' => 0,
             'Content-type' => 'application/json',
diff --git a/charts/curriki/templates/api-ing.yaml b/charts/curriki/templates/api-ing.yaml
@@ -9,10 +9,10 @@ metadata:
 spec:
   tls:
     - hosts:
-      - stage.currikistudio.org
+      - {{.Values.host}}
       secretName: letsencrypt
   rules:
-  - host: stage.currikistudio.org
+  - host: {{.Values.host}}
     http:
       paths:
       - pathType: Prefix
diff --git a/charts/curriki/templates/api.yaml b/charts/curriki/templates/api.yaml
@@ -18,43 +18,94 @@ spec:
         rollme: {{ randAlphaNum 5 | quote }}
     spec:
       containers:
-      - name: api
+      - name: nginx
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
         image: {{ .Values.image.apirepo}} #quay.io/curriki/api:stage
         imagePullPolicy: Always
+        command:
+          - /bin/sh
+          - -c
+          - |
+            export nr_name=App && \
+            sh /usr/local/bin/entrypoint.api.sh && \
+            php /var/www/html/artisan storage:link && \
+            nginx -g "daemon off;"
         ports:
-        - containerPort: 80
+          - name: http
+            containerPort: 80
+            protocol: TCP
+        securityContext:
+          privileged: true
         readinessProbe:
-          tcpSocket:
-            port: 80
-          initialDelaySeconds: 5
+          failureThreshold: 10
+          initialDelaySeconds: 10
           periodSeconds: 10
-        livenessProbe:
+          successThreshold: 1
           tcpSocket:
-            port: 80
-          initialDelaySeconds: 15
+            port: 9000
+        livenessProbe:
+          initialDelaySeconds: 200
           periodSeconds: 20
+          tcpSocket:
+            port: 9000
+        resources:
+          limits:
+            cpu: 100m
+            memory: 100Mi
+          requests:
+            cpu: 50m
+            memory: 50Mi
         volumeMounts:
         - name: api-env
           mountPath: /var/www/html/.env
           subPath: .env
         - name: nfs-volume
           mountPath: /var/www/html/storage
-        envFrom:
-        - secretRef:
-            name: api-env
+        - name: currikicert
+          mountPath: /etc/ssl/curriki.cert
+          subPath: curriki.cert
+        - name: currikikey
+          mountPath: /etc/ssl/curriki.key
+          subPath: curriki.key
+      - name: php-fpm
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        image: {{ .Values.image.apirepo}} #quay.io/curriki/api:stage
+        imagePullPolicy: Always
+        securityContext:
+          privileged: true
+        command:
+          - /bin/sh
+          - -c
+          - |
+            export nr_name=App && \
+            sh /usr/local/bin/entrypoint.api.sh && \
+            php /var/www/html/artisan storage:link && \
+            php-fpm -c /etc/php/8.1/fpm/php.ini --fpm-config=/usr/local/etc/php-fpm.conf -F -O
         resources:
           limits:
             cpu: 600m
             memory: 1500Mi
           requests:
             cpu: 350m
             memory: 800Mi
-        command:
-        - /bin/sh
-        - -c
-        - |
-          php /var/www/html/artisan storage:link
-          apache2ctl -D FOREGROUND
+        volumeMounts:
+        - name: api-env
+          mountPath: /var/www/html/.env
+          subPath: .env
+        - name: nfs-volume
+          mountPath: /var/www/html/storage
+        - name: currikicert
+          mountPath: /etc/ssl/curriki.cert
+          subPath: curriki.cert
+        - name: currikikey
+          mountPath: /etc/ssl/curriki.key
+          subPath: curriki.key
+        envFrom:
+        - secretRef:
+            name: api-env
+        
       volumes:
       - name: api-env
         secret:
@@ -64,9 +115,16 @@ spec:
               path: .env
       - name: nfs-volume
         nfs:
-          server: 139.144.231.192
-          path: /mnt/storage
+          server: {{ .Values.nfsServer }}
+          path: {{ .Values.volumePath }}
           readOnly: no
+      - name: currikicert
+        configMap:
+          name: currikicert
+      - name: currikikey
+        configMap:
+          name: currikikey
+          
 
 
 ---
@@ -79,6 +137,12 @@ spec:
   ports:
   - port: 80
     targetPort: 80
+    protocol: TCP
+    name: http
+  - port: 443
+    targetPort: 80
+    protocol: TCP
+    name: https
   selector:
     app: {{ .Release.Name }}-api
 
@@ -170,8 +234,8 @@ spec:
 
       - name: nfs-volume
         nfs:
-          server: 139.144.231.192
-          path: /mnt/storage
+          server: {{ .Values.nfsServer }}
+          path: {{ .Values.volumePath }}
           readOnly: no
 
 
@@ -224,8 +288,8 @@ spec:
               path: .env
       - name: nfs-volume
         nfs:
-          server: 139.144.231.192
-          path: /mnt/storage
+          server: {{ .Values.nfsServer }}
+          path: {{ .Values.volumePath }}
           readOnly: no
   backoffLimit: 4
 
@@ -277,6 +341,6 @@ spec:
               path: .env
       - name: nfs-volume
         nfs:
-          server: 139.144.231.192
-          path: /mnt/storage
+          server: {{ .Values.nfsServer }}
+          path: {{ .Values.volumePath }}
           readOnly: no
diff --git a/charts/curriki/templates/client.yaml b/charts/curriki/templates/client.yaml
@@ -37,7 +37,6 @@ spec:
         - name: client-env-local
           mountPath: /usr/share/nginx/html/.env
           subPath: .env
-        volumeMounts:
         - name: client-env-script
           mountPath: /usr/share/nginx/html/runtime-env.js
           subPath: runtime-env.js
@@ -69,21 +68,10 @@ kind: ConfigMap
 metadata:
   name: client-env
 data:
-  REACT_APP_PEXEL_API: "563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf"
-  REACT_APP_API_URL: "https://stage.currikistudio.org/api/api"
-  REACT_APP_RESOURCE_URL: "https://stage.currikistudio.org/api"
-  REACT_APP_GOOGLE_CAPTCHA: "6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0"
-  REACT_APP_GAPI_CLIENT_ID: "898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com"
-  REACT_APP_HUBSPOT: "7874555"
-  REACT_APP_API_VERSION: "v1"
-  REACT_APP_H5P_KEY: "B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ"
-  REACT_APP_TSUGI_SERVER_URL: "https://stage-tsugi.currikistudio.org/mod/curriki/"
-  REACT_APP_SHARED_PROJECT_DEMO_USER: "demoaccount@gmail.com"
-  REACT_APP_SHARED_PROJECT_DEMO_PASS: "Qwerty123"
-  REACT_APP_SHARED_PROJECT_USERID: "1608"
-  REACT_MS_APP_ID: "5e0ea881-693a-4f0a-94a7-dcef7b5accd6"
-  REACT_MS_TENANT_ID: "75f881ff-c83b-44de-a964-f0f9ee64c60c"
-  REACT_DOMAIN_URL: "https://stage.currikistudio.org/"
+  {{- with .Values.clientEnvConfigMap }}
+    {{- toYaml . | nindent 2}}
+  {{- end}}
+
 
 
 ---
@@ -92,32 +80,16 @@ kind: ConfigMap
 metadata:
   name: client-env-local
 data:
-  .env: |
-    REACT_APP_PEXEL_API=563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf
-    REACT_APP_API_URL=https://stage.currikistudio.org/api/api
-    REACT_APP_RESOURCE_URL=https://stage.currikistudio.org/api
-    REACT_APP_GOOGLE_CAPTCHA=6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0
-    REACT_APP_GAPI_CLIENT_ID=898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com
-    REACT_APP_HUBSPOT=7874555
-    REACT_APP_API_VERSION=v1
-    REACT_APP_H5P_KEY=B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ
-    REACT_APP_TSUGI_SERVER_URL=https://stage-tsugi.currikistudio.org/mod/curriki/
-    REACT_APP_SHARED_PROJECT_DEMO_USER=demoaccount@gmail.com
-    REACT_APP_SHARED_PROJECT_DEMO_PASS=Qwerty123
-    REACT_APP_SHARED_PROJECT_USERID=1608
-    REACT_MS_APP_ID=5e0ea881-693a-4f0a-94a7-dcef7b5accd6
-    REACT_MS_TENANT_ID=75f881ff-c83b-44de-a964-f0f9ee64c60c
-    REACT_DOMAIN_URL=https://stage.currikistudio.org/
-
+  .env: {{- .Values.clientEnvLocalConfigMap | toYaml | indent 2 }}
+ 
 
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: client-env-script
 data:
-  runtime-env.js: |
-    window.__RUNTIME_CONFIG__ = {"REACT_APP_PEXEL_API":"563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf","REACT_APP_API_URL":"https://stage.currikistudio.org/api/api","REACT_APP_RESOURCE_URL":"https://stage.currikistudio.org/api","REACT_APP_GOOGLE_CAPTCHA":"6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0","REACT_APP_GAPI_CLIENT_ID":"898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com","REACT_APP_HUBSPOT":"7874555","REACT_APP_API_VERSION":"v1","REACT_APP_H5P_KEY":"B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ","REACT_APP_TSUGI_SERVER_URL":"https://stage-tsugi.currikistudio.org/mod/curriki/","REACT_APP_SHARED_PROJECT_DEMO_USER":"demoaccount@gmail.com","REACT_APP_SHARED_PROJECT_DEMO_PASS":"Qwerty123","REACT_APP_SHARED_PROJECT_USERID":"1608","REACT_MS_APP_ID":"5e0ea881-693a-4f0a-94a7-dcef7b5accd6","REACT_MS_TENANT_ID":"75f881ff-c83b-44de-a964-f0f9ee64c60c","REACT_DOMAIN_URL":"https://stage.currikistudio.org/"};
+  runtime-env.js: {{- .Values.clientRuntimeConfig | toYaml | indent 2 }}
 
 ---
 apiVersion: v1
diff --git a/charts/curriki/templates/ingress.yaml b/charts/curriki/templates/ingress.yaml
@@ -8,49 +8,11 @@ metadata:
 spec:
   tls:
     - hosts:
-      - stage.currikistudio.org
-      - stage-api.currikistudio.org
-      - stage-trax.currikistudio.org
-      - stage-tsugi.currikistudio.org
+      {{- with .Values.ingHosts }}
+        {{- toYaml . | nindent 6}}
+      {{- end}}
       secretName: letsencrypt
   rules:
-  - host: stage.currikistudio.org
-    http:
-      paths:
-      - pathType: Prefix
-        path: "/"
-        backend:
-          service:
-            name: client-svc
-            port:
-              number: 80
-  - host: stage-api.currikistudio.org
-    http:
-      paths:
-      - pathType: Prefix
-        path: "/"
-        backend:
-          service:
-            name: api-svc
-            port:
-              number: 80
-  - host: stage-trax.currikistudio.org
-    http:
-      paths:
-      - pathType: Prefix
-        path: "/"
-        backend:
-          service:
-            name: trax-svc
-            port:
-              number: 80
-  - host: stage-tsugi.currikistudio.org
-    http:
-      paths:
-      - pathType: Prefix
-        path: "/"
-        backend:
-          service:
-            name: tsugi-svc
-            port:
-              number: 80
+  {{- with .Values.ingRules }}
+    {{- toYaml . | nindent 4}}
+  {{- end}}
diff --git a/charts/curriki/templates/trax.yaml b/charts/curriki/templates/trax.yaml
@@ -67,8 +67,8 @@ spec:
               path: .env
       - name: nfs-volume
         nfs:
-          server: 139.144.231.192
-          path: /mnt/traxstorage
+          server: {{ .Values.nfsServer }}
+          path: {{ .Values.traxStorage }}
           readOnly: no
 
 
diff --git a/charts/curriki/templates/tsugi.yaml b/charts/curriki/templates/tsugi.yaml
@@ -66,9 +66,8 @@ kind: ConfigMap
 metadata:
   name: tsugi-mod-config
 data:
-  config.php: |
-    <?php
-    define('CURRIKI_STUDIO_HOST', 'https://stage.currikistudio.org');
+  config.php: {{- .Values.currikiTsugiHost | toYaml | indent 2 }}
+    
 
 
 ---
diff --git a/charts/curriki/values.yaml b/charts/curriki/values.yaml
@@ -1,4 +1,4 @@
-namespace: staging
+namespace: default
 image:
   apirepo: nginx
   cronrepo: nginx
diff --git a/charts/pilots.yaml b/charts/pilots.yaml
diff --git a/charts/prod.yaml b/charts/prod.yaml
diff --git a/charts/staging.yaml b/charts/staging.yaml
diff --git a/jenkins/Jenkinsfile.api b/jenkins/Jenkinsfile.api

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ private function getUserDetails($token)`
`418`	`418`	`*/`
`419`	`419`	`public function getUserProfile($token)`
`420`	`420`	`{`
`421`		`- $apiURL = $this->landingUrl . '/me';`
	`421`	`+ $apiURL = $this->landingUrl . '/profile';`
`422`	`422`	`$headers = [`
`423`	`423`	`'Content-length' => 0,`
`424`	`424`	`'Content-type' => 'application/json',`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace: staging`
	`1`	`+namespace: default`
`2`	`2`	`image:`
`3`	`3`	`apirepo: nginx`
`4`	`4`	`cronrepo: nginx`