Merge pull request #286 from bcgov/testing/fix-keycloak-login-and-pre…

…p-testflight [FEATURE][INSPECT-#281]- Fix to Keycloak for awaiting access; set to .dev for TestFlight
bcgov · Jan 26, 2024 · 53a9574 · 53a9574
2 parents a456e33 + 800e909
commit 53a9574
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/ipad/Constants/AppRemoteAPIConst.swift b/ipad/Constants/AppRemoteAPIConst.swift
@@ -57,7 +57,7 @@ class RemoteURLManager {
     static var `default` = {
         // Here We Can use Target Flag to customize
         // Switch Env 
-        return RemoteURLManager(.prod)
+        return RemoteURLManager(.dev)
     }()
 
     init(_ env: RemoteEnv) {

diff --git a/ipad/ViewControllers/Entry Point/ViewController.swift b/ipad/ViewControllers/Entry Point/ViewController.swift
@@ -54,7 +54,7 @@ class ViewController: UIViewController, Theme {
         awaitingAccessResponseView.show(in: self.view, onRefresh: { [weak self] in
             guard let _self = self else {return}
             awaitingAccessResponseView.removeFromSuperview()
-            _self.presentNext()
+            _self.segueToLoginPage()
         })
     }
 

diff --git a/ipad/Views/AwaitingAccessResponse/AwaitingAccessResponse.xib b/ipad/Views/AwaitingAccessResponse/AwaitingAccessResponse.xib
@@ -1,50 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="ipad10_9rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="AwaitingAccessResponse" customModule="InvasivesBC" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="AwaitingAccessResponse" customModule="Inspect" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="820" height="1180"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="32" translatesAutoresizingMaskIntoConstraints="NO" id="5W3-FM-rxP">
-                    <rect key="frame" x="32" y="401.5" width="350" height="93.5"/>
+                    <rect key="frame" x="32" y="553.5" width="756" height="73"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Awaiting Access Response" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OGd-6q-jb8">
-                            <rect key="frame" x="73.5" y="0.0" width="203.5" height="20.5"/>
+                            <rect key="frame" x="277" y="0.0" width="202.5" height="20.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="We've sent a request for elevated access for you to use this application" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NcG-SN-QPK">
-                            <rect key="frame" x="4" y="52.5" width="342.5" height="41"/>
+                            <rect key="frame" x="108.5" y="52.5" width="539.5" height="20.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                     </subviews>
                 </stackView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kBh-mv-GvA">
-                    <rect key="frame" x="147" y="645" width="120" height="43"/>
+                    <rect key="frame" x="350" y="776.5" width="120" height="43"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="S0T-pD-JA8"/>
                         <constraint firstAttribute="height" constant="43" id="cx9-g1-2a7"/>
                     </constraints>
                     <color key="tintColor" red="0.050980392159999999" green="0.24313725489999999" blue="0.45098039220000002" alpha="1" colorSpace="calibratedRGB"/>
-                    <state key="normal" title="Refresh" image="arrow.clockwise.circle.fill" catalog="system">
+                    <state key="normal" title=" Login" image="arrow.clockwise.circle.fill" catalog="system">
                         <color key="titleColor" red="0.050980392159999999" green="0.24313725489999999" blue="0.45098039220000002" alpha="1" colorSpace="calibratedRGB"/>
                     </state>
                     <connections>
                         <action selector="refreshAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="019-Mm-w64"/>
                     </connections>
                 </button>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="5W3-FM-rxP" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="0Vl-VX-EEq"/>
@@ -54,7 +56,6 @@
                 <constraint firstItem="kBh-mv-GvA" firstAttribute="top" secondItem="5W3-FM-rxP" secondAttribute="bottom" constant="150" id="Bph-bc-1Fl"/>
                 <constraint firstItem="5W3-FM-rxP" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="32" id="gdd-xe-nEM"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <connections>
                 <outlet property="headerLabel" destination="OGd-6q-jb8" id="3zJ-rz-DOr"/>
                 <outlet property="messageLabel" destination="NcG-SN-QPK" id="7vu-t7-Nei"/>
@@ -64,6 +65,6 @@
         </view>
     </objects>
     <resources>
-        <image name="arrow.clockwise.circle.fill" catalog="system" width="64" height="60"/>
+        <image name="arrow.clockwise.circle.fill" catalog="system" width="128" height="123"/>
     </resources>
 </document>